From patchwork Wed Oct 3 10:52:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 1540931 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 8BAF840AC9 for ; Wed, 3 Oct 2012 10:55:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755988Ab2JCKzn (ORCPT ); Wed, 3 Oct 2012 06:55:43 -0400 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 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q93AtbuM009897 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Oct 2012 06:55:37 -0400 Received: from amt.cnet (vpn1-7-147.gru2.redhat.com [10.97.7.147]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q93Atapq026511; Wed, 3 Oct 2012 06:55:37 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id E3AF6652032; Wed, 3 Oct 2012 07:55:26 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id q93AtQgq027460; Wed, 3 Oct 2012 07:55:26 -0300 Message-Id: <20121003105509.463811440@amt.cnet> User-Agent: quilt/0.48-1 Date: Wed, 03 Oct 2012 07:52:58 -0300 From: Marcelo Tosatti To: qemu-devel@nongnu.org, Gerd Hoffmann Cc: kvm@vger.kernel.org, Anthony Liguori , Marcelo Tosatti Subject: [patch 3/6] Use machine options to emulate -no-kvm-pit References: <20121003105255.972669952@amt.cnet> Content-Disposition: inline; filename=qemukvm-nokvmpit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 Reviewed-by: Anthony Liguori --- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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