Skip to contentSkip to conversation

KVM: Fix compile error caused by no defined CONFIG_X86

PATCH In review Sheng Yang 2 participants 2 messages Nov 27, 2007 1 message not in the archive KVM

lore
Share & tools
lore

Sheng Yang

author
#0 lore raw

PATCH 1/1 KVM: Fix compile error caused by no defined CONFIG_X86

From c050ed6225f314b86a0dabf11c7f677de097c39f Mon Sep 17 00:00:00 2001
From: Sheng Yang <[email protected]>
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 <[email protected]>
---
 include/linux/kvm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/kvm.h +1 -1
index f0bebd6..9504ec8 100644
@@ -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
Signature · 1 line
1.5.3.4

From c050ed6225f314b86a0dabf11c7f677de097c39f Mon Sep 17 00:00:00 2001
From: Sheng Yang <[email protected]>
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 <[email protected]>
---
 include/linux/kvm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/kvm.h +1 -1
index f0bebd6..9504ec8 100644
@@ -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
Signature · 1 line
1.5.3.4

-------------------------------------------------------------------------
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/

_______________________________________________
kvm-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel

A message that is not in the archive (sent off-list or not yet received): 200711271443.18291.sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org

#2 lore raw
Quoted 11 lines · Sheng Yang

From c050ed6225f314b86a0dabf11c7f677de097c39f Mon Sep 17 00:00:00 2001
From: Sheng Yang <[email protected]>
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.

Signature · 7 lines
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/