From patchwork Wed May 1 14:37:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 793722 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:54f:b0:34d:5089:5a9e with SMTP id b15csp790791wrf; Wed, 1 May 2024 07:39:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUBtvcpmGqB+YJfr8Vx8Ga9wvIjMUDfp4HTNzy03aTzKxjQAEptNzgN7sjg7SFSe0DUYW8jDPt7aOK3EJfaWDB8 X-Google-Smtp-Source: AGHT+IFy8uUaZlEzxfIkf1wndyAYoVmuM6tm/mM1nugYdVGkvhyDr7PIRJRaz0eNVW+mM3vv+6cP X-Received: by 2002:a05:6808:2814:b0:3c8:2b6f:de1d with SMTP id et20-20020a056808281400b003c82b6fde1dmr2598298oib.6.1714574375857; Wed, 01 May 2024 07:39:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714574375; cv=none; d=google.com; s=arc-20160816; b=DvncePxfe03nvYJf7U2+GWVj9tGooxGl3EtdNgc/0tKVgimqY08pz/ZSKOU3PvbSG/ ID6JxvlECXRJBxv3zfNGM577vN1RW9G7I1q1MqD6VfC4Ac0Vr5FFWDtTGQ5ydzQsBSML RKnYRrBgUvaVYKkmeZASPq8NeI+R9t07YeAAbNljedgkq9f8uxoRS12yQXyZUO+HcyCQ yuun+Ik0qDan0hdUps4kNRDrmmVJiLkRsBS2VrM0R3UNkeFbx51Fm5RIVbsTsEqJUWoE uAf9oK1ndDPnb9re6SSP5vT3jv44MXdeUpyHOiKgkE/YjpJwT6h+77aiJ5d1pdApM4ST 7cig== 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=Yq7gfhqzCEYtWciBbW30RRAKn3Q931Bk5u6D2pAF6UU=; fh=eu2DY09p+eeddYDiV+DalJS3Vr0kxK5BujclYkgWvDw=; b=SDlFaK+SlhzdMJZ6vMncH7Km5ZKBbIcTUYF0H+1g/n3wEivXcep2/dFBojlmDTLMWG p1+JY6Q+ArnEZulFOpwoU3pgdIWvFzLxLVuljPoC1kFA0HHLK1DPZ68K62nk5Kxbdkcm SNvmqwIYABinDjHrGP1OXOKjDqxFRYK75h8Wp2wn9DE3zoqLdHgDkvMPneUMXfQ80okY PREEerMTQXbE9HSWaPmhYRGxvYOPGfOOJVma/gdqTPMI9DPPU6Tx/DqscO2ctUJ7PDg7 xiXrldDUa5j42luHMOMPSERIxDp6pMSa0sH2AvLSyc5B1tE/PQZ5xn+bvr1JR1930+J4 gllw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qXotNAux; 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 o15-20020a05622a138f00b0043affa6212fsi5809515qtk.801.2024.05.01.07.39.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 May 2024 07:39:35 -0700 (PDT) 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=qXotNAux; 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 1s2B6H-0002va-QO; Wed, 01 May 2024 10:38:25 -0400 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 1s2B5n-0002h3-IZ for qemu-devel@nongnu.org; Wed, 01 May 2024 10:37:56 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2B5l-00029C-7d for qemu-devel@nongnu.org; Wed, 01 May 2024 10:37:54 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1ec92e355bfso6587915ad.3 for ; Wed, 01 May 2024 07:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714574272; x=1715179072; darn=nongnu.org; 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=Yq7gfhqzCEYtWciBbW30RRAKn3Q931Bk5u6D2pAF6UU=; b=qXotNAux2/Veppk9v5okXtsAUrjFB/1Xbyl6tDFWSH7EQKPXbJv1853CEg3XdoRcIA 0iXCp7h8JItymWUDAR3Y49GKFMIKtm8b3l0W5NaQgQ6h6pE7eHT1HrJH45VNWnpXok1x vRmQEzFVKJ2dVNDZ1UTMiyy49fwdsFnFDq9gDXZwzBlAt58FjIH83vZfwhCSGD7BpA89 tZtq/KbYPnVNfpWLggJp7nMVzJ8G4vJ5O3+4Htx0+J7sM7X5M2I3MyKXFvu7zku240Um 6F5/f7l0VoqWiDEVVIAsltSJNdJ8EB200nchMjy17vTSZKLwInZEY1fiDoaapJW4ca3C +QvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714574272; x=1715179072; 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=Yq7gfhqzCEYtWciBbW30RRAKn3Q931Bk5u6D2pAF6UU=; b=fA3tds+EqvoAE3OUWEELkM3TCBfEkMvWq0FLFBkwO6h2OgWRo1lhsUFCRJce41zaeW Ass7ZIJY/oVRi5/yD02S6CC+su5+57SZGNocRnl4obMbIt9LBzYC475/HSuILbE3eIEr NLUGorRlyMeiWQCSxtxkA0mToi3EfaRrAsIGuniUqWAIdRhMWYqWU+uH7r8s4K1gx8ry rP4Jyua6Nm48VEAMM2sEhvPfVptOSzuKmgilbXMYN0pzqWbXO55OWe1vJGaM5HXCtpaL 9porNrjl/KdFXWiyFIpQVXZ/5VMr4tauQ5kEjrkwZtCmhUvCtA/TFdtduoV4N/3L8rcv lR7g== X-Gm-Message-State: AOJu0Yy2xcdo0Hp3ggqcKNDtrExgH9xs1SRNYWEo93gOuSvrhKTiKMTf 1HlpsWhwqLetAiC7QBR6dn32x4vJ88C34u9gPoTw5s0/gtas7FSBEQMy0ZES5gHqu4K1BZwn+RR k X-Received: by 2002:a17:902:ee84:b0:1e5:10e5:b66e with SMTP id a4-20020a170902ee8400b001e510e5b66emr2286173pld.27.1714574271727; Wed, 01 May 2024 07:37:51 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f54c00b001ebd73f61fcsm5751573plf.121.2024.05.01.07.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 07:37:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 11/20] plugins: Remove plugin helpers Date: Wed, 1 May 2024 07:37:30 -0700 Message-Id: <20240501143739.10541-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240501143739.10541-1-richard.henderson@linaro.org> References: <20240501143739.10541-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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=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 These placeholder helpers are no longer required. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- accel/tcg/plugin-helpers.h | 5 ----- include/exec/helper-gen-common.h | 4 ---- include/exec/helper-proto-common.h | 4 ---- accel/tcg/plugin-gen.c | 20 -------------------- 4 files changed, 33 deletions(-) delete mode 100644 accel/tcg/plugin-helpers.h diff --git a/accel/tcg/plugin-helpers.h b/accel/tcg/plugin-helpers.h deleted file mode 100644 index 11796436f3..0000000000 --- a/accel/tcg/plugin-helpers.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef CONFIG_PLUGIN -DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb_no_wg, TCG_CALL_NO_WG | TCG_CALL_PLUGIN, void, i32, ptr) -DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb_no_rwg, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, ptr) -DEF_HELPER_FLAGS_4(plugin_vcpu_mem_cb, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, i32, i64, ptr) -#endif diff --git a/include/exec/helper-gen-common.h b/include/exec/helper-gen-common.h index 5d6d78a625..834590dc4e 100644 --- a/include/exec/helper-gen-common.h +++ b/include/exec/helper-gen-common.h @@ -11,8 +11,4 @@ #include "exec/helper-gen.h.inc" #undef HELPER_H -#define HELPER_H "accel/tcg/plugin-helpers.h" -#include "exec/helper-gen.h.inc" -#undef HELPER_H - #endif /* HELPER_GEN_COMMON_H */ diff --git a/include/exec/helper-proto-common.h b/include/exec/helper-proto-common.h index 8b67170a22..16782ef46c 100644 --- a/include/exec/helper-proto-common.h +++ b/include/exec/helper-proto-common.h @@ -13,8 +13,4 @@ #include "exec/helper-proto.h.inc" #undef HELPER_H -#define HELPER_H "accel/tcg/plugin-helpers.h" -#include "exec/helper-proto.h.inc" -#undef HELPER_H - #endif /* HELPER_PROTO_COMMON_H */ diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 8f8ae156b6..fb77585ac0 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -51,11 +51,6 @@ #include "exec/exec-all.h" #include "exec/plugin-gen.h" #include "exec/translator.h" -#include "exec/helper-proto-common.h" - -#define HELPER_H "accel/tcg/plugin-helpers.h" -#include "exec/helper-info.c.inc" -#undef HELPER_H /* * plugin_cb_start TCG op args[]: @@ -82,21 +77,6 @@ enum plugin_gen_cb { PLUGIN_GEN_N_CBS, }; -/* - * These helpers are stubs that get dynamically switched out for calls - * direct to the plugin if they are subscribed to. - */ -void HELPER(plugin_vcpu_udata_cb_no_wg)(uint32_t cpu_index, void *udata) -{ } - -void HELPER(plugin_vcpu_udata_cb_no_rwg)(uint32_t cpu_index, void *udata) -{ } - -void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index, - qemu_plugin_meminfo_t info, uint64_t vaddr, - void *userdata) -{ } - static void plugin_gen_empty_callback(enum plugin_gen_from from) { switch (from) {