diff options
| author |   Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com> | 2008-11-10 10:34:52 +0100 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2008-11-10 11:46:30 +0200 |
| commit | 01244812dc8b26b2b14fbb16d2813485d1e15b31 (patch) | |
| tree | fff58354977e239e0b7877644e0afbf7c7e5ec05 | |
| parent | 29419413070920758f95e20b73c9571fdae1badf (diff) | |
Fix io.h include merge confilictkvm-79rc1
The ioperm() call was moved to x86 specific code, so no need to include io.h.
Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | qemu-kvm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index 4cd8a2dc6..9a5a1b650 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1057,8 +1057,6 @@ int qemu_kvm_unregister_coalesced_mmio(target_phys_addr_t addr, return kvm_unregister_coalesced_mmio(kvm_context, addr, size); } -#include <sys/io.h> - #ifdef USE_KVM_DEVICE_ASSIGNMENT void kvm_add_ioperm_data(struct ioperm_data *data) { |