diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 08:19:45 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 08:19:45 -0600 |
| commit | cab1e8f3e37d8e883c270e3afd9c7c1c18332f0e (patch) | |
| tree | 7850907f6deee8a04ef68e245c9cb8b4b00d37ba | |
| parent | 95a6e48d776b208d085854358313346ebdb2924d (diff) | |
| parent | c6e88b3b27b411e3f1c924deb8b71b20f8a11107 (diff) | |
| download | qemu-cab1e8f3e37d8e883c270e3afd9c7c1c18332f0e.tar.gz | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
Legacy qemu-kvm options have no argument
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | qemu-options.hx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 9bb29d3907..fbcf079f47 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2918,17 +2918,17 @@ Enable FIPS 140-2 compliance mode. ETEXI HXCOMM Deprecated by -machine accel=tcg property -DEF("no-kvm", HAS_ARG, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) +DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) HXCOMM Deprecated by kvm-pit driver properties -DEF("no-kvm-pit-reinjection", HAS_ARG, QEMU_OPTION_no_kvm_pit_reinjection, +DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_pit_reinjection, "", QEMU_ARCH_I386) HXCOMM Deprecated (ignored) -DEF("no-kvm-pit", HAS_ARG, QEMU_OPTION_no_kvm_pit, "", QEMU_ARCH_I386) +DEF("no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit, "", QEMU_ARCH_I386) HXCOMM Deprecated by -machine kernel_irqchip=on|off property -DEF("no-kvm-irqchip", HAS_ARG, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386) +DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "", QEMU_ARCH_I386) HXCOMM Deprecated (ignored) DEF("tdf", 0, QEMU_OPTION_tdf,"", QEMU_ARCH_ALL) |