[Xen-changelog] [xen-3.1-testing] Avoid kernel hang reading /sys/hypervisor/uuid if xenstore is not available.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206978542 -3600
# Node ID 2fbf70d37f75f3ef82f3becbe6bce19a69d740b6
# Parent  a7c923d6cf228ecb32619280488385b71377cf17
Avoid kernel hang reading /sys/hypervisor/uuid if xenstore is not available.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
linux-2.6.18-xen changeset:   499:080b0c482ad67dffdaed7eaf91ece34a42669c90
linux-2.6.18-xen date:        Fri Mar 28 10:21:17 2008 +0000
---
 linux-2.6-xen-sparse/drivers/xen/core/xen_sysfs.c |    4 ++++
 1 files changed, 4 insertions(+)

diff -r a7c923d6cf22 -r 2fbf70d37f75 
linux-2.6-xen-sparse/drivers/xen/core/xen_sysfs.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/xen_sysfs.c Mon Mar 31 16:48:37 
2008 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/core/xen_sysfs.c Mon Mar 31 16:49:02 
2008 +0100
@@ -104,6 +104,10 @@ static ssize_t uuid_show(struct hyp_sysf
 {
        char *vm, *val;
        int ret;
+       extern int xenstored_ready;
+
+       if (!xenstored_ready)
+               return -EBUSY;
 
        vm = xenbus_read(XBT_NIL, "vm", "", NULL);
        if (IS_ERR(vm))

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog