From patchwork Tue Dec 20 11:11:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 635452 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2865693pvb; Tue, 20 Dec 2022 03:52:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf7aAKZn64Wxg8sDBRnNYQQca7T6MA2EGfKFECnkLVt9B7GoxPmIcN79sGRx43i0XfK40ZTn X-Received: by 2002:ac8:60b:0:b0:3a6:a86f:33cd with SMTP id d11-20020ac8060b000000b003a6a86f33cdmr56232090qth.51.1671537139813; Tue, 20 Dec 2022 03:52:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671537139; cv=none; d=google.com; s=arc-20160816; b=TtMohicWIkimNQtwIXezy+V0M2VATevChAhh2MQsLJxZjWrp/OTa1kOo4pA5R5ABdR iJexDbTx2Ktix3Zo6iI854jsMfHk16yf0eM0GI5UbcT8XX+XEcPVkYQIhfTll699K0L4 rnSTak/99A3VbD55etfS5KjqEhjCf4HTg9AFMmjgQvQXP8qqMj4NJ/a6foKzxyDLv7ON 1l33su7hj3Ncf1cI2DO1APgPuOWY07BHMaFQgBbKhmRmKupR7FgSr51l2pTY6BFDL9DI ta8Gex5sZkQVTR9SZyM+d++2r3ctlc55rKKNticJ4q3nD4qxn5BA3dVwUqM4Dc7mmIsh 2Lpg== 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=VCqVdn1MR+8q4KNBpfFHWACRBuZ63eQE6lUtevF78ks=; b=ZSiw+QUNfhdl7GQK/ZFz+D/zqqnuAwoqRl55x+6B3e/gsAr/YYB9UoNA/gVcdcsyq6 p1tmg1HrIpttUc+xN4zJ9sampJuwXJibdOZA+lKo2TpklMWprgU4fyxq6npEw77fGvQG 6/3CB2cokgqNDOBZM6Zpdjd7lKks9zGYjPN5uS7nVj7guOJhQqz7BwOue7ZiLi3JDvLH 8exwc8xE7ygYIDUAw1ZLqteJw7jzxU8TMllGAuNf9/2ZBiEFUhhPUKj9YAgJkV1IUQGF cUH/+KhczTiRd+Isj35YlXVKsJLvil8vj2UAZt323nz2WmvvMG2+U7uEA/IiAyTu3uML 6HqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m9I9n35A; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i9-20020a05620a248900b006fb112f50b8si5580246qkn.287.2022.12.20.03.52.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Dec 2022 03:52:19 -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=@linaro.org header.s=google header.b=m9I9n35A; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7aX9-00043S-7F; Tue, 20 Dec 2022 06:11:43 -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 1p7aX1-0003xo-JZ for qemu-devel@nongnu.org; Tue, 20 Dec 2022 06:11:37 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7aWz-0003gq-DK for qemu-devel@nongnu.org; Tue, 20 Dec 2022 06:11:35 -0500 Received: by mail-wr1-x42a.google.com with SMTP id y16so11410922wrm.2 for ; Tue, 20 Dec 2022 03:11:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VCqVdn1MR+8q4KNBpfFHWACRBuZ63eQE6lUtevF78ks=; b=m9I9n35AZ90i95iGax9u7TMEhXh7YAgapljHRhcm9uHC7lNWfexO1qBDhFJ+eT6yAk pb7tjkxt8a9fnvXwhL1OZl3cLsWZ57AZyxLQIiEw7nqPnlw12nq2nAAQ11p+GrHyj89x RbV4SX0JnJIFLo1+fP9WCPCr2m20x8jtQ7bpQQUeDDgeCYwmbtjzERyHVGCUa79+tp78 ZONVI4oYhg0VE5tf5dB8qzcZguYjslbQFR7jGUQfdoYTPNTJqmshERVhOcGcxyeD1gFW Fi3rjU3B2eH3toD1xXNyDBsHMYVL1no2D7+I8rASgT1QhX5n/JkwvBsSGldVntLOqOdc HTPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VCqVdn1MR+8q4KNBpfFHWACRBuZ63eQE6lUtevF78ks=; b=wyTPTN8lCy/JTyB3us5HexMpqjV6ZM2NLM3qhN3yF92zeeH+GvVPmYTvdkauB2Sku8 yZ6y+Rg1dhroPEIkjJdAcqu10vvnec2HHKhgWAx1w+RbSYiPKbA8EjeHjWVjZIWxTxKb 7X2aSRbN3tjtWChiOzCZ75rOu1iDCNawn8elkbWAD9T0dZkwhHZhMttszCqdWALWm7SG o/auEDqH2IPFY5p7SYTya5xoKFlyNlnOEfa8MhDEpTvoxIFC5LbK5hl5zHtclORMF7FA Lq+dKPvB0XfDvfwNacPb4CCeUGk7Ea7ZSnP+VEpa1qe3hV83MA34SSvWnkpxzd5R6HAo VHRA== X-Gm-Message-State: AFqh2kr5TkdBjZ0tBPFFyOYpAmtzfd1SReOppHTMhu+6q+5zFsGzkNTd ZtQkiBLu0iYdSlFrKnSRdRfxGfdQ11374QJ9xYU= X-Received: by 2002:a5d:4143:0:b0:262:3647:c1b1 with SMTP id c3-20020a5d4143000000b002623647c1b1mr862528wrq.58.1671534691371; Tue, 20 Dec 2022 03:11:31 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id p2-20020adfe602000000b002368f6b56desm14709827wrm.18.2022.12.20.03.11.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 20 Dec 2022 03:11:30 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Greg Kurz , Daniel Henrique Barboza , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Xiaojuan Yang , Aurelien Jarno , Huacai Chen , Aleksandar Rikalo , qemu-arm@nongnu.org, David Gibson , Jiaxun Yang , Markus Armbruster , Song Gao , Richard Henderson Subject: [PATCH RESEND v2 1/5] target/arm: Restrict 'qapi-commands-machine.h' to system emulation Date: Tue, 20 Dec 2022 12:11:18 +0100 Message-Id: <20221220111122.8966-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220111122.8966-1-philmd@linaro.org> References: <20221220111122.8966-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 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). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/helper.c | 29 ----------------------------- target/arm/m_helper.c | 1 - target/arm/monitor.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index bac2ea62c4..399603b680 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -27,7 +27,6 @@ #include "sysemu/cpu-timers.h" #include "sysemu/kvm.h" #include "qemu/range.h" -#include "qapi/qapi-commands-machine-target.h" #include "qapi/error.h" #include "qemu/guest-random.h" #ifdef CONFIG_TCG @@ -8514,34 +8513,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/m_helper.c b/target/arm/m_helper.c index 355cd4d60a..11008528b5 100644 --- a/target/arm/m_helper.c +++ b/target/arm/m_helper.c @@ -26,7 +26,6 @@ #include "sysemu/cpus.h" #include "sysemu/kvm.h" #include "qemu/range.h" -#include "qapi/qapi-commands-machine-target.h" #include "qapi/error.h" #include "qemu/guest-random.h" #ifdef CONFIG_TCG diff --git a/target/arm/monitor.c b/target/arm/monitor.c index ecdd5ee817..c8fa524002 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.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; +}