aboutsummaryrefslogtreecommitdiff
path: root/qemu-config.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-02-15 18:41:28 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-02-15 18:41:28 -0600
commit6c263e26a5c162a8cd79e32bb82422697db5c57c (patch)
treede3955b0d0d026c74e05f1342e7dac75b3c6ab78 /qemu-config.c
parentcf5cfe0471eb3693401f390bc467413d14dce368 (diff)
parenta4aecd2819fd31641ab62472e3385073043521fb (diff)
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 'qemu-config.c')
-rw-r--r--qemu-config.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c
index e980fd68d6..12f5c27535 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -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 */ }
},