[Xen-changelog] [xen-unstable] xen: fix non-debug and 32-bit builds after nested HVM series

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1302085359 -3600
# Node ID 2a39222f0071295bdae703c928403d30c63674cc
# Parent  7714b42e72fad771a447d66dc9e2acdd0dc98c59
xen: fix non-debug and 32-bit builds after nested HVM series

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---


diff -r 7714b42e72fa -r 2a39222f0071 xen/arch/x86/hvm/svm/nestedsvm.c
--- a/xen/arch/x86/hvm/svm/nestedsvm.c  Tue Apr 05 15:44:09 2011 +0200
+++ b/xen/arch/x86/hvm/svm/nestedsvm.c  Wed Apr 06 11:22:39 2011 +0100
@@ -1164,9 +1164,8 @@
     uint64_t exitcode)
 {
     bool_t is_intercepted;
-    struct nestedvcpu *nv = &vcpu_nestedhvm(v);
 
-    ASSERT(nv->nv_vmexit_pending == 0);
+    ASSERT(vcpu_nestedhvm(v).nv_vmexit_pending == 0);
     is_intercepted = nsvm_vmcb_guest_intercepts_exitcode(v, regs, exitcode);
 
     switch (exitcode) {
diff -r 7714b42e72fa -r 2a39222f0071 xen/arch/x86/mm/hap/guest_walk.c
--- a/xen/arch/x86/mm/hap/guest_walk.c  Tue Apr 05 15:44:09 2011 +0200
+++ b/xen/arch/x86/mm/hap/guest_walk.c  Wed Apr 06 11:22:39 2011 +0100
@@ -122,7 +122,7 @@
 #else
 
 unsigned long hap_gva_to_gfn(GUEST_PAGING_LEVELS)(
-    struct vcpu *v, unsigned long gva, uint32_t *pfec)
+    struct vcpu *v, struct p2m_domain *p2m, unsigned long gva, uint32_t *pfec)
 {
     gdprintk(XENLOG_ERR,
              "Guest paging level is greater than host paging level!\n");

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