Disable xenbus warning for console during domU boot

and vfb timeout during domU shutdown
Signed-off-by: Daniel Kiper <dkiper@net-space.pl>

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index a6f7ed0bd5a12fab132da1eec836ab09a6a9a865..a4cfd2781e7fda0d9bb052fecd0f3a7df7e7bc0c 100644 (file)
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -363,6 +363,10 @@ static void xenbus_dev_shutdown(struct device *_dev)
                goto out;
        }
        xenbus_switch_state(dev, XenbusStateClosing);
+
+       if (!strcmp(dev->devicetype, "vfb"))
+               goto out;
+
        timeout = wait_for_completion_timeout(&dev->down, timeout);
        if (!timeout)
                printk("%s: %s timeout closing device\n", __FUNCTION__, dev->nodename);
@@ -582,6 +586,9 @@ static int xenbus_probe_frontend(const char *type, const char *name)
        char *nodename;
        int err;
 
+       if (!strcmp(type, "console"))
+               return 0;
+
        nodename = kasprintf(GFP_KERNEL, "%s/%s/%s", xenbus_frontend.root, type, name);
        if (!nodename)
                return -ENOMEM;