From patchwork Thu Apr 4 23:06:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 785854 Delivered-To: patch@linaro.org Received: by 2002:adf:f001:0:b0:33e:7753:30bd with SMTP id j1csp1074367wro; Thu, 4 Apr 2024 16:08:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVTZ0oPkGTJjfrJk+RVfdjykMg1uHYerS1y6OXqVwM1sMDWgx/K9yEZrOZlLWoO0kmsxUPZBDc2JelmxVrrLSA1 X-Google-Smtp-Source: AGHT+IGC/DDBqejVSNsiUKQB4g85vujDITgfNXfoXmE8WAhbgZyQMpQjY/OOogM5riAmTjUpM4KA X-Received: by 2002:a05:6808:2184:b0:3c3:e2e2:ec7c with SMTP id be4-20020a056808218400b003c3e2e2ec7cmr4863408oib.31.1712272118218; Thu, 04 Apr 2024 16:08:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712272118; cv=none; d=google.com; s=arc-20160816; b=Z9lV25U9Sy/hA0Yt3Qx/DLUps+LRtN8e/Q2USB1IUrUOxFgvUAzoMv1pWeIDEJrLHP eAG4PsWLepFBxC+tiDlLLKVbL8BGf/6LX2Bu1edurUyOf2DfvMXfwIHjPNN+naNv//Zo H4i7b3W+WjVlarKwXJTzy+7frRlyqWFzyQv/7z6okz7DfruTh2wNyOWfMdcx8fLF6mK+ 9+Ruj95nxein4oBy+KqbGnfVCGT9OuglNzNTGZ8OYDrmGomBqgmBbZIQCodVKvPcIGA9 hTT1NmcZaPrIq6hmoGjzVViRhSKgi67y/263sDyYNGGV6NYZwSBf8pMyuAhDKIpHb7qN JTIg== 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=RzYzU7RypP3Y+HHaxfaYXazYrOjoOSxUmTQNH2aYDBw=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=Xc3LJTzP/9mg0LjWBSKHCyriCdjiEp4UWpZq+D1ONFLvvvwwZmhwVbeTjjHAcOejOn whKol6WrJtyCw9exszvrJ4n9iJGSgGUwJee9RTiI/nNa4Hq5HWyAems3UZNrpotZJH3K eGmYKPmzqUISqWXDtFMIxZMg73u04VGDiFwOzBk2Qt6UMfZZcu2GwieEO7XcupnCUGz1 FkvaivfpYh/FfsacgPS4mwQi2iO61lfOCVz4TumUtSk/H2Ga2/1XMfQ/bSAoXdOXLDW2 HvGa5CzGkRp7DNf0wtasNW98Uh/iy1kQFXlw+0KjXW8tdwLZ5mNNpQDAAeMObkigc815 ysoA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YoXeEzup; 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 t9-20020a05622a01c900b00431310f8ba4si430163qtw.340.2024.04.04.16.08.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Apr 2024 16:08:38 -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=YoXeEzup; 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 1rsWAX-00029F-Pe; Thu, 04 Apr 2024 19:06:53 -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 1rsWAS-00027n-Dn for qemu-devel@nongnu.org; Thu, 04 Apr 2024 19:06:48 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsWAH-0007ns-2o for qemu-devel@nongnu.org; Thu, 04 Apr 2024 19:06:45 -0400 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-29ddfada0d0so1123350a91.3 for ; Thu, 04 Apr 2024 16:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712271995; x=1712876795; 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=RzYzU7RypP3Y+HHaxfaYXazYrOjoOSxUmTQNH2aYDBw=; b=YoXeEzupH6xqdljw1B/7iOAqN+hBKYCVDOuhA+nJPpF9eaCVsShQDFD3jUENwSejWo Ub/MXkWbUKx2qJlO1sV+skZbqA9+zefqgU2XD7VmX+a9iffzfAcwxTofB4R64wOjDtYG /a/N05+cOfBuwr+rbGw8hOYPMsiuNZCACGndevnkGjCeL9sdIdLDGoCYRoZ0B9mBUyCH Hfulo/mhke0/xY6Zd+Ovtntg9y0OzkwFkYI25+8cxmfuQtdTaPZe1Fu4CKvVXt7WsN+d D7PCnOb3F6/1a1LbkDIcp7AkY/wyuQr5PhTyKuAT+/64a1c3H2Dda0E/DkAMc/uAWrBT QwHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712271995; x=1712876795; 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=RzYzU7RypP3Y+HHaxfaYXazYrOjoOSxUmTQNH2aYDBw=; b=S+NazxclUMbOc+tsKICklz8cmVnRqrVy4JUj0Tw2L+lbbXY1SKyQ2OBwwDjx4pNAAK Y8mwPbZyPnZMPVCPJJOvnaWrzc7lG0NT2uMwGzDFtTvrE6hzGdIH4H5HBK+1nitgWR/F KYZIum5uhgb5R6NI+vV9tFwOPafA08t5wcolbCNjcZIFV9xWANmhZEBi5CzIF8iIT+4s cNkK0PH+cE8xjZozRhPb4Nytf9FnVMO0YCm25RewAqP2kg7hmUBwBaLK4AKkfDyVh5La AGjgJcCZxfJkOdYgXDWk+tC6L3cr3bXGRlLzst4YL/ttI+VZVorfAnA8RSWsmTixQorM N3yw== X-Gm-Message-State: AOJu0Yztc4qK4uZNmZYuq/rvGylvibqNhlYAEHWzrQwQkNpyC1k8aj0k zdD3/CIF4fijh6VyugWbrH/24SSF4dglMOhVroQEi2ngdo7afNUOXg4qKZNzim/K1uOdpKE664+ q X-Received: by 2002:a17:90b:358f:b0:2a2:9f46:439 with SMTP id mm15-20020a17090b358f00b002a29f460439mr4249752pjb.9.1712271995698; Thu, 04 Apr 2024 16:06:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 16:06:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PATCH v2 16/21] plugins: Introduce PLUGIN_CB_MEM_REGULAR Date: Thu, 4 Apr 2024 13:06:06 -1000 Message-Id: <20240404230611.21231-17-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::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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, T_SPF_TEMPERROR=0.01 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 Use different enumerators for vcpu_udata and vcpu_mem callbacks. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- include/qemu/plugin.h | 1 + accel/tcg/plugin-gen.c | 2 +- plugins/core.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index cf9758be55..34498da717 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -67,6 +67,7 @@ union qemu_plugin_cb_sig { enum plugin_dyn_cb_type { PLUGIN_CB_REGULAR, + PLUGIN_CB_MEM_REGULAR, PLUGIN_CB_INLINE, }; diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index e77ff2a565..c545303956 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -361,7 +361,7 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) if (cb->rw & rw) { switch (cb->type) { - case PLUGIN_CB_REGULAR: + case PLUGIN_CB_MEM_REGULAR: gen_mem_cb(cb, meminfo, addr); break; case PLUGIN_CB_INLINE: diff --git a/plugins/core.c b/plugins/core.c index b0615f1e7f..0213513ec6 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -391,7 +391,7 @@ void plugin_register_vcpu_mem_cb(GArray **arr, struct qemu_plugin_dyn_cb *dyn_cb = plugin_get_dyn_cb(arr); dyn_cb->userp = udata; - dyn_cb->type = PLUGIN_CB_REGULAR; + dyn_cb->type = PLUGIN_CB_MEM_REGULAR; dyn_cb->rw = rw; dyn_cb->regular.f.vcpu_mem = cb; @@ -547,7 +547,7 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr, break; } switch (cb->type) { - case PLUGIN_CB_REGULAR: + case PLUGIN_CB_MEM_REGULAR: cb->regular.f.vcpu_mem(cpu->cpu_index, make_plugin_meminfo(oi, rw), vaddr, cb->userp); break;