motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

Browse source 
* 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
This commit is contained in:
Anthony Liguori 2012-02-15 18:41:28 -06:00
commit 6c263e26a5
9 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/pc.c
View file

@ -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;
}