[XEN] Revert change to vcpu_guest_context which breaks guest ABI.

HVM save/restore needs to save/restore vcpu state via the new
stream-based load/save hypercalls.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index a8c60107715f05d498419775d562f427c466322b..e23c85bbaa90a2905ef860a20eb2210caca9c8bd 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -573,7 +573,6 @@ int arch_set_info_guest(
     else
     {
         hvm_load_cpu_guest_regs(v, &v->arch.guest_context.user_regs);
-        hvm_load_cpu_context(v, &v->arch.guest_context.hvmcpu_ctxt);
     }
 
     if ( test_bit(_VCPUF_initialised, &v->vcpu_flags) )

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 79efff08e46c0bbefb8d605191915e8098631c17..fdc102c1a54b61d7e395aa0d4dfb3fb9013962ce 100644 (file)
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -322,10 +322,8 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c)
 
     if ( is_hvm_vcpu(v) )
     {
-        if ( !IS_COMPAT(v->domain) ) {
+        if ( !IS_COMPAT(v->domain) )
             hvm_store_cpu_guest_regs(v, &c.nat->user_regs, c.nat->ctrlreg);
-            hvm_save_cpu_context(v, &c.nat->hvmcpu_ctxt);
-        }
 #ifdef CONFIG_COMPAT
         else
         {

diff --git a/xen/common/domain.c b/xen/common/domain.c
index de7892d6b57be7e8b692aba390d73b78f1b7a103..aa232585c8a24b467dd092d25e556cc7b2605423 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -506,14 +506,6 @@ 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);

diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h
index 1b83e4a4af44fbf174d88271a2a401b991e68b5b..3e3a4ffdfed8f8171af4aac3fe2e57cfcd101467 100644 (file)
--- a/xen/include/public/arch-x86/xen.h
+++ b/xen/include/public/arch-x86/xen.h
@@ -218,7 +218,6 @@ struct vcpu_guest_context {
 #endif
 #endif
     unsigned long vm_assist;                /* VMASST_TYPE_* bitmap */
-    struct hvmcpu_context hvmcpu_ctxt;      /* whole vmcs region */
 #ifdef __x86_64__
     /* Segment base addresses. */
     uint64_t      fs_base;