[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/22] tests/plugins/mem: introduce "track" arg and make args not
From: |
Alex Bennée |
Subject: |
[PULL 19/22] tests/plugins/mem: introduce "track" arg and make args not positional |
Date: |
Fri, 3 Sep 2021 10:03:36 +0100 |
From: Mahmoud Mandour <ma.mandourr@gmail.com>
This commit makes the plugin adhere to the new plugins arg-passing
scheme by expecting full-form boolean args instead of short-form
booleans. This necessitates that we introduce a new argument, here
"track", to accept "r", "w", or "rw".
Also, it makes arguments not positional and we only care about the last
value specified for a certain argument.
callback/inline args are now supplied separately as bool arguments so
that both can be enabled individually.
Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210730135817.17816-12-ma.mandourr@gmail.com>
diff --git a/tests/plugin/mem.c b/tests/plugin/mem.c
index afd1d27e5c..4570f7d815 100644
--- a/tests/plugin/mem.c
+++ b/tests/plugin/mem.c
@@ -80,29 +80,40 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t
id,
const qemu_info_t *info,
int argc, char **argv)
{
- if (argc) {
- if (argc >= 3) {
- if (!strcmp(argv[2], "haddr")) {
- do_haddr = true;
- }
- }
- if (argc >= 2) {
- const char *str = argv[1];
- if (!strcmp(str, "r")) {
+ for (int i = 0; i < argc; i++) {
+ char *opt = argv[i];
+ g_autofree char **tokens = g_strsplit(opt, "=", 2);
+
+ if (g_strcmp0(tokens[0], "haddr") == 0) {
+ if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_haddr)) {
+ fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
+ return -1;
+ }
+ } else if (g_strcmp0(tokens[0], "track") == 0) {
+ if (g_strcmp0(tokens[1], "r") == 0) {
rw = QEMU_PLUGIN_MEM_R;
- } else if (!strcmp(str, "w")) {
+ } else if (g_strcmp0(tokens[1], "w") == 0) {
rw = QEMU_PLUGIN_MEM_W;
+ } else if (g_strcmp0(tokens[1], "rw") == 0) {
+ rw = QEMU_PLUGIN_MEM_RW;
+ } else {
+ fprintf(stderr, "invaild value for argument track: %s\n", opt);
+ return -1;
+ }
+ } else 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 if (g_strcmp0(tokens[0], "callback") == 0) {
+ if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_callback)) {
+ fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
+ return -1;
}
- }
- if (!strcmp(argv[0], "inline")) {
- do_inline = true;
- do_callback = false;
- } else if (!strcmp(argv[0], "both")) {
- do_inline = true;
- do_callback = true;
} else {
- do_callback = true;
+ fprintf(stderr, "option parsing failed: %s\n", opt);
+ return -1;
}
}
--
2.30.2
- [PULL 02/22] gitlab-ci: Merge "build-disabled" with "build-without-default-features", (continued)
- [PULL 02/22] gitlab-ci: Merge "build-disabled" with "build-without-default-features", Alex Bennée, 2021/09/03
- [PULL 11/22] plugins/hotpages: introduce sortby arg and parsed bool args correctly, Alex Bennée, 2021/09/03
- [PULL 04/22] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them, Alex Bennée, 2021/09/03
- [PULL 09/22] plugins: allow plugin arguments to be passed directly, Alex Bennée, 2021/09/03
- [PULL 07/22] plugins: sort exported symbol list, Alex Bennée, 2021/09/03
- [PULL 05/22] plugins: do not limit exported symbols if modules are active, Alex Bennée, 2021/09/03
- [PULL 08/22] docs/devel/tcg-plugins: added cores arg to cache plugin, Alex Bennée, 2021/09/03
- [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 <=
- [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, 2021/09/03
- [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