From patchwork Thu May 3 11:04:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 907966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=208.118.235.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 40cC3r54xFz9s3G for ; Thu, 3 May 2018 21:05:25 +1000 (AEST) Received: from localhost ([::1]:55342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEC34-0006q6-Cx for incoming@patchwork.ozlabs.org; Thu, 03 May 2018 07:05:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEC2c-0006pp-IP for qemu-devel@nongnu.org; Thu, 03 May 2018 07:04:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEC2X-00085g-L4 for qemu-devel@nongnu.org; Thu, 03 May 2018 07:04:50 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36026 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 1fEC2X-00085N-Gh for qemu-devel@nongnu.org; Thu, 03 May 2018 07:04:45 -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 7ED657C6B0; Thu, 3 May 2018 11:04:41 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-74.ams2.redhat.com [10.36.116.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6EF8311166E0; Thu, 3 May 2018 11:04:34 +0000 (UTC) From: Thomas Huth To: Amit Shah , qemu-devel@nongnu.org, Paolo Bonzini Date: Thu, 3 May 2018 13:04:33 +0200 Message-Id: <1525345473-31593-1-git-send-email-thuth@redhat.com> 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.2]); Thu, 03 May 2018 11:04:41 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 03 May 2018 11:04:41 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@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: [Qemu-devel] [PATCH] qemu-options: Mark -virtioconsole as deprecated 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: mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The qemu-doc already states that this option is only maintained for backward compatibility and "-device virtconsole" should be used instead. So let's take the next step and mark this option officially as deprecated. Signed-off-by: Thomas Huth Reviewed-by: Markus Armbruster --- qemu-doc.texi | 5 +++++ qemu-options.hx | 2 +- vl.c | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index 5813d27..e48ed05 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2931,6 +2931,11 @@ The @code{-localtime} option has been replaced by @code{-rtc base=localtime}. The @code{-startdate} option has been replaced by @code{-rtc base=@var{date}}. +@subsection -virtioconsole (since 2.13.0) + +You can use @code{-device virtconsole} instead of @code{-virtioconsole} +to configure a virtio-console. + @section qemu-img command line arguments @subsection convert -s (since 2.0.0) diff --git a/qemu-options.hx b/qemu-options.hx index c611766..7693d2c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3676,7 +3676,7 @@ STEXI @findex -virtioconsole Set virtio console. -This option is maintained for backward compatibility. +This option is deprecated and only maintained for backward compatibility. Please use @code{-device virtconsole} for the new way of invocation. ETEXI diff --git a/vl.c b/vl.c index 7487535..c409ff3 100644 --- a/vl.c +++ b/vl.c @@ -3634,6 +3634,8 @@ int main(int argc, char **argv, char **envp) } break; case QEMU_OPTION_virtiocon: + warn_report("This option is deprecated, " + "use '-device virtconsole' instead."); add_device_config(DEV_VIRTCON, optarg); default_virtcon = 0; if (strncmp(optarg, "mon:", 4) == 0) {