Paolo Bonzini
2009-Jun-19 11:01 UTC
[Xen-devel] [PATCH] fix timeout with PV guest and physical CDROM
Specifying a physical CDROM in the configuration of a PV guest, like
disk = [''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.
Tested by me.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
drivers/xen/xenbus/xenbus_probe.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff -r baeb818cd2dc 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 Fri Jun 19 10:14:26 2009 +0200
@@ -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)));
+ (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 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-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Paolo Bonzini
2009-Jun-19 12:02 UTC
[Xen-devel] [PATCH] fix timeout with PV guest and physical CDROM
Specifying a physical CDROM in the configuration of a PV guest, like
disk = [''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.
Tested by me.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
drivers/xen/xenbus/xenbus_probe.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff -r baeb818cd2dc 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 Fri Jun 19 10:14:26 2009 +0200
@@ -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)));
+ (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 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-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel