mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 01:03:55 -06:00
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>
This commit is contained in:
parent
39d6960aab
commit
3d4b26494f
6 changed files with 16 additions and 24 deletions
|
@ -1356,7 +1356,7 @@ static int kvm_get_apic(CPUState *env)
|
|||
struct kvm_lapic_state kapic;
|
||||
int ret;
|
||||
|
||||
if (apic && kvm_enabled() && kvm_irqchip_in_kernel()) {
|
||||
if (apic && kvm_irqchip_in_kernel()) {
|
||||
ret = kvm_vcpu_ioctl(env, KVM_GET_LAPIC, &kapic);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
|
@ -1372,7 +1372,7 @@ static int kvm_put_apic(CPUState *env)
|
|||
DeviceState *apic = env->apic_state;
|
||||
struct kvm_lapic_state kapic;
|
||||
|
||||
if (apic && kvm_enabled() && kvm_irqchip_in_kernel()) {
|
||||
if (apic && kvm_irqchip_in_kernel()) {
|
||||
kvm_put_apic_state(apic, &kapic);
|
||||
|
||||
return kvm_vcpu_ioctl(env, KVM_SET_LAPIC, &kapic);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue