From nobody Thu May 2 06:11:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605100475; cv=none; d=zohomail.com; s=zohoarc; b=R3IxXyZZWaaj35HMaHsfik8h03M3pWM1+aElIfCjbja7wTLH42b9Kao8slRJmee+5O2iJ0WA5CdxHPSF4jJ0yV8rqm9kss9cfBF7atuoaZ55Uo/SDCoprleaU273THlGRZoUmGMyFLYd+9MROZsTPMm4oALfxs+aGztn5TfWnCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605100475; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6/eCX0oXyaVES9ihI8iOisowUqp4YTPIk5nF5oAsOzk=; b=R/253ty+K3Udwl2g8F8JdQT9X3P+kRZQ0sW/TM9Ecq3fcxlKWfOB8uW4py/a43J0ybXmLeJYt37pWrG7s6rEqaMaAIEowEuIeZnGLO4xtNUYvSQbjHhmgOIqnapChDgHng4hhCM8MRJJhy34KzXqMsQ78vs4dcvHVuHUXAwd1u8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605100475418801.2660081833501; Wed, 11 Nov 2020 05:14:35 -0800 (PST) Received: from localhost ([::1]:34856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcpxH-0008Nf-PH for importer@patchew.org; Wed, 11 Nov 2020 08:14:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcprs-0002vc-Rx for qemu-devel@nongnu.org; Wed, 11 Nov 2020 08:08:56 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcprp-0000v8-UF for qemu-devel@nongnu.org; Wed, 11 Nov 2020 08:08:56 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-526-gXbKJk_GOIOIQ6gYzBeOfQ-1; Wed, 11 Nov 2020 08:08:51 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3985CE649 for ; Wed, 11 Nov 2020 13:08:50 +0000 (UTC) Received: from merkur.fritz.box (ovpn-114-124.ams2.redhat.com [10.36.114.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 827585C1C4; Wed, 11 Nov 2020 13:08:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605100133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6/eCX0oXyaVES9ihI8iOisowUqp4YTPIk5nF5oAsOzk=; b=GdgDvlAB9PFjaJRmQ8thtcvkceFIzHmVZ7AuG3LLMlneGqB3bQxB/icBKSkP2Dt6XeYuLE dj2yd21C18GoNZrwhTKLqPyEx6IBfDU7n32LCP9TdzGNgD6qrdAAPQcK2NlBqwNChnSq2J 2F24Ctn9RZHkY7B+juhKO4C6XyC0HKA= X-MC-Unique: gXbKJk_GOIOIQ6gYzBeOfQ-1 From: Kevin Wolf To: qemu-devel@nongnu.org Subject: [PATCH 1/2] char: Skip CLI aliases in query-chardev-backends Date: Wed, 11 Nov 2020 14:08:33 +0100 Message-Id: <20201111130834.33985-2-kwolf@redhat.com> In-Reply-To: <20201111130834.33985-1-kwolf@redhat.com> References: <20201111130834.33985-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/11 01:42:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pbonzini@redhat.com, libvir-list@redhat.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The aliases "tty" and "parport" are only valid on the command line, QMP commands like chardev-add don't know them. query-chardev-backends should describe QMP and therefore not include them in the list of available backends. Signed-off-by: Kevin Wolf Acked-by: Paolo Bonzini --- chardev/char.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index aa4282164a..c406e61db6 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -547,7 +547,7 @@ static const struct ChardevAlias { }; =20 typedef struct ChadevClassFE { - void (*fn)(const char *name, void *opaque); + void (*fn)(const char *name, bool is_cli_alias, void *opaque); void *opaque; } ChadevClassFE; =20 @@ -561,11 +561,13 @@ chardev_class_foreach(ObjectClass *klass, void *opaqu= e) return; } =20 - fe->fn(object_class_get_name(klass) + 8, fe->opaque); + fe->fn(object_class_get_name(klass) + 8, false, fe->opaque); } =20 static void -chardev_name_foreach(void (*fn)(const char *name, void *opaque), void *opa= que) +chardev_name_foreach(void (*fn)(const char *name, bool is_cli_alias, + void *opaque), + void *opaque) { ChadevClassFE fe =3D { .fn =3D fn, .opaque =3D opaque }; int i; @@ -573,12 +575,12 @@ chardev_name_foreach(void (*fn)(const char *name, voi= d *opaque), void *opaque) object_class_foreach(chardev_class_foreach, TYPE_CHARDEV, false, &fe); =20 for (i =3D 0; i < (int)ARRAY_SIZE(chardev_alias_table); i++) { - fn(chardev_alias_table[i].alias, opaque); + fn(chardev_alias_table[i].alias, true, opaque); } } =20 static void -help_string_append(const char *name, void *opaque) +help_string_append(const char *name, bool is_cli_alias, void *opaque) { GString *str =3D opaque; =20 @@ -800,11 +802,16 @@ ChardevInfoList *qmp_query_chardev(Error **errp) } =20 static void -qmp_prepend_backend(const char *name, void *opaque) +qmp_prepend_backend(const char *name, bool is_cli_alias, void *opaque) { ChardevBackendInfoList **list =3D opaque; - ChardevBackendInfoList *info =3D g_malloc0(sizeof(*info)); + ChardevBackendInfoList *info; =20 + if (is_cli_alias) { + return; + } + + info =3D g_malloc0(sizeof(*info)); info->value =3D g_malloc0(sizeof(*info->value)); info->value->name =3D g_strdup(name); info->next =3D *list; --=20 2.28.0 From nobody Thu May 2 06:11:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605100146; cv=none; d=zohomail.com; s=zohoarc; b=mA7hj/nbD02mt7SGgSPe/pCFBv1LB4nPirPZ1aumNMB3c7W4Sqnk5stYhr/ljcn8Lev2ftnBZ0KQNL88uxgLc7vS6ua4RoJuPr5SMxn2rikrAcMXLZQFNhJiLgCbvvTnPmHKv6HTfz/Oz4/9XJX+OFv1U7gliFZPAzHGA8kqLjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605100146; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=INbi8SjPMiuP+vUI4harRaI+Fcap0Y8skIp2bvpuoFw=; b=g9U4K0oPaG6DDPwzMEokdtxFnezEg80BI5X4VN/F4lr1+W+slCbi1dxPoD0UjmDmpS0B7JRh7oZjs4QkYYOJAi7Vwpj9rD01eqNPNgvvf8W2pDVp3fBg2Km1WzHIVGYBHe1qngFCKAJNcIeMpFCY9SAWZOjiAtPaVZtjGZz6f6Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605100146617282.3651187833349; Wed, 11 Nov 2020 05:09:06 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-192-D1QEaBmaMtKyZwpM6v9DUQ-1; Wed, 11 Nov 2020 08:09:02 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5BE51007466; Wed, 11 Nov 2020 13:08:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3BC016115F; Wed, 11 Nov 2020 13:08:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 60CDB58103; Wed, 11 Nov 2020 13:08:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ABD8q5f004511 for ; Wed, 11 Nov 2020 08:08:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2C28D177D2; Wed, 11 Nov 2020 13:08:52 +0000 (UTC) Received: from merkur.fritz.box (ovpn-114-124.ams2.redhat.com [10.36.114.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06F725C1C4; Wed, 11 Nov 2020 13:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605100144; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=INbi8SjPMiuP+vUI4harRaI+Fcap0Y8skIp2bvpuoFw=; b=PQiGAnSMQsLJGGEw86tRtKJzMTbeBlSl08n47qSSyvts/BN+Hi+QSjVFebEBTEeTdwQeaS d+Bd83IkwgKzV7hwv3nssBNY7mFqsqYGFa+Uv043zg5eaa6i4POYGuWXa6K7qQonGFaTue nl/kQnUuTVctyD8LXroMzqsdyPIvUME= X-MC-Unique: D1QEaBmaMtKyZwpM6v9DUQ-1 From: Kevin Wolf To: qemu-devel@nongnu.org Subject: [PATCH 2/2] char: Deprecate backend aliases 'tty' and 'parport' Date: Wed, 11 Nov 2020 14:08:34 +0100 Message-Id: <20201111130834.33985-3-kwolf@redhat.com> In-Reply-To: <20201111130834.33985-1-kwolf@redhat.com> References: <20201111130834.33985-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: kwolf@redhat.com, pbonzini@redhat.com, libvir-list@redhat.com, marcandre.lureau@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" QAPI doesn't know the aliases 'tty' and 'parport' and there is no reason to prefer them to the real names of the backends 'serial' and 'parallel'. Signed-off-by: Kevin Wolf Acked-by: Paolo Bonzini --- docs/system/deprecated.rst | 6 ++++++ chardev/char.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index bbaae0d97c..7e313eae4f 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -81,6 +81,12 @@ error in the future. The ``-realtime mlock=3Don|off`` argument has been replaced by the ``-overcommit mem-lock=3Don|off`` argument. =20 +``-chardev`` backend aliases ``tty`` and ``parport`` (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +``tty`` and ``parport`` are aliases that will be removed. Instead, the +actual backend names ``serial`` and ``parallel`` should be used. + RISC-V ``-bios`` (since 5.1) '''''''''''''''''''''''''''' =20 diff --git a/chardev/char.c b/chardev/char.c index c406e61db6..f9e297185d 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -534,9 +534,10 @@ static const ChardevClass *char_get_class(const char *= driver, Error **errp) return cc; } =20 -static const struct ChardevAlias { +static struct ChardevAlias { const char *typename; const char *alias; + bool deprecation_warning_printed; } chardev_alias_table[] =3D { #ifdef HAVE_CHARDEV_PARPORT { "parallel", "parport" }, @@ -585,6 +586,9 @@ help_string_append(const char *name, bool is_cli_alias,= void *opaque) GString *str =3D opaque; =20 g_string_append_printf(str, "\n %s", name); + if (is_cli_alias) { + g_string_append(str, " (deprecated)"); + } } =20 static const char *chardev_alias_translate(const char *name) @@ -592,6 +596,11 @@ static const char *chardev_alias_translate(const char = *name) int i; for (i =3D 0; i < (int)ARRAY_SIZE(chardev_alias_table); i++) { if (g_strcmp0(chardev_alias_table[i].alias, name) =3D=3D 0) { + if (!chardev_alias_table[i].deprecation_warning_printed) { + warn_report("The alias '%s' is deprecated, use '%s' instea= d", + name, chardev_alias_table[i].typename); + chardev_alias_table[i].deprecation_warning_printed =3D tru= e; + } return chardev_alias_table[i].typename; } } --=20 2.28.0