[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/22] tests/plugins/insn: made arg inline not positional and pars
From: |
Alex Bennée |
Subject: |
[PULL 18/22] tests/plugins/insn: made arg inline not positional and parse it as bool |
Date: |
Fri, 3 Sep 2021 10:03:35 +0100 |
From: Mahmoud Mandour <ma.mandourr@gmail.com>
Made argument "inline" not positional, this has two benefits. First is
that we adhere to how QEMU passes args generally, by taking the last
value of an argument and drop the others. And the second is that this
sets up a framework for potentially adding new args easily.
Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210730135817.17816-11-ma.mandourr@gmail.com>
[AJB: fix check-tcg tests calling arg=inline]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c
index c253980ec8..0f6a1938c1 100644
--- a/tests/plugin/insn.c
+++ b/tests/plugin/insn.c
@@ -62,8 +62,18 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t
id,
const qemu_info_t *info,
int argc, char **argv)
{
- if (argc && !strcmp(argv[0], "inline")) {
- do_inline = true;
+ for (int i = 0; i < argc; i++) {
+ char *opt = argv[i];
+ g_autofree char **tokens = g_strsplit(opt, "=", 2);
+ if (g_strcmp0(tokens[0], "inline") == 0) {
+ if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_inline)) {
+ fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
+ return -1;
+ }
+ } else {
+ fprintf(stderr, "option parsing failed: %s\n", opt);
+ return -1;
+ }
}
qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans);
diff --git a/tests/tcg/i386/Makefile.softmmu-target
b/tests/tcg/i386/Makefile.softmmu-target
index fa9b1b9f90..9b9038d0be 100644
--- a/tests/tcg/i386/Makefile.softmmu-target
+++ b/tests/tcg/i386/Makefile.softmmu-target
@@ -38,7 +38,7 @@ run-plugin-%-with-libinsn.so:
$(call run-test, $@, \
$(QEMU) -monitor none -display none \
-chardev file$(COMMA)path=$@.out$(COMMA)id=output \
- -plugin ../../plugin/libinsn.so$(COMMA)arg=inline \
+ -plugin ../../plugin/libinsn.so$(COMMA)inline=on \
-d plugin -D $*-with-libinsn.so.pout \
$(QEMU_OPTS) $*, \
"$* on $(TARGET_NAME)")
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index b0a2128980..a053ca3f15 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -61,7 +61,7 @@ endif
# non-inline runs will trigger the duplicate instruction heuristics in
libinsn.so
run-plugin-%-with-libinsn.so:
$(call run-test, $@, $(QEMU) $(QEMU_OPTS) \
- -plugin ../../plugin/libinsn.so$(COMMA)arg=inline \
+ -plugin ../../plugin/libinsn.so$(COMMA)inline=on \
-d plugin -D $*-with-libinsn.so.pout $*, \
"$* (inline) on $(TARGET_NAME)")
diff --git a/tests/tcg/x86_64/Makefile.softmmu-target
b/tests/tcg/x86_64/Makefile.softmmu-target
index 9896319f0e..2afa3298bf 100644
--- a/tests/tcg/x86_64/Makefile.softmmu-target
+++ b/tests/tcg/x86_64/Makefile.softmmu-target
@@ -38,7 +38,7 @@ run-plugin-%-with-libinsn.so:
$(call run-test, $@, \
$(QEMU) -monitor none -display none \
-chardev file$(COMMA)path=$@.out$(COMMA)id=output \
- -plugin ../../plugin/libinsn.so$(COMMA)arg=inline \
+ -plugin ../../plugin/libinsn.so$(COMMA)inline=on \
-d plugin -D $*-with-libinsn.so.pout \
$(QEMU_OPTS) $*, \
"$* on $(TARGET_NAME)")
--
2.30.2
- [PULL 06/22] plugins/cache: supported multicore cache modelling, (continued)
- [PULL 06/22] plugins/cache: supported multicore cache modelling, Alex Bennée, 2021/09/03
- [PULL 15/22] plugins/howvec: adapting to the new argument passing scheme, Alex Bennée, 2021/09/03
- [PULL 12/22] plugins/hotblocks: Added correct boolean argument parsing, Alex Bennée, 2021/09/03
- [PULL 19/22] tests/plugins/mem: introduce "track" arg and make args not positional, Alex Bennée, 2021/09/03
- [PULL 17/22] tests/plugins/bb: adapt to the new arg passing scheme, Alex Bennée, 2021/09/03
- [PULL 20/22] tests/plugins/syscalls: adhere to new arg-passing scheme, Alex Bennée, 2021/09/03
- [PULL 22/22] docs/devel: be consistent about example plugin names, Alex Bennée, 2021/09/03
- [PULL 10/22] plugins/api: added a boolean parsing plugin api, Alex Bennée, 2021/09/03
- [PULL 14/22] plugins/hwprofile: adapt to the new plugin arguments scheme, Alex Bennée, 2021/09/03
- [PULL 13/22] plugins/lockstep: make socket path not positional & parse bool arg, Alex Bennée, 2021/09/03
- [PULL 18/22] tests/plugins/insn: made arg inline not positional and parse it as bool,
Alex Bennée <=
- [PULL 16/22] docs/tcg-plugins: new passing parameters scheme for cache docs, Alex Bennée, 2021/09/03
- [PULL 21/22] docs/deprecated: deprecate passing plugin args through `arg=`, Alex Bennée, 2021/09/03
- Re: [PULL 00/22] testing and plugin updates, Peter Maydell, 2021/09/04