From 42b9c7a19f579747a696a493199445a95dda60ac Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Thu, 18 Jan 2007 16:48:09 +0000 Subject: [PATCH] [HVM] save restore: shadow fix Signed-off-by: Zhai Edwin fix 2 shadow issues: * restored guest's mem type_info are not correct * remove annoying warnings when restore enable smp: turn on the vcpu when set_vcpu_context in restore as cpu hotplug is not feasible for HVM --- xen/arch/x86/mm/shadow/common.c | 2 +- xen/arch/x86/mm/shadow/multi.c | 8 ++++++++ xen/common/domain.c | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 115ad74d72..609fa6e122 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2187,7 +2187,7 @@ int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn) /* Don't complain if we're in HVM and there's one extra mapping: * The qemu helper process has an untyped mapping of this dom's RAM */ if ( !(shadow_mode_external(v->domain) - && (page->count_info & PGC_count_mask) <= 2 + && (page->count_info & PGC_count_mask) <= 3 /* vmx restore add one extra mapping*/ && (page->u.inuse.type_info & PGT_count_mask) == 0) ) { SHADOW_ERROR("can't find all mappings of mfn %lx: " diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 0546cb1a66..6a594682a5 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1628,6 +1628,14 @@ sh_make_shadow(struct vcpu *v, mfn_t gmfn, u32 shadow_type) } } + { + struct page_info *page = mfn_to_page(gmfn); + /* XXX: add it to emulate a touched page */ + if ((page->u.inuse.type_info & PGT_type_mask) == PGT_none){ + page->u.inuse.type_info |= (PGT_writable_page | PGT_validated); + } + } + shadow_promote(v, gmfn, shadow_type); set_shadow_status(v, gmfn, shadow_type, smfn); diff --git a/xen/common/domain.c b/xen/common/domain.c index 28530c40d5..de7892d6b5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #ifdef CONFIG_COMPAT @@ -505,6 +506,14 @@ int set_info_guest(struct domain *d, if ( rc == 0 ) rc = arch_set_info_guest(v, c); + /*XXX: hvm smp guest restore support */ + if ( rc == 0 && + v->vcpu_id != 0 && + is_hvm_vcpu(v) && + test_and_clear_bit(_VCPUF_down, &v->vcpu_flags) ) { + vcpu_wake(v); + } + domain_unpause(d); xfree(c.nat); -- 2.30.2