[PATCH] KVM: Qemu: Fix ia64 build breakage.
"Zhang, Xiantao" <[email protected]>
| Newsgroups | org.kernel.vger.kvm-ia64,org.kernel.vger.kvm |
|---|---|
| Message-ID | <706158FABBBA044BAD4FE898A02E4BC2171F5400@pdsmsx503.ccr.corp.intel.com> |
From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00 2001 From: Xiantao Zhang <[email protected]> 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 <[email protected]> --- 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
0001-KVM-Qemu-Fix-ia64-build-breakage.patch
(application/octet-stream, 1.1 KB)
From 96c99e79a83d4d8ed4dbd386a85a992e8affd724 Mon Sep 17 00:00:00 2001 From: Xiantao Zhang <[email protected]> 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 <[email protected]> --- 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