[Xen-changelog] [xen-4.2-testing] Merge

[Xen patchbot-4.2-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1351791963 0
# Node ID 651d965ee2c0f3c7019ad291bfb665b4a8cd98b1
# Parent  9d2ad9218dcc5a541ca09f47f60d7c3fec1039eb
# Parent  2bca7e58a3dff0c2d21993423e37bb01a942785c
Merge
---


diff -r 9d2ad9218dcc -r 651d965ee2c0 tools/firmware/hvmloader/xenbus.c
--- a/tools/firmware/hvmloader/xenbus.c Thu Nov 01 17:42:44 2012 +0000
+++ b/tools/firmware/hvmloader/xenbus.c Thu Nov 01 17:46:03 2012 +0000
@@ -64,6 +64,8 @@ void xenbus_setup(void)
 /* Reset the xenbus connection so the next kernel can start again. */
 void xenbus_shutdown(void)
 {
+    struct shared_info *shinfo = get_shared_info();
+
     ASSERT(rings != NULL);
 
     /* We zero out the whole ring -- the backend can handle this, and it's 
@@ -72,7 +74,9 @@ void xenbus_shutdown(void)
     memset(rings, 0, sizeof *rings);
 
     /* Clear the event-channel state too. */
-    memset(get_shared_info(), 0, PAGE_SIZE);
+    memset(shinfo->vcpu_info, 0, sizeof(shinfo->vcpu_info));
+    memset(shinfo->evtchn_pending, 0, sizeof(shinfo->evtchn_pending));
+    memset(shinfo->evtchn_mask, 0, sizeof(shinfo->evtchn_mask));
 
     rings = NULL;
 }

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