Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae788801 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Jeremy Fitzhardinge
Browse files

xen: wait up to 5 minutes for device connetion 



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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent f8dc3308

drivers/xen/xenbus/xenbus_probe.c

+16 −4
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static int print_device_status(struct device *dev, void *data) 
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

 * 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)

{

	unsigned long timeout = jiffies + 10*HZ;

	unsigned long start = jiffies;

	struct device_driver *drv = xendrv ? &xendrv->driver : NULL;

	unsigned int seconds_waited = 0;



	if (!ready_to_wait_for_devices || !xen_domain())

		return;



	while (exists_connecting_device(drv)) {

		if (time_after(jiffies, timeout))

		if (time_after(jiffies, start + (seconds_waited+5)*HZ)) {

			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);

	}



	if (seconds_waited)

		printk("\n");



	bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,

			 print_device_status);

}