From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v6 9/9] plugins: remove op from qemu_plugin_inline_cb
Date: Thu, 2 May 2024 14:15:22 -0700 [thread overview]
Message-ID: <20240502211522.346467-10-pierrick.bouvier@linaro.org> (raw)
In-Reply-To: <20240502211522.346467-1-pierrick.bouvier@linaro.org>
This field is not needed as the callback type already holds this
information.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
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 313b7c72684..1ad8a59209b 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 80d5daa9171..30e2299a54d 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 7ea2ee208db..a9f19e197aa 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:
--
2.39.2
next prev parent reply other threads:[~2024-05-02 21:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 21:15 [PATCH v6 0/9] TCG plugins new inline operations Pierrick Bouvier
2024-05-02 21:15 ` [PATCH v6 1/9] plugins: prepare introduction of new inline ops Pierrick Bouvier
2024-05-02 21:15 ` [PATCH v6 2/9] plugins: extract generate ptr for qemu_plugin_u64 Pierrick Bouvier
2024-05-02 21:15 ` [PATCH v6 3/9] plugins: add new inline op STORE_U64 Pierrick Bouvier
2024-05-02 21:15 ` [PATCH v6 4/9] tests/plugin/inline: add test for STORE_U64 inline op Pierrick Bouvier
2024-05-02 21:15 ` [PATCH v6 5/9] plugins: conditional callbacks Pierrick Bouvier
2024-05-02 21:15 ` [PATCH v6 6/9] tests/plugin/inline: add test for conditional callback Pierrick Bouvier
2024-05-02 21:15 ` [PATCH v6 7/9] plugins: distinct types for callbacks Pierrick Bouvier
2024-05-02 21:15 ` [PATCH v6 8/9] plugins: extract cpu_index generate Pierrick Bouvier
2024-05-02 21:15 ` Pierrick Bouvier [this message]
2024-05-07 16:07 ` [PATCH v6 0/9] TCG plugins new inline operations Alex Bennée
2024-05-07 16:52 ` Pierrick Bouvier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240502211522.346467-10-pierrick.bouvier@linaro.org \
--to=pierrick.bouvier@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=erdnaxe@crans.org \
--cc=ma.mandourr@gmail.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).