[PATCH] KVM: Fix compile error caused by no defined CONFIG_X86

[PATCH] KVM: Fix compile error caused by no defined CONFIG_X86

[Sheng Yang]

[-- Attachment #1: Type: text/plain, Size: 995 bytes --]

From c050ed6225f314b86a0dabf11c7f677de097c39f Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Date: Tue, 27 Nov 2007 14:41:06 +0800
Subject: [PATCH] KVM: Fix compile error caused by no defined CONFIG_X86

For <linux/kvm.h> was included by qemu, which didn't define CONFIG_X86,
kvm compiles fail on x86 machines.

Using __i386__ and __x86_64__ instead.

Signed-off-by: Sheng Yang <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 include/linux/kvm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index f0bebd6..9504ec8 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -51,7 +51,7 @@ struct kvm_irqchip {
 	__u32 pad;
         union {
 		char dummy[512];  /* reserving space */
-#ifdef CONFIG_X86
+#if defined(__i386__) || defined(__x86_64__)
 		struct kvm_pic_state pic;
 		struct kvm_ioapic_state ioapic;
 #endif
-- 
1.5.3.4


[-- Attachment #2: 0001-KVM-Fix-compile-error-caused-by-no-defined-CONFIG_X.patch --]
[-- Type: text/x-diff, Size: 995 bytes --]

From c050ed6225f314b86a0dabf11c7f677de097c39f Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Date: Tue, 27 Nov 2007 14:41:06 +0800
Subject: [PATCH] KVM: Fix compile error caused by no defined CONFIG_X86

For <linux/kvm.h> was included by qemu, which didn't define CONFIG_X86,
kvm compiles fail on x86 machines.

Using __i386__ and __x86_64__ instead.

Signed-off-by: Sheng Yang <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 include/linux/kvm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index f0bebd6..9504ec8 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -51,7 +51,7 @@ struct kvm_irqchip {
 	__u32 pad;
         union {
 		char dummy[512];  /* reserving space */
-#ifdef CONFIG_X86
+#if defined(__i386__) || defined(__x86_64__)
 		struct kvm_pic_state pic;
 		struct kvm_ioapic_state ioapic;
 #endif
-- 
1.5.3.4


[-- Attachment #3: Type: text/plain, Size: 228 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

[-- Attachment #4: Type: text/plain, Size: 186 bytes --]

_______________________________________________
kvm-devel mailing list
kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/kvm-devel

Re: [PATCH] KVM: Fix compile error caused by no defined CONFIG_X86

[Avi Kivity]

Sheng Yang wrote:
> From c050ed6225f314b86a0dabf11c7f677de097c39f Mon Sep 17 00:00:00 2001
> From: Sheng Yang <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Date: Tue, 27 Nov 2007 14:41:06 +0800
> Subject: [PATCH] KVM: Fix compile error caused by no defined CONFIG_X86
>
> For <linux/kvm.h> was included by qemu, which didn't define CONFIG_X86,
> kvm compiles fail on x86 machines.
>
> Using __i386__ and __x86_64__ instead.
>
>   

For use as an exported header (installed in /usr/include) CONFIG_86 is 
okay, since we run unifdef.  For use in development, I added 
-DCONFIG_X86 to the qemu flags for now.


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


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/