From patchwork Wed Oct 3 10:52:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 188747 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DEA592C0098 for ; Wed, 3 Oct 2012 20:56:30 +1000 (EST) Received: from localhost ([::1]:41675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJMcu-0003QJ-W4 for incoming@patchwork.ozlabs.org; Wed, 03 Oct 2012 06:56:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJMcC-0001qy-Ap for qemu-devel@nongnu.org; Wed, 03 Oct 2012 06:55:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJMc6-0004sV-L8 for qemu-devel@nongnu.org; Wed, 03 Oct 2012 06:55:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJMc6-0004s0-By for qemu-devel@nongnu.org; Wed, 03 Oct 2012 06:55:38 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q93AtbTW013481 (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-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q93Ata1s030697; 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 97047652031; Wed, 3 Oct 2012 07:55:26 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id q93AtQ9G027458; Wed, 3 Oct 2012 07:55:26 -0300 Message-Id: <20121003105509.391284251@amt.cnet> User-Agent: quilt/0.48-1 Date: Wed, 03 Oct 2012 07:52:57 -0300 From: Marcelo Tosatti To: qemu-devel@nongnu.org, Gerd Hoffmann References: <20121003105255.972669952@amt.cnet> Content-Disposition: inline; filename=qemukvm-commandline-nokvmirqchip X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Marcelo Tosatti , kvm@vger.kernel.org Subject: [Qemu-devel] [patch 2/6] Use machine options to emulate -no-kvm-irqchip X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git. From: Jan Kiszka Upstream is moving towards this mechanism, so start using it in qemu-kvm already to configure the specific defaults: kvm enabled on, just like in-kernel irqchips. Signed-off-by: Marcelo Tosatti Reviewed-by: Anthony Liguori Index: qemu-compat-kvm/vl.c =================================================================== --- qemu-compat-kvm.orig/vl.c +++ qemu-compat-kvm/vl.c @@ -3061,6 +3061,12 @@ int main(int argc, char **argv, char **e machine = machine_parse(optarg); } break; + case QEMU_OPTION_no_kvm_irqchip: { + olist = qemu_find_opts("machine"); + qemu_opts_parse(olist, "kernel_irqchip=off", 0); + 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,10 @@ STEXI Enable FIPS 140-2 compliance mode. 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) + HXCOMM This is the last statement. Insert new options before this line! STEXI @end table