Skip to contentSkip to conversation

kvm-userspace: fix io.h include merge confilict

PATCH Applied Ehrhardt Christian 2 participants 2 messages Nov 10, 2008 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kvm-userspace: fix io.h include merge confilict

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).

---

[diffstat]

[diff]

qemu/qemu-kvm.c +0 -2
@@ -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)
 {
Applied
#1 lore raw
Quoted 4 lines · Ehrhardt Christian

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).

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function