# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1186581820 -3600
# Node ID 359707941ae84944d757faa1c4c2b76c59fd7333
# Parent 00aa18fd722ec1a3c1255e06ab601cde809a7855
Do not clobber new wallclock offset on restore.
The new hypervisor will set shared_info->wc_* so do not clobber those
values with the saved versions from the old hypervisor.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
tools/libxc/xc_domain_restore.c | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff -r 00aa18fd722e -r 359707941ae8 tools/libxc/xc_domain_restore.c
--- a/tools/libxc/xc_domain_restore.c Wed Aug 08 13:18:07 2007 +0100
+++ b/tools/libxc/xc_domain_restore.c Wed Aug 08 15:03:40 2007 +0100
@@ -272,7 +272,8 @@ int xc_domain_restore(int xc_handle, int
/* The new domain's shared-info frame number. */
unsigned long shared_info_frame;
unsigned char shared_info_page[PAGE_SIZE]; /* saved contents from file */
- shared_info_t *shared_info = (shared_info_t *)shared_info_page;
+ shared_info_t *old_shared_info = (shared_info_t *)shared_info_page;
+ shared_info_t *new_shared_info;
/* A copy of the CPU context of the guest. */
vcpu_guest_context_t ctxt;
@@ -285,9 +286,6 @@ int xc_domain_restore(int xc_handle, int
/* Types of the pfns in the current region */
unsigned long region_pfn_type[MAX_BATCH_SIZE];
-
- /* A temporary mapping, and a copy, of one frame of guest memory. */
- unsigned long *page = NULL;
/* A copy of the pfn-to-mfn table frame list. */
xen_pfn_t *p2m_frame_list = NULL;
@@ -1084,17 +1082,30 @@ int xc_domain_restore(int xc_handle, int
goto out;
}
+ /* Restore contents of shared-info page. No checking needed. */
+ new_shared_info = xc_map_foreign_range(
+ xc_handle, dom, PAGE_SIZE, PROT_WRITE, shared_info_frame);
+
+ /* restore saved vcpu_info and arch specific info */
+ memcpy(&new_shared_info->vcpu_info,
+ &old_shared_info->vcpu_info,
+ sizeof(new_shared_info->vcpu_info));
+ memcpy(&new_shared_info->arch,
+ &old_shared_info->arch,
+ sizeof(new_shared_info->arch));
+
/* clear any pending events and the selector */
- memset(&(shared_info->evtchn_pending[0]), 0,
- sizeof (shared_info->evtchn_pending));
+ memset(&(new_shared_info->evtchn_pending[0]), 0,
+ sizeof (new_shared_info->evtchn_pending));
for ( i = 0; i < MAX_VIRT_CPUS; i++ )
- shared_info->vcpu_info[i].evtchn_pending_sel = 0;
-
- /* Copy saved contents of shared-info page. No checking needed. */
- page = xc_map_foreign_range(
- xc_handle, dom, PAGE_SIZE, PROT_WRITE, shared_info_frame);
- memcpy(page, shared_info, PAGE_SIZE);
- munmap(page, PAGE_SIZE);
+ new_shared_info->vcpu_info[i].evtchn_pending_sel = 0;
+
+ /* mask event channels */
+ memset(&(new_shared_info->evtchn_mask[0]), 0xff,
+ sizeof (new_shared_info->evtchn_mask));
+
+ /* leave wallclock time. set by hypervisor */
+ munmap(new_shared_info, PAGE_SIZE);
/* Uncanonicalise the pfn-to-mfn table frame-number list. */
for ( i = 0; i < P2M_FL_ENTRIES; i++ )
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home