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
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

View file

@ -561,6 +561,10 @@ static QemuOptsList qemu_machine_opts = {
.name = "kernel_irqchip",
.type = QEMU_OPT_BOOL,
.help = "use KVM in-kernel irqchip",
}, {
.name = "kvm_shadow_mem",
.type = QEMU_OPT_SIZE,
.help = "KVM shadow MMU size",
},
{ /* End of list */ }
},