summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-10-19 11:20:42 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-20 12:52:09 -0200
commit0e26711a6692b118b3148a45f9576e9b3c8b8e3a (patch)
treeb333d74ac52148e2de5359004fd2b57dd4017e46 /kvm-all.c
parentRemove kvmctl from kvm/user/config-x86-common.mak (diff)
downloadqemu-kvm-0e26711a6692b118b3148a45f9576e9b3c8b8e3a.tar.gz
qemu-kvm-0e26711a6692b118b3148a45f9576e9b3c8b8e3a.tar.bz2
qemu-kvm-0e26711a6692b118b3148a45f9576e9b3c8b8e3a.zip
use handle_io upstream version.
We can use upstream version of handle_io, there called kvm_handle_io() Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'kvm-all.c')
-rw-r--r--kvm-all.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kvm-all.c b/kvm-all.c
index 0a8aa4c27..5e03cd944 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -520,6 +520,7 @@ err:
return ret;
}
+#endif
static int kvm_handle_io(uint16_t port, void *data, int direction, int size,
uint32_t count)
@@ -560,6 +561,7 @@ static int kvm_handle_io(uint16_t port, void *data, int direction, int size,
return 1;
}
+#ifdef KVM_UPSTREAM
static void kvm_run_coalesced_mmio(CPUState *env, struct kvm_run *run)
{
#ifdef KVM_CAP_COALESCED_MMIO