From nobody Wed Oct 29 20:34:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524606821909661.8269916265508; Tue, 24 Apr 2018 14:53:41 -0700 (PDT) Received: from localhost ([::1]:60976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB5sa-0008C1-Lm for importer@patchew.org; Tue, 24 Apr 2018 17:53:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB5lL-0002lV-Gp for qemu-devel@nongnu.org; Tue, 24 Apr 2018 17:46:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fB5lK-000752-HE for qemu-devel@nongnu.org; Tue, 24 Apr 2018 17:46:11 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:32822 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 1fB5lK-00074V-AH for qemu-devel@nongnu.org; Tue, 24 Apr 2018 17:46:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DB28C4072CC4 for ; Tue, 24 Apr 2018 21:46:09 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-175.rdu2.redhat.com [10.10.120.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61D462156A4F; Tue, 24 Apr 2018 21:46:08 +0000 (UTC) From: Laszlo Ersek To: qemu-devel@nongnu.org Date: Tue, 24 Apr 2018 23:45:48 +0200 Message-Id: <20180424214550.32549-5-lersek@redhat.com> In-Reply-To: <20180424214550.32549-1-lersek@redhat.com> References: <20180424214550.32549-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 24 Apr 2018 21:46:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 24 Apr 2018 21:46:09 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@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 4/6] qapi: change the type of TargetInfo.arch from string to enum SysEmuTarget 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 , Kashyap Chamarthy , Markus Armbruster , Gerd Hoffmann , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now that we have @SysEmuTarget, it makes sense to restict @TargetInfo.@arch to valid sysemu targets at the schema level. Cc: "Daniel P. Berrange" Cc: David Gibson Cc: Eric Blake Cc: Gerd Hoffmann Cc: Kashyap Chamarthy Cc: Markus Armbruster Cc: Paolo Bonzini Cc: Thomas Huth Signed-off-by: Laszlo Ersek Reviewed-by: Markus Armbruster --- Notes: PATCHv1: =20 - qmp_query_target(): pass (-1) as fallback value [Markus] - qmp_query_target(): catch lookup error with error_abort [Markus] =20 RFCv3: =20 - The patch is new in this version. [Markus] qapi/misc.json | 6 ++++-- arch_init.c | 10 +++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/qapi/misc.json b/qapi/misc.json index 104d013adba6..460866cf542f 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -1,18 +1,20 @@ # -*- Mode: Python -*- # =20 ## # =3D Miscellanea ## =20 +{ 'include': 'common.json' } + ## # @qmp_capabilities: # # Enable QMP capabilities. # # Arguments: # # @enable: An optional list of QMPCapability values to enable. The # client must not enable any capability that is not # mentioned in the QMP greeting message. If the field is not # provided, it means no QMP capabilities will be enabled. @@ -2441,28 +2443,28 @@ # ] # } # ## { 'command': 'query-fdsets', 'returns': ['FdsetInfo'] } =20 ## # @TargetInfo: # # Information describing the QEMU target. # -# @arch: the target architecture (eg "x86_64", "i386", etc) +# @arch: the target architecture # # Since: 1.2.0 ## { 'struct': 'TargetInfo', - 'data': { 'arch': 'str' } } + 'data': { 'arch': 'SysEmuTarget' } } =20 ## # @query-target: # # Return information about the target for this QEMU # # Returns: TargetInfo # # Since: 1.2.0 ## { 'command': 'query-target', 'returns': 'TargetInfo' } diff --git a/arch_init.c b/arch_init.c index 6ee07478bd11..ee3a57019000 100644 --- a/arch_init.c +++ b/arch_init.c @@ -21,22 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ #include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" #include "sysemu/sysemu.h" #include "sysemu/arch_init.h" #include "hw/pci/pci.h" #include "hw/audio/soundhw.h" #include "qapi/qapi-commands-misc.h" +#include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "hw/acpi/acpi.h" #include "qemu/help_option.h" =20 #ifdef TARGET_SPARC int graphic_width =3D 1024; int graphic_height =3D 768; int graphic_depth =3D 8; #else int graphic_width =3D 800; @@ -104,15 +105,22 @@ int xen_available(void) return 1; #else return 0; #endif } =20 =20 TargetInfo *qmp_query_target(Error **errp) { TargetInfo *info =3D g_malloc0(sizeof(*info)); =20 - info->arch =3D g_strdup(TARGET_NAME); + /* + * The fallback enum value is irrelevant here (TARGET_NAME is a + * macro and can never be NULL), so simply pass (-1). Also, the + * lookup should never fail -- if it fails, then @SysEmuTarget needs + * extending. Catch that with "error_abort". + */ + info->arch =3D qapi_enum_parse(&SysEmuTarget_lookup, TARGET_NAME, -1, + &error_abort); =20 return info; } --=20 2.14.1.3.gb7cf6e02401b