summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-10-09 15:03:09 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-13 14:01:05 -0300
commit805c4686abe97f717f392f2bc9b7483c8e141ea3 (patch)
tree8a1cafbe93bb965cc44e32edc43e49dedb8a7a19 /kvm-all.c
parentinclude stdlib.h in qemu-kvm.h (diff)
downloadqemu-kvm-805c4686abe97f717f392f2bc9b7483c8e141ea3.tar.gz
qemu-kvm-805c4686abe97f717f392f2bc9b7483c8e141ea3.tar.bz2
qemu-kvm-805c4686abe97f717f392f2bc9b7483c8e141ea3.zip
use a more upstream friendly version of irqchip-in-kernel test
Upstream now has tests for irqchip_in_kernel. It differs from our signature, as it does not take any parameter. For consistency, convert our usage. Also, use a field in KVMState to store it, so we can have the exact same function as qemu upstream does. 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 b2651df8d..1356aa8d4 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -155,12 +155,14 @@ static void kvm_reset_vcpu(void *opaque)
abort();
}
}
+#endif
int kvm_irqchip_in_kernel(void)
{
return kvm_state->irqchip_in_kernel;
}
+#ifdef KVM_UPSTREAM
int kvm_pit_in_kernel(void)
{
return kvm_state->pit_in_kernel;