From patchwork Fri Oct 5 17:13:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 189540 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 8C89E2C0098 for ; Sat, 6 Oct 2012 03:26:52 +1000 (EST) Received: from localhost ([::1]:55446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKBVV-0006Fq-Th for incoming@patchwork.ozlabs.org; Fri, 05 Oct 2012 13:16:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKBV2-0005CK-Uj for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TKBUz-0001E4-Tn for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:15:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56354) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKBUz-0001DV-MW for qemu-devel@nongnu.org; Fri, 05 Oct 2012 13:15:41 -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 q95HFf3B011548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Oct 2012 13:15:41 -0400 Received: from amt.cnet (vpn1-7-183.gru2.redhat.com [10.97.7.183]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q95HFeGD022762; Fri, 5 Oct 2012 13:15:40 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id E7292652036; Fri, 5 Oct 2012 14:15:25 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id q95HFPFT010813; Fri, 5 Oct 2012 14:15:25 -0300 Message-Id: <20121005171442.623697704@amt.cnet> User-Agent: quilt/0.48-1 Date: Fri, 05 Oct 2012 14:13:45 -0300 From: Marcelo Tosatti To: qemu-devel@nongnu.org References: <20121005171338.092840368@amt.cnet> Content-Disposition: inline; filename=07_qemukvm-commandline-opt-notdf X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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 , Jan Kiszka , Gerd Hoffmann Subject: [Qemu-devel] [patch 7/7] Emulate qemu-kvms -no-kvm option 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 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 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,10 @@ int main(int argc, char **argv, char **e machine = machine_parse(optarg); } break; + case QEMU_OPTION_no_kvm: + olist = qemu_find_opts("machine"); + qemu_opts_parse(olist, "accel=tcg", 0); + break; case QEMU_OPTION_no_kvm_pit: { fprintf(stderr, "Warning: KVM PIT can no longer be disabled " "separately.\n"); 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 by -machine accel=tcg property +DEF("no-kvm", HAS_ARG, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) + HXCOMM Deprecated by kvm-pit driver properties DEF("no-kvm-pit-reinjection", HAS_ARG, QEMU_OPTION_no_kvm_pit_reinjection, "", QEMU_ARCH_I386)