diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-10-05 14:51:40 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-10-30 23:39:50 -0200 |
| commit | e43d594ee55038442d59d301eb34fdf0c378d3a4 (patch) | |
| tree | 23893ddb1a306319693fabd6db848bed7bfb768f | |
| parent | 19403a68fb8eaefb2e1245b6a8384d3a3ffa7ca0 (diff) | |
| download | focaccia-qemu-e43d594ee55038442d59d301eb34fdf0c378d3a4.tar.gz focaccia-qemu-e43d594ee55038442d59d301eb34fdf0c378d3a4.zip | |
Use machine options to emulate -no-kvm-irqchip
Releases of qemu-kvm will be interrupted at qemu 1.3.0. Users should switch to plain qemu releases. To avoid breaking scenarios which are setup with command line options specific to qemu-kvm, port these switches from qemu-kvm to qemu.git. Port -no-kvm-irqchip option. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | qemu-options.hx | 3 | ||||
| -rw-r--r-- | vl.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index a67a2551e5..d813755ccb 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2888,6 +2888,9 @@ STEXI Enable FIPS 140-2 compliance mode. ETEXI +HXCOMM Deprecated by -machine kernel_irqchip=on|off property +DEF("no-kvm-irqchip", HAS_ARG, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386) + HXCOMM This is the last statement. Insert new options before this line! STEXI @end table diff --git a/vl.c b/vl.c index 5a3d316980..7d0708afcd 100644 --- a/vl.c +++ b/vl.c @@ -2574,6 +2574,11 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_M: machine = machine_parse(optarg); break; + case QEMU_OPTION_no_kvm_irqchip: { + olist = qemu_find_opts("machine"); + qemu_opts_parse(olist, "kernel_irqchip=off", 0); + break; + } case QEMU_OPTION_cpu: /* hw initialization will check this */ cpu_model = optarg; |