[Xen-changelog] [linux-2.6.18-xen] xenbus: fix timeout with PV guest and physical CDROM

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1245751958 -3600
# Node ID 865707f405319d40ba070d85ac30c5c821d645b6
# Parent  baeb818cd2dc72053ed28353efa36b3a7e0e0227
xenbus: fix timeout with PV guest and physical CDROM

Specifying a physical CDROM in the configuration of a PV guest, like

    disk =3D ['tap:aio:/....,xvda,w', 'phy:/dev/cdrom,hdc:cdrom,r' ]

will cause the 300 seconds timeout to occur if there is no physical
CDROM in the tray.  The bug is due to the device being Closed (as shown by
the timeout message) but not ready.  The configuration is quite bogus, but
this is a regression from when the timeout was 10 seconds only, and
the fix is easy and safe: only check is_ready for connected devices.

Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
---
 drivers/xen/xenbus/xenbus_probe.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff -r baeb818cd2dc -r 865707f40531 drivers/xen/xenbus/xenbus_probe.c
--- a/drivers/xen/xenbus/xenbus_probe.c Thu Jun 18 10:32:16 2009 +0100
+++ b/drivers/xen/xenbus/xenbus_probe.c Tue Jun 23 11:12:38 2009 +0100
@@ -1108,7 +1108,7 @@ int xenbus_init(void)
 }
 #endif
 
-static int is_disconnected_device(struct device *dev, void *data)
+static int is_device_connecting(struct device *dev, void *data)
 {
        struct xenbus_device *xendev = to_xenbus_device(dev);
        struct device_driver *drv = data;
@@ -1127,15 +1127,16 @@ static int is_disconnected_device(struct
 
        xendrv = to_xenbus_driver(dev->driver);
        return (xendev->state < XenbusStateConnected ||
-               (xendrv->is_ready && !xendrv->is_ready(xendev)));
-}
-
-static int exists_disconnected_device(struct device_driver *drv)
+               (xendev->state == XenbusStateConnected &&
+                xendrv->is_ready && !xendrv->is_ready(xendev)));
+}
+
+static int exists_connecting_device(struct device_driver *drv)
 {
        if (xenbus_frontend.error)
                return xenbus_frontend.error;
        return bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
-                               is_disconnected_device);
+                               is_device_connecting);
 }
 
 static int print_device_status(struct device *dev, void *data)
@@ -1198,7 +1199,7 @@ static void wait_for_devices(struct xenb
        if (!ready_to_wait_for_devices || !is_running_on_xen())
                return;
 
-       while (exists_disconnected_device(drv)) {
+       while (exists_connecting_device(drv)) {
                if (time_after(jiffies, start + (seconds_waited+5)*HZ)) {
                        if (!seconds_waited)
                                printk(KERN_WARNING "XENBUS: Waiting for "

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog