From 3d4b26494fdce89354dac49ef909356ccda77914 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Tue, 31 Jan 2012 19:17:52 +0100 Subject: 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 Signed-off-by: Marcelo Tosatti --- kvm.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'kvm.h') diff --git a/kvm.h b/kvm.h index 40b5ffcfa3..f9f1dc86b3 100644 --- a/kvm.h +++ b/kvm.h @@ -23,11 +23,14 @@ #endif extern int kvm_allowed; +extern bool kvm_kernel_irqchip; #if defined CONFIG_KVM || !defined NEED_CPU_H -#define kvm_enabled() (kvm_allowed) +#define kvm_enabled() (kvm_allowed) +#define kvm_irqchip_in_kernel() (kvm_kernel_irqchip) #else -#define kvm_enabled() (0) +#define kvm_enabled() (0) +#define kvm_irqchip_in_kernel() (false) #endif struct kvm_run; @@ -80,7 +83,6 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset); #endif int kvm_pit_in_kernel(void); -int kvm_irqchip_in_kernel(void); int kvm_on_sigbus_vcpu(CPUState *env, int code, void *addr); int kvm_on_sigbus(int code, void *addr); -- cgit v1.2.1