# HG changeset patch # User dkiper@xxxxxxxxxxxx # Date 1259017006 -3600 # Node ID bbc156985789747ac1373472e5e924315743edc1 # Parent 1db1bb63824b25f97d127449faeb3a56f1272c97 Disable xenbus warning for console during domU boot and vfb timeout during domU shutdown Signed-off-by: Daniel Kiper diff -r 1db1bb63824b -r bbc156985789 drivers/xen/xenbus/xenbus_probe.c --- a/drivers/xen/xenbus/xenbus_probe.c Mon Nov 23 07:32:47 2009 +0000 +++ b/drivers/xen/xenbus/xenbus_probe.c Mon Nov 23 23:56:46 2009 +0100 @@ -363,6 +363,10 @@ static void xenbus_dev_shutdown(struct d 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); @@ -581,6 +585,9 @@ static int xenbus_probe_frontend(const c { char *nodename; int err; + + if (!strcmp(type, "console")) + return 0; nodename = kasprintf(GFP_KERNEL, "%s/%s/%s", xenbus_frontend.root, type, name); if (!nodename)