From patchwork Wed Apr 24 23:02:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 791559 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp1095893wrq; Wed, 24 Apr 2024 16:03:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDc3f3Rv9BIzv1ofqxGTI37AS9kQcZfSaNAIxYOtQPuOTnP+qI8/BvdDZu+NNeYk1bJ3DrLMj3TU0Saq8sjgPQ X-Google-Smtp-Source: AGHT+IEiNp2v959I63R5gFxO77LAveIPPHluQz4+p1QNCac9x/pYzb9T2fay3epTDI5kXJ/1L2Em X-Received: by 2002:a05:6808:1309:b0:3c6:1510:f35a with SMTP id y9-20020a056808130900b003c61510f35amr5762857oiv.9.1713999813394; Wed, 24 Apr 2024 16:03:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713999813; cv=none; d=google.com; s=arc-20160816; b=tXZkrjpfAmg3WvzTdTg0QrB8EUmAA2R2yjr91hCXKzgiYztP++eNe3bUrs2P17LPkj z8If4zKqyDGBtRetxq/t0B4lGYZt9WS7Jj6X+rssMqgfkvKe1faFr/hKsYW8w+0pA/GF h7mx5OraSlda8vDxJA07G26IT86ta1gxJTh0jfKAdBWOgZB5XR5F0PFVAeiI9z7TV7DD 74ywussvobysB6rDuoh/nWadgR6j9zcxft5nWgwGWJB31eEg5mxonV/VadAxy4CXCjzH zBJogovo34VZXoUD9BHND9GNF9Vjx77KqY30Ld6YDGJ2QNmISw7ZFw6mXgywFmbOzBz9 5+OQ== 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=Wz+oQ2uxWFSLk0/nXq3ydGEsFZquHMlDUF8OYspeJTlvJCp/aEn52bXNLEoUF/H5U5 sdm6z3z7VTs2KGTqOw/c1zcMh4tn0zFu2LmITanez3KPOmvKNO8p9scw8cbdPKTF6ORf klaeAXxh4mE1ulQzws4IKGQu9Iur+g2YuFzN1ItXHmK+JT12ase8siY0Tutvp0gCN7w9 FT9pPpDQgfMXtMSNQNZX5X5QS0atNKtccvs/nyKRxYlfLFNmcuD5YNwIiL4EX827Awxl 8UNpB8YDb7hiiC870OnQi50D8NdE/w2ft7VPSvYWdG/pra4tVtpXkRpMwx1pGz97y3Q6 ZR+w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oUBw6Hnu; 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 4-20020a056214202400b006a065ac27f5si13169327qvf.596.2024.04.24.16.03.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 16:03:33 -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=oUBw6Hnu; 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 1rzldT-0003mA-DU; Wed, 24 Apr 2024 19:02:43 -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 1rzldR-0003l7-UO for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:02:41 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzldP-0002eA-JL for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:02:41 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6ecee1f325bso441777b3a.2 for ; Wed, 24 Apr 2024 16:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713999758; x=1714604558; 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=oUBw6HnugmgtnHSy90lqeLge7UPZplMGuYSYmnqX01psRsWjDjqDQ9rdjJghTnhTEQ /QpDlmuXC35Z3lv7YM/rdZHA+h01aJEPjhKMuEHhOp29iHkfDeYG2p9P3583belVkIsZ 5Vl/e2s9lpKur67j45NnbEd2aPazmZEV+a9RZG8sF5hRqwmhEIFVMX4S0F0FkpWQYcG5 0KB/Q9mJAcHjKMvMJhca6edv9qF811iVrSqNK5BOivBGS/5NiLZIcgdw/f0pmofKhHH5 maCrBi0SesQs+457UUjXlzTqGKZYXF4YBELmsq91znB0d9yNPGb9/KkGIw65lLwh/ALJ w+Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713999758; x=1714604558; 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=AR8dYhHuSlJnYABP8KklkDXL5CgRse1x5MdQEO0nszf8zoZjVCnahnMW+f75JqztM7 /yecg/H9h4lVDMBWS45dftxyuFzVa4UEQSDmkKyTx/4YOwFNLVLIyBYaFwUv6FSszESv pt1zveMQUP5T7CcOEM8RlI6E4q3hYKTYi7o90Hhqh6nMxatvRZGN0O5BGcKWR1B6/KTA LVe9kregTpNMa6+qJiA3nQUDDAggOFstxdA/YXIhxtrafIRaeWKjq/ln8Qvh1FtZh8sM PEB/r9qUud49KrCQpXeHf5PtpdVdZ3KVNUZHOPhzJXrrpP9jkG+wCfo89I1LsGIe22br rXHQ== X-Gm-Message-State: AOJu0Yy0Vn0GloSwjlEKLoIwAZVz/QgLxccRtsYNNWwBPrCD3W65Hz6W Nva30rMSpaAjSQjN81pQfi+YyHgZJQ4TcxTIJBiMFmISLp29FBM2izNAE66q/iQCSKwa03aUsbM v X-Received: by 2002:a05:6a00:4fc1:b0:6ea:d61b:edf4 with SMTP id le1-20020a056a004fc100b006ead61bedf4mr6794180pfb.7.1713999758287; Wed, 24 Apr 2024 16:02:38 -0700 (PDT) Received: from stoup.. ([156.19.246.23]) by smtp.gmail.com with ESMTPSA id h5-20020a056a00000500b006ed4aa9d5c0sm11981405pfk.188.2024.04.24.16.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 16:02:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 11/20] plugins: Remove plugin helpers Date: Wed, 24 Apr 2024 16:02:15 -0700 Message-Id: <20240424230224.941028-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424230224.941028-1-richard.henderson@linaro.org> References: <20240424230224.941028-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.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) {