From: Christian Ehrhardt <[EMAIL PROTECTED]>
These two patches went in with a conflict:
changeset: 16724:3ce8c651c948
user: Ehrhardt Christian <[EMAIL PROTECTED]>
date: Tue Nov 04 12:10:51 2008 +0200
summary: kvm: qemu: move x86 specific calls introduced by device
assignement to x86 files
changeset: 16723:c445df2fedcb
parent: 16675:cc9efba63149
user: Xiantao Zhang <[EMAIL PROTECTED]>
date: Mon Nov 03 17:56:15 2008 +0200
summary: kvm: qemu: fix ia64 build breakage.
The final solution is to drop that io.h include in qemu-kvm.c completely.
After 16724 is applied there is no need for it in qemu-kvm.c anymore (16724
removed the original include).
Signed-off-by: Christian Ehrhardt <[EMAIL PROTECTED]>
---
[diffstat]
[diff]
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -1049,8 +1049,6 @@
return kvm_unregister_coalesced_mmio(kvm_context, addr, size);
}
-#include <sys/io.h>
-
#ifdef USE_KVM_DEVICE_ASSIGNMENT
void kvm_ioperm(CPUState *env, void *data)
{
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
