xenbus: Xen paravirtualised PCI hotplug support.

The Xen PCI front driver adds two new states that are utilizez
for PCI hotplug support. This is a patch pulled from the
linux-2.6-xen-sparse tree.

Signed-off-by: Noboru Iwamatsu <n_iwamatsu@jp.fujitsu.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>

diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index 7e49527189b6c4fdad40ec817c9086a22c6175ed..cdacf923e0730d42c05b46befd97494d6be2a550 100644 (file)
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -50,6 +50,8 @@ const char *xenbus_strstate(enum xenbus_state state)
                [ XenbusStateConnected    ] = "Connected",
                [ XenbusStateClosing      ] = "Closing",
                [ XenbusStateClosed       ] = "Closed",
+               [XenbusStateReconfiguring] = "Reconfiguring",
+               [XenbusStateReconfigured] = "Reconfigured",
        };
        return (state < ARRAY_SIZE(name)) ? name[state] : "INVALID";
 }

diff --git a/include/xen/interface/io/xenbus.h b/include/xen/interface/io/xenbus.h
index 46508c7fa3999b217923c4fb87c475b6618f2aec..9fda532973a5fd7dde5e728e640c00b119d45b98 100644 (file)
--- a/include/xen/interface/io/xenbus.h
+++ b/include/xen/interface/io/xenbus.h
@@ -27,8 +27,14 @@ enum xenbus_state
        XenbusStateClosing      = 5,  /* The device is being closed
                                         due to an error or an unplug
                                         event. */
-       XenbusStateClosed       = 6
+       XenbusStateClosed       = 6,
 
+       /*
+       * Reconfiguring: The device is being reconfigured.
+       */
+       XenbusStateReconfiguring = 7,
+
+       XenbusStateReconfigured  = 8
 };
 
 #endif /* _XEN_PUBLIC_IO_XENBUS_H */