adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

xen: wait up to 5 minutes for device connetion

Browse source 
Increases the device timeout from 10s to 5 minutes, giving the user a
visual indication during that time in case there are problems.  The patch
is a backport of changesets 144 and 150 in 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>
This commit is contained in:
Paolo Bonzini 2009-07-08 12:27:39 +02:00 committed by Jeremy Fitzhardinge
parent f8dc33088f
commit ae78880129
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/xen/xenbus/xenbus_probe.c
View file

@ -901,7 +901,7 @@ static int print_device_status(struct device *dev, void *data)
static int ready_to_wait_for_devices; static int ready_to_wait_for_devices;
/* /*
* On a 10 second timeout, wait for all devices currently configured. We need * On a 5-minute timeout, wait for all devices currently configured. We need
* to do this to guarantee that the filesystems and / or network devices * to do this to guarantee that the filesystems and / or network devices
* needed for boot are available, before we can allow the boot to proceed. * needed for boot are available, before we can allow the boot to proceed.
* *
@ -916,18 +916,30 @@ static int ready_to_wait_for_devices;
*/ */
static void wait_for_devices(struct xenbus_driver *xendrv) static void wait_for_devices(struct xenbus_driver *xendrv)
{ {
unsigned long timeout = jiffies + 10*HZ; unsigned long start = jiffies;
struct device_driver *drv = xendrv ? &xendrv->driver : NULL; struct device_driver *drv = xendrv ? &xendrv->driver : NULL;
unsigned int seconds_waited = 0;
if (!ready_to_wait_for_devices || !xen_domain()) if (!ready_to_wait_for_devices || !xen_domain())
return; return;
while (exists_connecting_device(drv)) { while (exists_connecting_device(drv)) {
if (time_after(jiffies, timeout)) if (time_after(jiffies, start + (seconds_waited+5)*HZ)) {
break; if (!seconds_waited)
printk(KERN_WARNING "XENBUS: Waiting for "
"devices to initialise: ");
seconds_waited += 5;
printk("%us...", 300 - seconds_waited);
if (seconds_waited == 300)
break;
}
schedule_timeout_interruptible(HZ/10); schedule_timeout_interruptible(HZ/10);
} }
if (seconds_waited)
printk("\n");
bus_for_each_dev(&xenbus_frontend.bus, NULL, drv, bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
print_device_status); print_device_status);
} }