From patchwork Tue Feb 9 10:51:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsuyoshi Ozawa X-Patchwork-Id: 77998 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o19AxlHu021627 for ; Tue, 9 Feb 2010 10:59:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134Ab0BIK7n (ORCPT ); Tue, 9 Feb 2010 05:59:43 -0500 Received: from mail-pz0-f201.google.com ([209.85.222.201]:58192 "EHLO mail-pz0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754062Ab0BIK7n (ORCPT ); Tue, 9 Feb 2010 05:59:43 -0500 Received: by pzk39 with SMTP id 39so7847303pzk.15 for ; Tue, 09 Feb 2010 02:59:42 -0800 (PST) MIME-Version: 1.0 Received: by 10.142.66.38 with SMTP id o38mr375462wfa.336.1265712702247; Tue, 09 Feb 2010 02:51:42 -0800 (PST) X-Originating-IP: [124.87.146.207] In-Reply-To: <4B71387F.4000203@redhat.com> References: <411a180c1002082240u520516fck3cb93372626c5a77@mail.gmail.com> <4B71387F.4000203@redhat.com> Date: Tue, 9 Feb 2010 19:51:42 +0900 Message-ID: <411a180c1002090251p77cdfd1aga4b2c1842a232481@mail.gmail.com> Subject: Re: [PATCH] Build fix for #define KVM_DEBUG From: Tsuyoshi Ozawa To: Avi Kivity Cc: KVM ML Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 09 Feb 2010 10:59:48 +0000 (UTC) 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"); }