Build fix for #define KVM_DEBUG

Commit Message

Tsuyoshi Ozawa Feb. 9, 2010, 10:51 a.m. UTC

None

Patch

diff --git a/x86/vmx-debug.c b/x86/vmx-debug.c
index d466f03..0a3018f 100644
--- a/x86/vmx-debug.c
+++ b/x86/vmx-debug.c
@@ -22,6 +22,7 @@ 
 #include "mmu.h"
 #include "lapic.h"
 #include "debug.h"
+#include "x86.h"

 #ifdef KVM_DEBUG

@@ -1064,6 +1065,7 @@  void regs_dump(struct kvm_vcpu *vcpu)
        REG_DUMP(RBP);
        REG_DUMP(RSI);
        REG_DUMP(RDI);
+#ifdef CONFIG_X86_64
        REG_DUMP(R8);
        REG_DUMP(R9);
        REG_DUMP(R10);
@@ -1072,6 +1074,7 @@  void regs_dump(struct kvm_vcpu *vcpu)
        REG_DUMP(R13);
        REG_DUMP(R14);
        REG_DUMP(R15);
+#endif

        VMCS_REG_DUMP(RSP);
        VMCS_REG_DUMP(RIP);
@@ -1088,7 +1091,7 @@  void sregs_dump(struct kvm_vcpu *vcpu)
        vcpu_printf(vcpu, "cr3 = 0x%lx\n", vcpu->arch.cr3);
        vcpu_printf(vcpu, "cr4 = 0x%lx\n", vcpu->arch.cr4);
        vcpu_printf(vcpu, "cr8 = 0x%lx\n", vcpu->arch.cr8);
-       vcpu_printf(vcpu, "shadow_efer = 0x%llx\n", vcpu->arch.shadow_efer);
+       vcpu_printf(vcpu, "efer = 0x%llx\n", vcpu->arch.efer);
        vcpu_printf(vcpu,
"***********************************************************\n");
 }