From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:40041)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1TJMcI-000291-Es
	for qemu-devel@nongnu.org; Wed, 03 Oct 2012 06:55:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1TJMc6-0004sk-WF
	for qemu-devel@nongnu.org; Wed, 03 Oct 2012 06:55:50 -0400
Received: from mx1.redhat.com ([209.132.183.28]:16780)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1TJMc6-0004ry-OE
	for qemu-devel@nongnu.org; Wed, 03 Oct 2012 06:55:38 -0400
Message-Id: <20121003105509.463811440@amt.cnet>
Date: Wed, 03 Oct 2012 07:52:58 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
References: <20121003105255.972669952@amt.cnet>
Content-Disposition: inline; filename=qemukvm-nokvmpit
Subject: [Qemu-devel] [patch 3/6] Use machine options to emulate -no-kvm-pit
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>, Marcelo Tosatti <mtosatti@redhat.com>, kvm@vger.kernel.org

Commit e81dda195556e72f8cd294998296c1051aab30a8 from qemu-kvm.git.

From: Jan Kiszka <jan.kiszka@siemens.com>

Leave the related command line option in place, just
issuing a warning that it has no function anymore.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

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