aboutsummaryrefslogtreecommitdiff
path: root/kvm-all.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-01-31 19:17:52 +0100
committerMarcelo Tosatti <mtosatti@redhat.com>2012-02-08 15:57:50 -0200
commit3d4b26494fdce89354dac49ef909356ccda77914 (patch)
tree50dae556e5fd2b3a18cd29731ee85c599d2b9260 /kvm-all.c
parent39d6960aabfd90bf0bf7ba38d69e918962b70b16 (diff)
kvm: Implement kvm_irqchip_in_kernel like kvm_enabled
To both avoid that kvm_irqchip_in_kernel always has to be paired with kvm_enabled and that the former ends up in a function call, implement it like the latter. This means keeping the state in a global variable and defining kvm_irqchip_in_kernel as a preprocessor macro. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'kvm-all.c')
-rw-r--r--kvm-all.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/kvm-all.c b/kvm-all.c
index 0b87658f6a..c4babdac0d 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -74,7 +74,6 @@ struct KVMState
#ifdef KVM_CAP_SET_GUEST_DEBUG
struct kvm_sw_breakpoint_head kvm_sw_breakpoints;
#endif
- int irqchip_in_kernel;
int pit_in_kernel;
int xsave, xcrs;
int many_ioeventfds;
@@ -88,6 +87,7 @@ struct KVMState
};
KVMState *kvm_state;
+bool kvm_kernel_irqchip;
static const KVMCapabilityInfo kvm_required_capabilites[] = {
KVM_CAP_INFO(USER_MEMORY),
@@ -193,11 +193,6 @@ static void kvm_reset_vcpu(void *opaque)
kvm_arch_reset_vcpu(env);
}
-int kvm_irqchip_in_kernel(void)
-{
- return kvm_state->irqchip_in_kernel;
-}
-
int kvm_pit_in_kernel(void)
{
return kvm_state->pit_in_kernel;
@@ -742,7 +737,7 @@ int kvm_irqchip_set_irq(KVMState *s, int irq, int level)
struct kvm_irq_level event;
int ret;
- assert(s->irqchip_in_kernel);
+ assert(kvm_irqchip_in_kernel());
event.level = level;
event.irq = irq;
@@ -862,7 +857,7 @@ static int kvm_irqchip_create(KVMState *s)
if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) {
s->irqchip_inject_ioctl = KVM_IRQ_LINE_STATUS;
}
- s->irqchip_in_kernel = 1;
+ kvm_kernel_irqchip = true;
kvm_init_irq_routing(s);
@@ -1315,7 +1310,7 @@ int kvm_has_gsi_routing(void)
int kvm_allows_irq0_override(void)
{
- return !kvm_enabled() || !kvm_irqchip_in_kernel() || kvm_has_gsi_routing();
+ return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing();
}
void kvm_setup_guest_memory(void *start, size_t size)