summaryrefslogtreecommitdiff
path: root/qemu-options.hx
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-options.hx
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-options.hx')
-rw-r--r--qemu-options.hx5
1 files changed, 4 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 51369c45b1..b12999649f 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -32,7 +32,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
" selects emulated machine (-machine ? for list)\n"
" property accel=accel1[:accel2[:...]] selects accelerator\n"
" supported accelerators are kvm, xen, tcg (default: tcg)\n"
- " kernel_irqchip=on|off controls accelerated irqchip support\n",
+ " kernel_irqchip=on|off controls accelerated irqchip support\n"
+ " kvm_shadow_mem=size of KVM shadow MMU\n",
QEMU_ARCH_ALL)
STEXI
@item -machine [type=]@var{name}[,prop=@var{value}[,...]]
@@ -47,6 +48,8 @@ than one accelerator specified, the next one is used if the previous one fails
to initialize.
@item kernel_irqchip=on|off
Enables in-kernel irqchip support for the chosen accelerator when available.
+@item kvm_shadow_mem=size
+Defines the size of the KVM shadow MMU.
@end table
ETEXI