Attachment 288881 Details for Bug 396631 – linux-2.6.18-xen 144:d88e59a7334a ported to 2.6.9-67.EL

[patch] linux-2.6.18-xen 144:d88e59a7334a ported to 2.6.9-67.EL

linux-2.6.18-xen-144-d88e59a7334a (text/plain), 2.07 KB, created by Ian Campbell on 2007-12-14 09:25:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Campbell

Created: 2007-12-14 09:25:29 UTC

Size: 2.07 KB

patch

obsolete

># HG changeset patch
># User kfraser@localhost.localdomain
># Date 1185266340 -3600
># Node ID d88e59a7334ae584900a9f7221d494bcd9ef2a63
># Parent  c68699484a654681a2912e70411286f13119c01f
>xenbus: Wait for 30s for devices to connect (previously 10s).
>Give a visual update to the user on the console every 5s during this
>period.
>Signed-off-by: Keir Fraser <keir@xensource.com>
>linux-2.6.18-xen changeset: 144:d88e59a7334ae584900a9f7221d494bcd9ef2a63
>linux-2.6.18-xen date: Tue Jul 24 09:39:00 2007 +0100
>
>Index: linux-2.6.9-67.EL/drivers/xen/xenbus/xenbus_probe.c
>===================================================================
>--- linux-2.6.9-67.EL.orig/drivers/xen/xenbus/xenbus_probe.c	2007-11-26 10:52:23.000000000 +0000
>+++ linux-2.6.9-67.EL/drivers/xen/xenbus/xenbus_probe.c	2007-11-27 12:30:14.000000000 +0000
>@@ -1212,7 +1212,7 @@
> static int ready_to_wait_for_devices;
> 
> /*
>- * On a 10 second timeout, wait for all devices currently configured.  We need
>+ * On a 30-second 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.
>  *
>@@ -1227,19 +1227,31 @@
>  */
> 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 || !is_running_on_xen())
> 		return;
> 
> 	while (exists_disconnected_device(drv)) {
>-		if (time_after(jiffies, timeout))
>-			break;
>+		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...", 30 - seconds_waited);
>+			if (seconds_waited == 30)
>+				break;
>+		}
>+		
> 		__set_current_state(TASK_INTERRUPTIBLE);
> 		schedule_timeout(HZ/10);
> 	}
> 
>+	if (seconds_waited)
>+		printk("\n");
>+
> 	bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
> 			 print_device_status);
> }

Actions: View | Diff

Attachments on bug 396631: 288881 | 288891 | 288901 | 350208 | 350209