From patchwork Mon May 7 05:37:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 10383227 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 35CD6602D8 for ; Mon, 7 May 2018 05:39:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F63628B77 for ; Mon, 7 May 2018 05:39:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1225228B79; Mon, 7 May 2018 05:39:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5A2D628B77 for ; Mon, 7 May 2018 05:39:05 +0000 (UTC) Received: from localhost ([::1]:44309 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFYrY-0000ci-FO for patchwork-qemu-devel@patchwork.kernel.org; Mon, 07 May 2018 01:39:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFYqU-0000K6-ME for qemu-devel@nongnu.org; Mon, 07 May 2018 01:37:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFYqQ-00052Q-Kv for qemu-devel@nongnu.org; Mon, 07 May 2018 01:37:58 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48604 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFYqQ-0004yt-GT for qemu-devel@nongnu.org; Mon, 07 May 2018 01:37:54 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D79CC406C76D for ; Mon, 7 May 2018 05:37:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E9AE11212B1; Mon, 7 May 2018 05:37:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3E5C51138645; Mon, 7 May 2018 07:37:47 +0200 (CEST) From: Markus Armbruster To: Paolo Bonzini References: <1525453270-23074-1-git-send-email-thuth@redhat.com> Date: Mon, 07 May 2018 07:37:47 +0200 In-Reply-To: (Paolo Bonzini's message of "Fri, 4 May 2018 23:57:53 +0200") Message-ID: <87wowgyqj8.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 07 May 2018 05:37:48 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 07 May 2018 05:37:48 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: Re: [Qemu-devel] [PATCH v2 0/5] Removal of deprecated -no-kvm* options X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Paolo Bonzini writes: > On 04/05/2018 19:01, Thomas Huth wrote: >> The -no-kvm* options are a remainder of the ancient "qemu-kvm" >> fork. They have never been officially documented in our qemu-doc, >> they have been marked as deprecated in the sources since a very >> long time, and we've marked them as deprecated in our qemu-doc >> since QEMU v2.10. So far I haven't seen any complaints that we >> should keep them, so it's time to remove these old parameters now. >> >> While I'm at it, this patch series also removes a left-over from >> the "-tdf" option (which has been removed with QEMU v2.12) and >> fixes a deficiency in the option parsing code that has been >> revealed by the remainder of the "-tdf" option. >> >> Thomas Huth (5): >> qemu-options: Remove remainders of the -tdf option >> qemu-options: Bail out on unsupported options instead of silently >> ignoring them >> qemu-options: Remove deprecated -no-kvm-pit-reinjection >> qemu-options: Remove deprecated -no-kvm-irqchip >> qemu-options: Remove deprecated -no-kvm > > I'm not that sure anymore about -no-kvm. It can come in handy for > distros (*cough* RHEL *cough) that only ship a qemu-kvm binary with > default accelerator "-machine accel=kvm:tcg". > > Yeah, "-accel tcg" is only a few characters later, but it is a > relatively recent addition. 2012 is "relatively recent" in the alternate RHEL universe, perhaps :) Author: Jan Kiszka Date: Fri Oct 5 14:51:45 2012 -0300 Emulate qemu-kvms -no-kvm option 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 diff --git a/qemu-options.hx b/qemu-options.hx index 628bd44591..fe8f15c541 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2888,6 +2888,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) diff --git a/vl.c b/vl.c index cd7c0fbd52..b39f22ed35 100644 --- a/vl.c +++ b/vl.c @@ -3171,6 +3171,10 @@ int main(int argc, char **argv, char **envp) 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");