All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Build fix for #define KVM_DEBUG
@ 2010-02-09  6:40 Tsuyoshi Ozawa
  2010-02-09 10:27 ` Avi Kivity
  0 siblings, 1 reply; 6+ messages in thread
From: Tsuyoshi Ozawa @ 2010-02-09  6:40 UTC (permalink / raw)
  To: KVM ML

Build fix for #define KVM_DEBUG

If KVM_DEBUG is defined, the build for kvm_kmod is failed because :

1. is_long_mode() has moved to x86.h.
2. shadow_efer no longer exists.
3. The registers R8 - R15 don't exist on i386 architecture.

This patch fix this problem.

From: Tsuyoshi Ozawa <ozawa@t-oza.net>
Date: Tue, 9 Feb 2010 15:32:51 +0900
Subject: [PATCH] Build fix for #define KVM_DEBUG


Signed-off-by: Tsuyoshi Ozawa <ozawa@t-oza.net>
---
 x86/vmx-debug.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/x86/vmx-debug.c b/x86/vmx-debug.c
index d466f03..468b85a 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,6 @@ 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,
"***********************************************************\n");
 }

-- 
1.6.0.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] Build fix for #define KVM_DEBUG
  2010-02-09  6:40 [PATCH] Build fix for #define KVM_DEBUG Tsuyoshi Ozawa
@ 2010-02-09 10:27 ` Avi Kivity
  2010-02-09 10:51   ` Tsuyoshi Ozawa
  0 siblings, 1 reply; 6+ messages in thread
From: Avi Kivity @ 2010-02-09 10:27 UTC (permalink / raw)
  To: Tsuyoshi Ozawa; +Cc: KVM ML

On 02/09/2010 08:40 AM, Tsuyoshi Ozawa wrote:
> Build fix for #define KVM_DEBUG
>
> If KVM_DEBUG is defined, the build for kvm_kmod is failed because :
>
> 1. is_long_mode() has moved to x86.h.
> 2. shadow_efer no longer exists.
> 3. The registers R8 - R15 don't exist on i386 architecture.
>
> This patch fix this problem.
>
>
>          VMCS_REG_DUMP(RSP);
>          VMCS_REG_DUMP(RIP);
> @@ -1088,7 +1091,6 @@ 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,
>    

shadow_efer was renamed to efer, so this should be modified rather than 
deleted.

-- 
error compiling committee.c: too many arguments to function


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] Build fix for #define KVM_DEBUG
  2010-02-09 10:27 ` Avi Kivity
@ 2010-02-09 10:51   ` Tsuyoshi Ozawa
  2010-02-17  2:41     ` Tsuyoshi Ozawa
  0 siblings, 1 reply; 6+ messages in thread
From: Tsuyoshi Ozawa @ 2010-02-09 10:51 UTC (permalink / raw)
  To: Avi Kivity; +Cc: KVM ML

> shadow_efer was renamed to efer, so this should be modified rather than
> deleted.

OK. The new patch uses efer instead of deleting shadow_efer  :

Signed-off-by: Tsuyoshi Ozawa <ozawa@t-oza.net>
---
 x86/vmx-debug.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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");
 }

-- 
1.6.0.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] Build fix for #define KVM_DEBUG
  2010-02-09 10:51   ` Tsuyoshi Ozawa
@ 2010-02-17  2:41     ` Tsuyoshi Ozawa
  2010-02-17 10:46       ` Avi Kivity
  0 siblings, 1 reply; 6+ messages in thread
From: Tsuyoshi Ozawa @ 2010-02-17  2:41 UTC (permalink / raw)
  To: KVM ML

>> shadow_efer was renamed to efer, so this should be modified rather than deleted.
> OK. The new patch uses efer instead of deleting shadow_efer

Excuse me, and what should I do next ?

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] Build fix for #define KVM_DEBUG
  2010-02-17  2:41     ` Tsuyoshi Ozawa
@ 2010-02-17 10:46       ` Avi Kivity
  2010-02-17 11:40         ` Jan Kiszka
  0 siblings, 1 reply; 6+ messages in thread
From: Avi Kivity @ 2010-02-17 10:46 UTC (permalink / raw)
  To: Tsuyoshi Ozawa; +Cc: KVM ML, Jan Kiszka

On 02/17/2010 04:41 AM, Tsuyoshi Ozawa wrote:
>>> shadow_efer was renamed to efer, so this should be modified rather than deleted.
>>>        
>> OK. The new patch uses efer instead of deleting shadow_efer
>>      
> Excuse me, and what should I do next ?
>    

Copy Jan - he maintains kvm-kmod, and probably didn't see your patch.

-- 
error compiling committee.c: too many arguments to function


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] Build fix for #define KVM_DEBUG
  2010-02-17 10:46       ` Avi Kivity
@ 2010-02-17 11:40         ` Jan Kiszka
  0 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2010-02-17 11:40 UTC (permalink / raw)
  To: Tsuyoshi Ozawa; +Cc: Avi Kivity, KVM ML

Avi Kivity wrote:
> On 02/17/2010 04:41 AM, Tsuyoshi Ozawa wrote:
>>>> shadow_efer was renamed to efer, so this should be modified rather than deleted.
>>>>        
>>> OK. The new patch uses efer instead of deleting shadow_efer
>>>      
>> Excuse me, and what should I do next ?
>>    
> 
> Copy Jan - he maintains kvm-kmod, and probably didn't see your patch.
> 

Yes, I did. Proper subject prefixing can help a lot here...

Could you please repost, avoiding that the patch is line-wrapped and
giving it an up-to-date changelog?

TIA,
Jan

-- 
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-02-17 11:40 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-09  6:40 [PATCH] Build fix for #define KVM_DEBUG Tsuyoshi Ozawa
2010-02-09 10:27 ` Avi Kivity
2010-02-09 10:51   ` Tsuyoshi Ozawa
2010-02-17  2:41     ` Tsuyoshi Ozawa
2010-02-17 10:46       ` Avi Kivity
2010-02-17 11:40         ` Jan Kiszka

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.