| Message ID | 20210717100920.240793-12-ma.mandourr@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | new plugin argument passing scheme | expand |
Mahmoud Mandour <ma.mandourr@gmail.com> writes: > 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> > --- > tests/plugin/mem.c | 47 ++++++++++++++++++++++++++++------------------ > 1 file changed, 29 insertions(+), 18 deletions(-) > > diff --git a/tests/plugin/mem.c b/tests/plugin/mem.c > index afd1d27e5c..3000f847b5 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], "hadrr") == 0) { s/hadrr/haddr/ > + 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; > } > } Otherwise: Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/plugin/mem.c b/tests/plugin/mem.c index afd1d27e5c..3000f847b5 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], "hadrr") == 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; } }
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> --- tests/plugin/mem.c | 47 ++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-)