From 33fc7cfea79b4d05a7d3e7b2801af75c0188d648 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 23 Jun 2009 11:12:38 +0100 Subject: [PATCH] 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 --- drivers/xen/xenbus/xenbus_probe.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index e7175fe0..a6f7ed0b 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -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 device *dev, void *data) xendrv = to_xenbus_driver(dev->driver); return (xendev->state < XenbusStateConnected || - (xendrv->is_ready && !xendrv->is_ready(xendev))); + (xendev->state == XenbusStateConnected && + xendrv->is_ready && !xendrv->is_ready(xendev))); } -static int exists_disconnected_device(struct device_driver *drv) +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 xenbus_driver *xendrv) 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 " -- 2.39.5