diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-15 18:41:28 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-15 18:41:28 -0600 |
| commit | 6c263e26a5c162a8cd79e32bb82422697db5c57c (patch) | |
| tree | de3955b0d0d026c74e05f1342e7dac75b3c6ab78 /hw/pc.c | |
| parent | cf5cfe0471eb3693401f390bc467413d14dce368 (diff) | |
| parent | a4aecd2819fd31641ab62472e3385073043521fb (diff) | |
| download | qemu-6c263e26a5c162a8cd79e32bb82422697db5c57c.zip qemu-6c263e26a5c162a8cd79e32bb82422697db5c57c.tar.gz qemu-6c263e26a5c162a8cd79e32bb82422697db5c57c.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
apic: Fix legacy vmstate loading for KVM
kvm: Implement kvm_irqchip_in_kernel like kvm_enabled
kvm: Allow to set shadow MMU size
Diffstat (limited to 'hw/pc.c')
| -rw-r--r-- | hw/pc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -890,7 +890,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) DeviceState *dev; static int apic_mapped; - if (kvm_enabled() && kvm_irqchip_in_kernel()) { + if (kvm_irqchip_in_kernel()) { dev = qdev_create(NULL, "kvm-apic"); } else { dev = qdev_create(NULL, "apic"); @@ -909,7 +909,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) } /* KVM does not support MSI yet. */ - if (!kvm_enabled() || !kvm_irqchip_in_kernel()) { + if (!kvm_irqchip_in_kernel()) { msi_supported = true; } |