aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2009-07-08 06:27:37 -0400
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-12-03 14:14:48 -0500
commitc6e1971139be1342902873181f3b80a979bfb33b (patch)
treeb3e53ed67c4cdca56a42ffffd30abc6cfe6b25b5 /drivers/xen
parentdb05fed0ad72f264e39bcb366795f7367384ec92 (diff)
xen: fix is_disconnected_device/exists_disconnected_device
The logic of is_disconnected_device/exists_disconnected_device is wrong in that they are used to test whether a device is trying to connect (i.e. connecting). For this reason the patch fixes them to not consider a Closing or Closed device to be connecting. At the same time the patch also renames the functions according to what they really do; you could say a closed device is "disconnected" (the old name), but not "connecting" (the new name). This patch is a backport of changeset 909 from the Xenbits tree. Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/xenbus/xenbus_probe.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 3800da7dabfe..19bce3e1b333 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -843,7 +843,7 @@ postcore_initcall(xenbus_probe_init);
843 843
844MODULE_LICENSE("GPL"); 844MODULE_LICENSE("GPL");
845 845
846static int is_disconnected_device(struct device *dev, void *data) 846static int is_device_connecting(struct device *dev, void *data)
847{ 847{
848 struct xenbus_device *xendev = to_xenbus_device(dev); 848 struct xenbus_device *xendev = to_xenbus_device(dev);
849 struct device_driver *drv = data; 849 struct device_driver *drv = data;
@@ -861,14 +861,15 @@ static int is_disconnected_device(struct device *dev, void *data)
861 return 0; 861 return 0;
862 862
863 xendrv = to_xenbus_driver(dev->driver); 863 xendrv = to_xenbus_driver(dev->driver);
864 return (xendev->state != XenbusStateConnected || 864 return (xendev->state < XenbusStateConnected ||
865 (xendrv->is_ready && !xendrv->is_ready(xendev))); 865 (xendev->state == XenbusStateConnected &&
866 xendrv->is_ready && !xendrv->is_ready(xendev)));
866} 867}
867 868
868static int exists_disconnected_device(struct device_driver *drv) 869static int exists_connecting_device(struct device_driver *drv)
869{ 870{
870 return bus_for_each_dev(&xenbus_frontend.bus, NULL, drv, 871 return bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
871 is_disconnected_device); 872 is_device_connecting);
872} 873}
873 874
874static int print_device_status(struct device *dev, void *data) 875static int print_device_status(struct device *dev, void *data)
@@ -918,7 +919,7 @@ static void wait_for_devices(struct xenbus_driver *xendrv)
918 if (!ready_to_wait_for_devices || !xen_domain()) 919 if (!ready_to_wait_for_devices || !xen_domain())
919 return; 920 return;
920 921
921 while (exists_disconnected_device(drv)) { 922 while (exists_connecting_device(drv)) {
922 if (time_after(jiffies, timeout)) 923 if (time_after(jiffies, timeout))
923 break; 924 break;
924 schedule_timeout_interruptible(HZ/10); 925 schedule_timeout_interruptible(HZ/10);