QOM conversion wants option names with dashes (instead of underscores),
this commit does the change for the kernel_irqchip machine option.
The underscore is still supported through an option alias for backwards
compatibility.
Signed-off-by: Luiz Capitulino <lcapitul...@redhat.com>
---
kvm-all.c | 2 +-
qemu-config.c | 3 ++-
qemu-options.hx | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index f8e4328..c988bb6 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1168,7 +1168,7 @@ static int kvm_irqchip_create(KVMState *s)
if (QTAILQ_EMPTY(&list->head) ||
!qemu_opt_get_bool(QTAILQ_FIRST(&list->head),
- "kernel_irqchip", true) ||
+ "kernel-irqchip", true) ||
!kvm_check_extension(s, KVM_CAP_IRQCHIP)) {
return 0;
}
diff --git a/qemu-config.c b/qemu-config.c
index 5c3296b..3fe91a8 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -560,7 +560,8 @@ static QemuOptsList qemu_machine_opts = {
.type = QEMU_OPT_STRING,
.help = "accelerator list",
}, {
- .name = "kernel_irqchip",
+ .name = "kernel-irqchip",
+ .alias= "kernel_irqchip",
.type = QEMU_OPT_BOOL,
.help = "use KVM in-kernel irqchip",
}, {
diff --git a/qemu-options.hx b/qemu-options.hx
index ecf7ca1..b149852 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -32,7 +32,7 @@ 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
@@ -46,7 +46,7 @@ This is used to enable an accelerator. Depending on the
target architecture,
kvm, xen, or tcg can be available. By default, tcg is used. If there is more
than one accelerator specified, the next one is used if the previous one fails
to initialize.
-@item kernel_irqchip=on|off
+@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.
--
1.7.11.1.116.g8228a23
