From patchwork Thu Apr 4 23:06:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 785857 Delivered-To: patch@linaro.org Received: by 2002:adf:f001:0:b0:33e:7753:30bd with SMTP id j1csp1074469wro; Thu, 4 Apr 2024 16:08:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW3ahgZjXo5Jgsox0HdzTZ96IJYXLVGyRG5x6U7tbT/Ntkh1X7MQZnqgKBxMXZy323VI2RRpQTRLWtRHml694Cw X-Google-Smtp-Source: AGHT+IGp4PeVfwPhdCOU4fXJUVcyrOvLquQhoXhKNbZBWENHZwi7+LFBi4LtRmoJzRNV+qtrRJuq X-Received: by 2002:a05:6358:27a8:b0:183:40f2:4bd6 with SMTP id l40-20020a05635827a800b0018340f24bd6mr4041706rwb.0.1712272135163; Thu, 04 Apr 2024 16:08:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712272135; cv=none; d=google.com; s=arc-20160816; b=x5Zjc1wT25EwBfyO5J3xte7wzh6LYyuhB1K8sQNdeRyplCH0juna9mCHFioiUk/6af IaZ/h+xQ3X8vXFHyJJHlCKruu3pZskCOk/lpTczfvRoaIDFwseRFLaf+0pLBJokWOrWs ggz6RwebgB/E0ZJKTZP8ggn/5U2aKD6yyf6xRxokx4t+d+y+KO05bVR0wblWreEO7Asb VnYT/5iWmnDBjxjvc8ocn5XXR5N/gK52tD467oW5ZbIYBUgf/+DckIT/42YZaD/cuaz6 57tst7Y5gghjSCRRK+1ByJJskHyhyF8mm/WRkKsdr/Ha8E7TFLhcEyfVQuzXDUt1A9cP A39g== 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=SxLbjCmUyTXKJbpP+14MXI0vD18/ebrLi1HLZV0yLuy9Y2nmfYxoMdvkeYXZqutdaf ShW5lv8Kvg+1OnQE67XhGjXtQrbsTYbDb93oBb6AQyiL79m6Lfg0YbPTAfRk/IbG06mo AXXt9V3W1vDSyQ//q9dvuTC15WW1hDpAsHd90Wua9ESX5QdhL9+L8TjpN3o/jSvYaNR6 or71jC1DhoPEHWo7WbUONuGZ6Oz6XpFGwrxT1RipLKL85JXzxrPJ6R/HUgP1jh3RCenM FiL8vkXhGhkX5+/rp2sP5qUqGCV4q7jtJh3xUoisAE8YTxxZSo3QEIhWlm8wELbVXOBU KeRw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VfeHwPPJ; 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 u16-20020a05620a0c5000b0078a0759f66esi542669qki.69.2024.04.04.16.08.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Apr 2024 16:08:55 -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=VfeHwPPJ; 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 1rsWAV-00028C-Ax; Thu, 04 Apr 2024 19:06:51 -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 1rsWAF-00023Y-LC for qemu-devel@nongnu.org; Thu, 04 Apr 2024 19:06:37 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsWAC-0007lG-6s for qemu-devel@nongnu.org; Thu, 04 Apr 2024 19:06:35 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6ea9a60f7f5so1371809b3a.3 for ; Thu, 04 Apr 2024 16:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712271990; x=1712876790; 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=VfeHwPPJiwnzKiBjfbW+AytV1ytBTL4sxpnd7g18S7o357PUa/QCmcowyKxmN2eZdW 1bBwZYC4hxLbeG4vObg9IDL/84TVhEmBnBvRIzWxa3n+cUkJzllW1kPVSt5fIyMmlLEL 5+kKE+IzyvFKjc3i3y2M+w5Ha3sKLL1KOVj0x6wrqgNzI4gRgDy1fzbrUsN5fUvp82Xc PEPV5sIKd8ut5rcDFvverTLrwflUpGATszsp3qeoc+I0lHsZHQ2ePHdxUY8Cgo2P20DM 3Ba9ZljT4qiOdLQpHX048FqPNzPyX/vCedN5IH69v/Nt3fgKtWd5Aiq/i9NYO8x4B/VT x8gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712271990; x=1712876790; 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=l0+MBcWbUscW/5sm2ghgSJbfZXtmjOS0xe+mLYb+oRewMND7gZEYSNHNONTIjZ99+4 vCiqLdAUd4LZYJvRNhxssbQOfLDu5NNQaqzrU+LFcm6ecP3XUEwZJ8LMd9e1xiDVat4z HibNuE/BrNp2ZVSL7aQDX9/1qvg3UYU4AhQZgwclir32V7FB9XwfbQPNM8AVI+08hk6d Ege7PHQcVJJuf4JgA52gc9f0HywVML+zu1OKIoZ1ksrnb9ARPFCw3CZOylbfr7S7+vwE oqA3hAIbZ/Ce/qm903u5hqQ0zQbMPCxAcY1kWt5KRMddyvOlIiS5/AWpgwKOfmnFl0vG PaFA== X-Gm-Message-State: AOJu0YyhZPy1kd183nmI46cpmhjp5U4Kj7snCpmH8pQ0ViuYvbGPxEbY 1dV0ilJHYerdTNUdAazWHvxry0IT0TglCbpMQikRlGhNFr+6+LQOGAtaIzW5/nKpmBOnat9+0kl 2 X-Received: by 2002:a17:90a:c58a:b0:2a2:c353:7c38 with SMTP id l10-20020a17090ac58a00b002a2c3537c38mr3388116pjt.24.1712271989924; Thu, 04 Apr 2024 16:06:29 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id q36-20020a17090a17a700b002a2f3cfc92asm1052592pja.16.2024.04.04.16.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 16:06:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v2 12/21] plugins: Remove plugin helpers Date: Thu, 4 Apr 2024 13:06:02 -1000 Message-Id: <20240404230611.21231-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240404230611.21231-1-richard.henderson@linaro.org> References: <20240404230611.21231-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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) {