* [PATCH] KVM: Qemu: Fix ia64 build breakage.
@ 2008-11-03 12:58 ` Zhang, Xiantao
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Xiantao @ 2008-11-03 12:58 UTC (permalink / raw)
To: kvm-ia64
[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]
From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 3 Nov 2008 12:26:16 +0800
Subject: [PATCH] KVM: Qemu: Fix ia64 build breakage.
In io.h, it has some macros as fllowing:
#define inb _inb
#define inw _inw
#define inl _inl
#define outb _outb
#define outw _outw
#define outl _outl
It conflicts with the fields of structure kvm_callback_ops.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
qemu/qemu-kvm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index 3b4f279..5a5f183 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -27,7 +27,6 @@ int kvm_pit = 1;
#include <sys/utsname.h>
#include <sys/syscall.h>
#include <sys/mman.h>
-#include <sys/io.h>
#define bool _Bool
#define false 0
@@ -1049,6 +1048,8 @@ int qemu_kvm_unregister_coalesced_mmio(target_phys_addr_t addr,
return kvm_unregister_coalesced_mmio(kvm_context, addr, size);
}
+#include <sys/io.h>
+
static void kvm_do_ioperm(void *_data)
{
struct ioperm_data *data = _data;
--
1.6.0
[-- Attachment #2: 0001-KVM-Qemu-Fix-ia64-build-breakage.patch --]
[-- Type: application/octet-stream, Size: 1124 bytes --]
From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 3 Nov 2008 12:26:16 +0800
Subject: [PATCH] KVM: Qemu: Fix ia64 build breakage.
In io.h, it has some macros as fllowing:
#define inb _inb
#define inw _inw
#define inl _inl
#define outb _outb
#define outw _outw
#define outl _outl
It conflicts with the fields of structure kvm_callback_ops.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
qemu/qemu-kvm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index 3b4f279..5a5f183 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -27,7 +27,6 @@ int kvm_pit = 1;
#include <sys/utsname.h>
#include <sys/syscall.h>
#include <sys/mman.h>
-#include <sys/io.h>
#define bool _Bool
#define false 0
@@ -1049,6 +1048,8 @@ int qemu_kvm_unregister_coalesced_mmio(target_phys_addr_t addr,
return kvm_unregister_coalesced_mmio(kvm_context, addr, size);
}
+#include <sys/io.h>
+
static void kvm_do_ioperm(void *_data)
{
struct ioperm_data *data = _data;
--
1.6.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] KVM: Qemu: Fix ia64 build breakage.
@ 2008-11-03 12:58 ` Zhang, Xiantao
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Xiantao @ 2008-11-03 12:58 UTC (permalink / raw)
To: Avi Kivity, kvm-ia64@vger.kernel.org; +Cc: kvm@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 1168 bytes --]
>From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 3 Nov 2008 12:26:16 +0800
Subject: [PATCH] KVM: Qemu: Fix ia64 build breakage.
In io.h, it has some macros as fllowing:
#define inb _inb
#define inw _inw
#define inl _inl
#define outb _outb
#define outw _outw
#define outl _outl
It conflicts with the fields of structure kvm_callback_ops.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
qemu/qemu-kvm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index 3b4f279..5a5f183 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -27,7 +27,6 @@ int kvm_pit = 1;
#include <sys/utsname.h>
#include <sys/syscall.h>
#include <sys/mman.h>
-#include <sys/io.h>
#define bool _Bool
#define false 0
@@ -1049,6 +1048,8 @@ int qemu_kvm_unregister_coalesced_mmio(target_phys_addr_t addr,
return kvm_unregister_coalesced_mmio(kvm_context, addr, size);
}
+#include <sys/io.h>
+
static void kvm_do_ioperm(void *_data)
{
struct ioperm_data *data = _data;
--
1.6.0
[-- Attachment #2: 0001-KVM-Qemu-Fix-ia64-build-breakage.patch --]
[-- Type: application/octet-stream, Size: 1124 bytes --]
From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 3 Nov 2008 12:26:16 +0800
Subject: [PATCH] KVM: Qemu: Fix ia64 build breakage.
In io.h, it has some macros as fllowing:
#define inb _inb
#define inw _inw
#define inl _inl
#define outb _outb
#define outw _outw
#define outl _outl
It conflicts with the fields of structure kvm_callback_ops.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
qemu/qemu-kvm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index 3b4f279..5a5f183 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -27,7 +27,6 @@ int kvm_pit = 1;
#include <sys/utsname.h>
#include <sys/syscall.h>
#include <sys/mman.h>
-#include <sys/io.h>
#define bool _Bool
#define false 0
@@ -1049,6 +1048,8 @@ int qemu_kvm_unregister_coalesced_mmio(target_phys_addr_t addr,
return kvm_unregister_coalesced_mmio(kvm_context, addr, size);
}
+#include <sys/io.h>
+
static void kvm_do_ioperm(void *_data)
{
struct ioperm_data *data = _data;
--
1.6.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] KVM: Qemu: Fix ia64 build breakage.
2008-11-03 12:58 ` Zhang, Xiantao
@ 2008-11-03 15:57 ` Avi Kivity
-1 siblings, 0 replies; 6+ messages in thread
From: Avi Kivity @ 2008-11-03 15:57 UTC (permalink / raw)
To: kvm-ia64
Zhang, Xiantao wrote:
> From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00 2001
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Mon, 3 Nov 2008 12:26:16 +0800
> Subject: [PATCH] KVM: Qemu: Fix ia64 build breakage.
>
> In io.h, it has some macros as fllowing:
>
> #define inb _inb
> #define inw _inw
> #define inl _inl
> #define outb _outb
> #define outw _outw
> #define outl _outl
>
> It conflicts with the fields of structure kvm_callback_ops.
>
Wow, broken headers.
Applied, thanks. We'll need a better solution though (like not using
these identifiers in kvm_callback_ops).
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] KVM: Qemu: Fix ia64 build breakage.
@ 2008-11-03 15:57 ` Avi Kivity
0 siblings, 0 replies; 6+ messages in thread
From: Avi Kivity @ 2008-11-03 15:57 UTC (permalink / raw)
To: Zhang, Xiantao; +Cc: kvm-ia64@vger.kernel.org, kvm@vger.kernel.org
Zhang, Xiantao wrote:
> From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00 2001
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Mon, 3 Nov 2008 12:26:16 +0800
> Subject: [PATCH] KVM: Qemu: Fix ia64 build breakage.
>
> In io.h, it has some macros as fllowing:
>
> #define inb _inb
> #define inw _inw
> #define inl _inl
> #define outb _outb
> #define outw _outw
> #define outl _outl
>
> It conflicts with the fields of structure kvm_callback_ops.
>
Wow, broken headers.
Applied, thanks. We'll need a better solution though (like not using
these identifiers in kvm_callback_ops).
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] KVM: Qemu: Fix ia64 build breakage.
2008-11-03 15:57 ` Avi Kivity
@ 2008-11-03 21:48 ` Zhang, Xiantao
-1 siblings, 0 replies; 6+ messages in thread
From: Zhang, Xiantao @ 2008-11-03 21:48 UTC (permalink / raw)
To: kvm-ia64
Avi Kivity wrote:
> Zhang, Xiantao wrote:
>> From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00
>> 2001 From: Xiantao Zhang <xiantao.zhang@intel.com>
>> Date: Mon, 3 Nov 2008 12:26:16 +0800
>> Subject: [PATCH] KVM: Qemu: Fix ia64 build breakage.
>>
>> In io.h, it has some macros as fllowing:
>>
>> #define inb _inb
>> #define inw _inw
>> #define inl _inl
>> #define outb _outb
>> #define outw _outw
>> #define outl _outl
>>
>> It conflicts with the fields of structure kvm_callback_ops.
>>
>
> Wow, broken headers.
>
> Applied, thanks. We'll need a better solution though (like not using
> these identifiers in kvm_callback_ops).
Agree. If we found it again, I will make a patch like you suggested.
Xiantao
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] KVM: Qemu: Fix ia64 build breakage.
@ 2008-11-03 21:48 ` Zhang, Xiantao
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Xiantao @ 2008-11-03 21:48 UTC (permalink / raw)
To: Avi Kivity; +Cc: kvm-ia64@vger.kernel.org, kvm@vger.kernel.org
Avi Kivity wrote:
> Zhang, Xiantao wrote:
>> From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00
>> 2001 From: Xiantao Zhang <xiantao.zhang@intel.com>
>> Date: Mon, 3 Nov 2008 12:26:16 +0800
>> Subject: [PATCH] KVM: Qemu: Fix ia64 build breakage.
>>
>> In io.h, it has some macros as fllowing:
>>
>> #define inb _inb
>> #define inw _inw
>> #define inl _inl
>> #define outb _outb
>> #define outw _outw
>> #define outl _outl
>>
>> It conflicts with the fields of structure kvm_callback_ops.
>>
>
> Wow, broken headers.
>
> Applied, thanks. We'll need a better solution though (like not using
> these identifiers in kvm_callback_ops).
Agree. If we found it again, I will make a patch like you suggested.
Xiantao
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-11-03 21:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-03 12:58 [PATCH] KVM: Qemu: Fix ia64 build breakage Zhang, Xiantao
2008-11-03 12:58 ` Zhang, Xiantao
2008-11-03 15:57 ` Avi Kivity
2008-11-03 15:57 ` Avi Kivity
2008-11-03 21:48 ` Zhang, Xiantao
2008-11-03 21:48 ` Zhang, Xiantao
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.