From patchwork Fri Oct 5 17:51:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/7] Issue warning when deprecated -no-kvm-pit is used X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 189555 Message-Id: <20121005175203.562675468@amt.cnet> To: qemu-devel@nongnu.org Cc: Anthony Liguori , Marcelo Tosatti , Jan Kiszka , Gerd Hoffmann Date: Fri, 05 Oct 2012 14:51:41 -0300 From: Marcelo Tosatti List-Id: From: Jan Kiszka 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-pit option. Signed-off-by: Marcelo Tosatti Index: qemu-compat-kvm/vl.c =================================================================== --- qemu-compat-kvm.orig/vl.c +++ qemu-compat-kvm/vl.c @@ -3066,6 +3066,11 @@ int main(int argc, char **argv, char **e machine = machine_parse(optarg); } break; + case QEMU_OPTION_no_kvm_pit: { + fprintf(stderr, "Warning: KVM PIT can no longer be disabled " + "separately.\n"); + break; + } case QEMU_OPTION_usb: usb_enabled = 1; break; Index: qemu-compat-kvm/qemu-options.hx =================================================================== --- qemu-compat-kvm.orig/qemu-options.hx +++ qemu-compat-kvm/qemu-options.hx @@ -2838,6 +2838,9 @@ STEXI Enable FIPS 140-2 compliance mode. ETEXI +HXCOMM Deprecated (ignored) +DEF("no-kvm-pit", HAS_ARG, 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)