From patchwork Thu Mar 2 07:06:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 658119 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3913647wrb; Wed, 1 Mar 2023 23:08:27 -0800 (PST) X-Google-Smtp-Source: AK7set+mcjX86kueoFeQKnZOsa3ZDPCNXmkfOR/K481W41LCKatQV5n6kGTaQTdNK2gW/E+2p26G X-Received: by 2002:a05:6214:629:b0:573:c1d9:df40 with SMTP id a9-20020a056214062900b00573c1d9df40mr16789574qvx.49.1677740907041; Wed, 01 Mar 2023 23:08:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677740907; cv=none; d=google.com; s=arc-20160816; b=DnHTWkLAM4/Cw5taYtdGIDsImWGyRjBWzMIShMLQxUdE4IWfxGiu5x2AuxaYyFaWmh zQrt5c2i5DwjYR9mIUFRcoR1lQuQGG/RvUKxqFkjJZJNcOXXCbNg5knlbPW0GxKxxaYG GDRQSUDUI1N2rBLsNgYmqHv67OrmfAOxNL31Tic67HkVW2kdsqlwtRTDV8PEPSWqmjDT h6+k3Mb/fso2/IQjQec84Daw4QEIx5lZKtaj6qYPR0u3AG8Mfgypewi6zHq5Nh4XjQb1 NR3TeqXnOyu/Ck1Jskn6d3eRef6G2Aj60pu6vGYvxGVBxmO+Er5BiV6HyP6UOtjzkVBD 7eBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3EEBtnp00yhEK2jIM7VFnQf5ieeLElGwuTQ0thfuo8Q=; b=JRWgr+SVCSaZa2jCVtdqsE7nxKUZfRn/mTKNfV53kDnqOotjSVPb2DEiLWv92xm0ns HpbtoybfUzntD+hP4rZIySnn7/oBY2HrA+Af1GwWli1DZcOkn4waUAcCc+M10nNG2oY+ X+v9uc+LP4fMjVUkYcY/Ve8BDAke370Rwr5dF0AutU4rapStx45vEeDG8a/YK3pU1sCm nF5iJQuJD/xCqsAAUZmhPt9KAnodtqDRUsnRhIfTyDujjIm5S3U264yJhlabQEh+W9PM Cc3EvKn3Fu1GFXNcBaNtfs+x9AmihAMx6ML9Ma/WVjiGF9sYj4ytI7Fl7a4htQvYcCsg lbIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fmJ6DBqx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e24-20020a0caa58000000b00572573d4765si12344202qvb.69.2023.03.01.23.08.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 23:08:27 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fmJ6DBqx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXd20-0002hF-4l; Thu, 02 Mar 2023 02:07:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXd1v-0002gO-Tg for qemu-devel@nongnu.org; Thu, 02 Mar 2023 02:07:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXd1s-0005Sf-G1 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 02:07:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677740823; 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=3EEBtnp00yhEK2jIM7VFnQf5ieeLElGwuTQ0thfuo8Q=; b=fmJ6DBqxDmNaMqU5MuFhGkr03pQYDWzFgcjFfBCF3//ogxQa9m3me47oiVoENp0xXkUmqQ eu9Qz+dh9YC+Qmxr5PkibcHYu+bIrF0qKKIDRd733FZsnfpuJi6cwHOWtbvc/27pURRtCX cfh9xEYCiK84n/lkGJcFOWNR3tHoS5k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-213-neJ1GJ_qNTKT6MJ2yKI67Q-1; Thu, 02 Mar 2023 02:07:02 -0500 X-MC-Unique: neJ1GJ_qNTKT6MJ2yKI67Q-1 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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 59BE1101AA5F; Thu, 2 Mar 2023 07:07:01 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 353641121315; Thu, 2 Mar 2023 07:07:01 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0BE8F21E6A24; Thu, 2 Mar 2023 08:07:00 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 2/5] target/arm: Restrict 'qapi-commands-machine.h' to system emulation Date: Thu, 2 Mar 2023 08:06:57 +0100 Message-Id: <20230302070700.2998086-3-armbru@redhat.com> In-Reply-To: <20230302070700.2998086-1-armbru@redhat.com> References: <20230302070700.2998086-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Since commit a0e61807a3 ("qapi: Remove QMP events and commands from user-mode builds") we don't generate the "qapi-commands-machine.h" header in a user-emulation-only build. Move the QMP functions from helper.c (which is always compiled) to monitor.c (which is only compiled when system-emulation is selected). Rename monitor.c to arm-qmp-cmds.c. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230223155540.30370-2-philmd@linaro.org> Signed-off-by: Markus Armbruster [Straightforward conflict with commit 9def656e7a2 resolved] --- target/arm/{monitor.c => arm-qmp-cmds.c} | 28 +++++++++++++++++++++++ target/arm/helper.c | 29 ------------------------ target/arm/meson.build | 2 +- 3 files changed, 29 insertions(+), 30 deletions(-) rename target/arm/{monitor.c => arm-qmp-cmds.c} (90%) diff --git a/target/arm/monitor.c b/target/arm/arm-qmp-cmds.c similarity index 90% rename from target/arm/monitor.c rename to target/arm/arm-qmp-cmds.c index ecdd5ee817..c8fa524002 100644 --- a/target/arm/monitor.c +++ b/target/arm/arm-qmp-cmds.c @@ -227,3 +227,31 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, return expansion_info; } + +static void arm_cpu_add_definition(gpointer data, gpointer user_data) +{ + ObjectClass *oc = data; + CpuDefinitionInfoList **cpu_list = user_data; + CpuDefinitionInfo *info; + const char *typename; + + typename = object_class_get_name(oc); + info = g_malloc0(sizeof(*info)); + info->name = g_strndup(typename, + strlen(typename) - strlen("-" TYPE_ARM_CPU)); + info->q_typename = g_strdup(typename); + + QAPI_LIST_PREPEND(*cpu_list, info); +} + +CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) +{ + CpuDefinitionInfoList *cpu_list = NULL; + GSList *list; + + list = object_class_get_list(TYPE_ARM_CPU, false); + g_slist_foreach(list, arm_cpu_add_definition, &cpu_list); + g_slist_free(list); + + return cpu_list; +} diff --git a/target/arm/helper.c b/target/arm/helper.c index 14af7ba095..82c546f11a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -23,7 +23,6 @@ #include "sysemu/cpu-timers.h" #include "sysemu/kvm.h" #include "sysemu/tcg.h" -#include "qapi/qapi-commands-machine-target.h" #include "qapi/error.h" #include "qemu/guest-random.h" #ifdef CONFIG_TCG @@ -9188,34 +9187,6 @@ void arm_cpu_list(void) g_slist_free(list); } -static void arm_cpu_add_definition(gpointer data, gpointer user_data) -{ - ObjectClass *oc = data; - CpuDefinitionInfoList **cpu_list = user_data; - CpuDefinitionInfo *info; - const char *typename; - - typename = object_class_get_name(oc); - info = g_malloc0(sizeof(*info)); - info->name = g_strndup(typename, - strlen(typename) - strlen("-" TYPE_ARM_CPU)); - info->q_typename = g_strdup(typename); - - QAPI_LIST_PREPEND(*cpu_list, info); -} - -CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) -{ - CpuDefinitionInfoList *cpu_list = NULL; - GSList *list; - - list = object_class_get_list(TYPE_ARM_CPU, false); - g_slist_foreach(list, arm_cpu_add_definition, &cpu_list); - g_slist_free(list); - - return cpu_list; -} - /* * Private utility function for define_one_arm_cp_reg_with_opaque(): * add a single reginfo struct to the hash table. diff --git a/target/arm/meson.build b/target/arm/meson.build index a5191b57e1..6226098ad5 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -20,8 +20,8 @@ arm_softmmu_ss = ss.source_set() arm_softmmu_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', + 'arm-qmp-cmds.c', 'machine.c', - 'monitor.c', 'ptw.c', ))