From patchwork Tue May 14 17:42:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 796755 Delivered-To: patch@linaro.org Received: by 2002:a5d:452e:0:b0:34e:ceec:bfcd with SMTP id j14csp2612718wra; Tue, 14 May 2024 10:48:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV2+j+zOYqcOFPqjICMZVgmUZQHSXjC1CxWzcmxVQIGMfvAhB3ZiO6rp1qRSPdmzidTpoaLQZpkN966en3AiHhu X-Google-Smtp-Source: AGHT+IEkZlOIrQwj/AbM9vWuSv6zXa94jS0CJmlP5O+Zar91YAvaiMZmlF1CpUhXBEmuZ2mu/ixO X-Received: by 2002:a05:622a:1887:b0:43d:fffe:2d15 with SMTP id d75a77b69052e-43dfffe2ec7mr161241981cf.43.1715708919276; Tue, 14 May 2024 10:48:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715708919; cv=none; d=google.com; s=arc-20160816; b=XOUWw28uWcfzdWdrvimikOy07o+l8crVoPgfKxoKBl7DxeNX1izPe/vw89xILx4xAo U05zchOO88XK1JhVwo7e1HPjJvsRaLVxTkEnqpB8G0ClN47ANsKePm+M65Wg2ZWLCdZd mz74o3HCWnWsW7+pLplmpnmM1PUURogsB3n/r/Pfb5q7aBkGQsgRr0zOfzWOGB/d5Wiq +tuTfkyHTYWGGEGuLTWvvo8RMxlDKEinvpH+oEV5CGARpESbpMRHehNU545V5IkPpLVG hQvJqSr6hW4S1MRcJBed2C2DE+caCEIiElcGHRC5pRV6TP2OpMzKG5xO/m5Y9pV7kpZi 7eRA== 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=eV/zf5lPaGHYQYWT03Xfqb/pBXEE5bjNOFAW4VPpOm0=; fh=AUhhMvfuqYV1WD/1Jx7Q0Z0LnvlruScCfdPWYDT2uE8=; b=poxp5KdY4t4oF6olXf72emxNGNVOwmN647fSBsE+hlI73KUWsMep5myhZBjYoWlv9z S4rCVmZwOtHRI1ojCzLy9FPposAsKhn0yR8qoXyvQ1/5KS3wSJakvd3e+/HbzYwKCdk1 QQ5chpffkJdNsrE3cOvlm0z9VTkf5HmqY2hX4dys9fHpJ+L+7rIK6htJrmzwOknHrUZI JcTgwGFoV1dznNKfCN6e5laZ1jbzVHnVZS+84JEXzu+FJ4KzzYKzuWJXNIqZy3LOIqUD ffX4kAM0cZegyACbzSFNo6m7R3fwwhFZxeWBSCJSQwNrxfcYQrARuBWif5gaqfp9Z/Cx Af0g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K6C7F8Mm; 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 d75a77b69052e-43e086dc93esi85301981cf.779.2024.05.14.10.48.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2024 10:48:39 -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=K6C7F8Mm; 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 1s6wBm-0004xd-NH; Tue, 14 May 2024 13:43:46 -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 1s6wBY-0004s5-9j for qemu-devel@nongnu.org; Tue, 14 May 2024 13:43:39 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s6wBP-0004uL-7z for qemu-devel@nongnu.org; Tue, 14 May 2024 13:43:29 -0400 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-572baf393ddso1731835a12.1 for ; Tue, 14 May 2024 10:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715708581; x=1716313381; 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=eV/zf5lPaGHYQYWT03Xfqb/pBXEE5bjNOFAW4VPpOm0=; b=K6C7F8MmKE4Ov8CCttiljURFvP1yzM0kb5aTbhu0/PH+p1l7gzsoZrOZ4EodxUb1pv sOfm80xatt+PSGTvmyrTw80VokDeThm0O/UA6navlavQZRHqeLqn4Ouq88FyVOFctrRG 7n6/TmgL0QsLfHemW40TgM6ukc/UpR2Hr0hjVZgLJizOfO0a2MTKPzb7Sn+lKmMOhdyQ NT6pq0Ck33jAM+sl4T+8aqPIolhxjgllY4J8wfiFwkkGDVcb/aNYig8yp5gEXkWuymbt ZCxs16P9vvoNDbIUQOd3CeW9NpFKaAzkjdQrgtxnxmHRmkpZgFVgCRoX530cZKFYwC8P I8aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715708581; x=1716313381; 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=eV/zf5lPaGHYQYWT03Xfqb/pBXEE5bjNOFAW4VPpOm0=; b=VWnrx6j3VgdWPp2nfWk/ktaEN/MSEY7utiXepHPuGVFmiFDbBjBA28RnwC0t6C8LzF jukcgBZ2dQrzZp6NmkJvsbZgdhe8uJtghsXW+g5KsLaBj7f9cwwTgt0VK3sGLDB2sBCq dirbmXIlvdRZQ0X/r3xPL9pP+i/JMAURyAdtu5sYPZ+HPUWlDwVLj+T8RRw4LL7a+k2L bKfA+iAsJHBe/JhDVu/4RztvYS2FijXWA3bz/lJcJLTWMLtMzGU8pHHHeFYqEq4V20L8 fYcRXjSPyC+rXlZAOxdqd1mH5HD4XyPN80MDXK0jxo7qe5NZZkSbnwW+VY8I34+mbi7I taXA== X-Gm-Message-State: AOJu0YxgpUZeoxRUB+CO3ecycIquuTQlc7Lw28stJAPTik03SeYeZQed k1UjCUfEHzRK7P4gu/D0XDn9b4Sn1H6RSILWLx3hU6tf8FgCEWgq5xmtd8aDikQ= X-Received: by 2002:a17:907:9950:b0:a59:b5a6:65c7 with SMTP id a640c23a62f3a-a5a1155e921mr1460896466b.3.1715708580956; Tue, 14 May 2024 10:43:00 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a179c7fcfsm738917166b.119.2024.05.14.10.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 10:42:59 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0ABD65FA2D; Tue, 14 May 2024 18:42:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , qemu-arm@nongnu.org, Richard Henderson , Alexandre Iooss , Pierrick Bouvier , Cornelia Huck , Peter Maydell , "Michael S. Tsirkin" , Mahmoud Mandour Subject: [PATCH 11/11] plugins: remove op from qemu_plugin_inline_cb Date: Tue, 14 May 2024 18:42:53 +0100 Message-Id: <20240514174253.694591-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240514174253.694591-1-alex.bennee@linaro.org> References: <20240514174253.694591-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.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 From: Pierrick Bouvier This field is not needed as the callback type already holds this information. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-Id: <20240502211522.346467-10-pierrick.bouvier@linaro.org> Signed-off-by: Alex Bennée --- include/qemu/plugin.h | 1 - plugins/plugin.h | 4 +++- plugins/core.c | 13 +++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index 98d27dded9..796fc13706 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -83,7 +83,6 @@ struct qemu_plugin_regular_cb { struct qemu_plugin_inline_cb { qemu_plugin_u64 entry; - enum qemu_plugin_op op; uint64_t imm; enum qemu_plugin_mem_rw rw; }; diff --git a/plugins/plugin.h b/plugins/plugin.h index 80d5daa917..30e2299a54 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -108,7 +108,9 @@ void plugin_register_vcpu_mem_cb(GArray **arr, enum qemu_plugin_mem_rw rw, void *udata); -void exec_inline_op(struct qemu_plugin_inline_cb *cb, int cpu_index); +void exec_inline_op(enum plugin_dyn_cb_type type, + struct qemu_plugin_inline_cb *cb, + int cpu_index); int plugin_num_vcpus(void); diff --git a/plugins/core.c b/plugins/core.c index 1c85edc5e5..0726bc7f25 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -338,7 +338,6 @@ void plugin_register_inline_op_on_entry(GArray **arr, struct qemu_plugin_inline_cb inline_cb = { .rw = rw, .entry = entry, - .op = op, .imm = imm }; dyn_cb = plugin_get_dyn_cb(arr); dyn_cb->type = op_to_cb_type(op); @@ -557,7 +556,9 @@ void qemu_plugin_flush_cb(void) plugin_cb__simple(QEMU_PLUGIN_EV_FLUSH); } -void exec_inline_op(struct qemu_plugin_inline_cb *cb, int cpu_index) +void exec_inline_op(enum plugin_dyn_cb_type type, + struct qemu_plugin_inline_cb *cb, + int cpu_index) { char *ptr = cb->entry.score->data->data; size_t elem_size = g_array_get_element_size( @@ -565,11 +566,11 @@ void exec_inline_op(struct qemu_plugin_inline_cb *cb, int cpu_index) size_t offset = cb->entry.offset; uint64_t *val = (uint64_t *)(ptr + offset + cpu_index * elem_size); - switch (cb->op) { - case QEMU_PLUGIN_INLINE_ADD_U64: + switch (type) { + case PLUGIN_CB_INLINE_ADD_U64: *val += cb->imm; break; - case QEMU_PLUGIN_INLINE_STORE_U64: + case PLUGIN_CB_INLINE_STORE_U64: *val = cb->imm; break; default: @@ -601,7 +602,7 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr, case PLUGIN_CB_INLINE_ADD_U64: case PLUGIN_CB_INLINE_STORE_U64: if (rw && cb->inline_insn.rw) { - exec_inline_op(&cb->inline_insn, cpu->cpu_index); + exec_inline_op(cb->type, &cb->inline_insn, cpu->cpu_index); } break; default: