QOM conversion wants option names with dashes. This commit does the
change for the kvm_shadow_mem machine type option.
The old option name is still supported through an option alias for
backwards compatibility.
Signed-off-by: Luiz Capitulino <lcapitul...@redhat.com>
---
qemu-config.c | 3 ++-
qemu-options.hx | 4 ++--
target-i386/kvm.c | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/qemu-config.c b/qemu-config.c
index 3fe91a8..909fae9 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -565,7 +565,8 @@ static QemuOptsList qemu_machine_opts = {
.type = QEMU_OPT_BOOL,
.help = "use KVM in-kernel irqchip",
}, {
- .name = "kvm_shadow_mem",
+ .name = "kvm-shadow-mem",
+ .alias= "kvm_shadow_mem",
.type = QEMU_OPT_SIZE,
.help = "KVM shadow MMU size",
}, {
diff --git a/qemu-options.hx b/qemu-options.hx
index b149852..b95438f 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -33,7 +33,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
" 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"
- " kvm_shadow_mem=size of KVM shadow MMU\n",
+ " kvm-shadow-mem=size of KVM shadow MMU\n",
QEMU_ARCH_ALL)
STEXI
@item -machine [type=]@var{name}[,prop=@var{value}[,...]]
@@ -48,7 +48,7 @@ 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
+@item kvm-shadow-mem=size
Defines the size of the KVM shadow MMU.
@end table
ETEXI
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 0d0d8f6..90bf4d4 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -698,7 +698,7 @@ int kvm_arch_init(KVMState *s)
if (!QTAILQ_EMPTY(&list->head)) {
shadow_mem = qemu_opt_get_size(QTAILQ_FIRST(&list->head),
- "kvm_shadow_mem", -1);
+ "kvm-shadow-mem", -1);
if (shadow_mem != -1) {
shadow_mem /= 4096;
ret = kvm_vm_ioctl(s, KVM_SET_NR_MMU_PAGES, shadow_mem);
--
1.7.11.1.116.g8228a23
