From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [patch 3/6] Use machine options to emulate -no-kvm-pit Date: Wed, 03 Oct 2012 07:52:58 -0300 Message-ID: <20121003105509.463811440@amt.cnet> References: <20121003105255.972669952@amt.cnet> Cc: kvm@vger.kernel.org, Anthony Liguori , Marcelo Tosatti To: qemu-devel@nongnu.org, Gerd Hoffmann Return-path: Received: from mx1.redhat.com ([209.132.183.28]:48148 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755965Ab2JCKzk (ORCPT ); Wed, 3 Oct 2012 06:55:40 -0400 Content-Disposition: inline; filename=qemukvm-nokvmpit Sender: kvm-owner@vger.kernel.org List-ID: Commit e81dda195556e72f8cd294998296c1051aab30a8 from qemu-kvm.git. From: Jan Kiszka Leave the related command line option in place, just issuing a warning that it has no function anymore. Signed-off-by: Marcelo Tosatti Index: qemu-compat-kvm/vl.c =================================================================== --- qemu-compat-kvm.orig/vl.c +++ qemu-compat-kvm/vl.c @@ -3066,7 +3066,11 @@ int main(int argc, char **argv, char **e qemu_opts_parse(olist, "kernel_irqchip=off", 0); 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 @@ -2841,6 +2841,10 @@ ETEXI DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n", QEMU_ARCH_I386) +DEF("no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit, + "-no-kvm-pit disable KVM kernel mode PIT\n", + QEMU_ARCH_I386) + HXCOMM This is the last statement. Insert new options before this line! STEXI