ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plugins: Move function pointer in qemu_plugin_dyn_cb 

The out-of-line function pointer is mutually exclusive
with inline expansion, so move it into the union.
Wrap the pointer in a structure named 'regular' to match
PLUGIN_CB_REGULAR.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-03-14 14:09:33 -10:00
parent 25875fe92e
commit aff56de576
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accel/tcg/plugin-gen.c
View File

@ -425,7 +425,7 @@ static TCGOp *append_udata_cb(const struct qemu_plugin_dyn_cb *cb,
} }
/* call */ /* call */
op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); op = copy_call(&begin_op, op, cb->regular.f.vcpu_udata, cb_idx);
return op; return op;
} }
@ -473,7 +473,7 @@ static TCGOp *append_mem_cb(const struct qemu_plugin_dyn_cb *cb,
if (type == PLUGIN_GEN_CB_MEM) { if (type == PLUGIN_GEN_CB_MEM) {
/* call */ /* call */
op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); op = copy_call(&begin_op, op, cb->regular.f.vcpu_udata, cb_idx);
} }
return op; return op;

4
include/qemu/plugin.h
View File

@ -85,13 +85,15 @@ enum plugin_dyn_cb_subtype {
* instance of a callback to be called upon the execution of a particular TB. * instance of a callback to be called upon the execution of a particular TB.
*/ */
struct qemu_plugin_dyn_cb { struct qemu_plugin_dyn_cb {
union qemu_plugin_cb_sig f;
void *userp; void *userp;
enum plugin_dyn_cb_subtype type; enum plugin_dyn_cb_subtype type;
/* @rw applies to mem callbacks only (both regular and inline) */ /* @rw applies to mem callbacks only (both regular and inline) */
enum qemu_plugin_mem_rw rw; enum qemu_plugin_mem_rw rw;
/* fields specific to each dyn_cb type go here */ /* fields specific to each dyn_cb type go here */
union { union {
struct {
union qemu_plugin_cb_sig f;
} regular;
struct { struct {
qemu_plugin_u64 entry; qemu_plugin_u64 entry;
enum qemu_plugin_op op; enum qemu_plugin_op op;

8
plugins/core.c
View File

@ -342,7 +342,7 @@ void plugin_register_dyn_cb__udata(GArray **arr,
dyn_cb->userp = udata; dyn_cb->userp = udata;
/* Note flags are discarded as unused. */ /* Note flags are discarded as unused. */
dyn_cb->f.vcpu_udata = cb; dyn_cb->regular.f.vcpu_udata = cb;
dyn_cb->type = PLUGIN_CB_REGULAR; dyn_cb->type = PLUGIN_CB_REGULAR;
} }
@ -359,7 +359,7 @@ void plugin_register_vcpu_mem_cb(GArray **arr,
/* Note flags are discarded as unused. */ /* Note flags are discarded as unused. */
dyn_cb->type = PLUGIN_CB_REGULAR; dyn_cb->type = PLUGIN_CB_REGULAR;
dyn_cb->rw = rw; dyn_cb->rw = rw;
dyn_cb->f.generic = cb; dyn_cb->regular.f.vcpu_mem = cb;
} }
/* /*
@ -511,8 +511,8 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr,
} }
switch (cb->type) { switch (cb->type) {
case PLUGIN_CB_REGULAR: case PLUGIN_CB_REGULAR:
cb->f.vcpu_mem(cpu->cpu_index, make_plugin_meminfo(oi, rw), cb->regular.f.vcpu_mem(cpu->cpu_index, make_plugin_meminfo(oi, rw),
vaddr, cb->userp); vaddr, cb->userp);
break; break;
case PLUGIN_CB_INLINE: case PLUGIN_CB_INLINE:
exec_inline_op(cb, cpu->cpu_index); exec_inline_op(cb, cpu->cpu_index);