[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/22] plugins/lockstep: make socket path not positional & parse b
From: |
Alex Bennée |
Subject: |
[PULL 13/22] plugins/lockstep: make socket path not positional & parse bool arg |
Date: |
Fri, 3 Sep 2021 10:03:30 +0100 |
From: Mahmoud Mandour <ma.mandourr@gmail.com>
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-6-ma.mandourr@gmail.com>
diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst
index aa75b390b1..5cddf31c70 100644
--- a/docs/devel/tcg-plugins.rst
+++ b/docs/devel/tcg-plugins.rst
@@ -286,7 +286,7 @@ communicate over::
./sparc-softmmu/qemu-system-sparc -monitor none -parallel none \
-net none -M SS-20 -m 256 -kernel day11/zImage.elf \
- -plugin ./contrib/plugins/liblockstep.so,arg=lockstep-sparc.sock \
+ -plugin ./contrib/plugins/liblockstep.so,sockpath=lockstep-sparc.sock \
-d plugin,nochain
which will eventually report::
diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c
index 7fd35eb669..a41ffe83fa 100644
--- a/contrib/plugins/lockstep.c
+++ b/contrib/plugins/lockstep.c
@@ -319,22 +319,35 @@ QEMU_PLUGIN_EXPORT int
qemu_plugin_install(qemu_plugin_id_t id,
int argc, char **argv)
{
int i;
-
- if (!argc || !argv[0]) {
- qemu_plugin_outs("Need a socket path to talk to other instance.");
- return -1;
- }
+ g_autofree char *sock_path = NULL;
for (i = 0; i < argc; i++) {
char *p = argv[i];
- if (strcmp(p, "verbose") == 0) {
- verbose = true;
- } else if (!setup_unix_socket(argv[0])) {
- qemu_plugin_outs("Failed to setup socket for communications.");
+ g_autofree char **tokens = g_strsplit(p, "=", 2);
+
+ if (g_strcmp0(tokens[0], "verbose") == 0) {
+ if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &verbose)) {
+ fprintf(stderr, "boolean argument parsing failed: %s\n", p);
+ return -1;
+ }
+ } else if (g_strcmp0(tokens[0], "sockpath") == 0) {
+ sock_path = tokens[1];
+ } else {
+ fprintf(stderr, "option parsing failed: %s\n", p);
return -1;
}
}
+ if (sock_path == NULL) {
+ fprintf(stderr, "Need a socket path to talk to other instance.\n");
+ return -1;
+ }
+
+ if (!setup_unix_socket(sock_path)) {
+ fprintf(stderr, "Failed to setup socket for communications.\n");
+ return -1;
+ }
+
our_id = id;
qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans);
--
2.30.2
- [PULL 08/22] docs/devel/tcg-plugins: added cores arg to cache plugin, (continued)
- [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, 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 <=
- [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