xen-changelog

[Top] [All Lists]

[Xen-changelog] Fix earlier merge with Ewan's xenstore changes.

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Fix earlier merge with Ewan's xenstore changes.
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Fri, 30 Sep 2005 14:46:13 +0000
Delivery-date:	Fri, 30 Sep 2005 14:44:09 +0000
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 71466686d02668ac746add250d98689f22346b4a
# Parent  fe401301929ed51cca4641d35ea305bcf7f10892
Fix earlier merge with Ewan's xenstore changes.

diff -r fe401301929e -r 71466686d026 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Fri Sep 30 
12:59:28 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Fri Sep 30 
14:45:20 2005
@@ -607,7 +607,6 @@
        down(&xenbus_lock);
        bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_dev);
        bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, suspend_dev);
-       xb_suspend_comms();
 }
 
 void xenbus_resume(void)
@@ -651,7 +650,6 @@
        int err = 0;
 
        /* Initialize xenstore comms unless already done. */
-       printk("store_evtchn = %i\n", xen_start_info->store_evtchn);
        err = xs_init();
        if (err) {
                printk("XENBUS: Error initializing xenstore comms:"

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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] Fix earlier merge with Ewan's xenstore changes., Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] Change rebooting specification so that we can have domains crash and stay, Xen patchbot -unstable
Next by Date:	[Xen-changelog] Minor tidy., Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] Change rebooting specification so that we can have domains crash and stay, Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Add the config file parsing for the on_{poweroff, reboot, crash} options, so that, Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]