diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-10-05 17:58:44 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-10-09 07:08:19 +0200 |
| commit | 947e47448dcc4e4d7a8b7c42b43acb3435b3ad35 (patch) | |
| tree | 855a18a7da785ee7dff7919ec9a02be34c6ff51c /tests/test-util-sockets.c | |
| parent | 87e6f4a4d6885006931b371771e2933c40700427 (diff) | |
| download | qemu-947e47448dcc4e4d7a8b7c42b43acb3435b3ad35.zip qemu-947e47448dcc4e4d7a8b7c42b43acb3435b3ad35.tar.gz qemu-947e47448dcc4e4d7a8b7c42b43acb3435b3ad35.tar.bz2 | |
monitor: Use getter/setter functions for cur_mon
cur_mon really needs to be coroutine-local as soon as we move monitor
command handlers to coroutines and let them yield. As a first step, just
remove all direct accesses to cur_mon so that we can implement this in
the getter function later.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201005155855.256490-4-kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/test-util-sockets.c')
| -rw-r--r-- | tests/test-util-sockets.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c index 1bbb16d..f6336e0 100644 --- a/tests/test-util-sockets.c +++ b/tests/test-util-sockets.c @@ -52,6 +52,7 @@ static void test_fd_is_socket_good(void) static int mon_fd = -1; static const char *mon_fdname; +__thread Monitor *cur_mon; int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) { @@ -65,15 +66,14 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) } /* - * Syms of stubs in libqemuutil.a are discarded at .o file granularity. - * To replace monitor_get_fd() we must ensure everything in - * stubs/monitor.c is defined, to make sure monitor.o is discarded + * Syms of stubs in libqemuutil.a are discarded at .o file + * granularity. To replace monitor_get_fd() and monitor_cur(), we + * must ensure that we also replace any other symbol that is used in + * the binary and would be taken from the same stub object file, * otherwise we get duplicate syms at link time. */ -__thread Monitor *cur_mon; +Monitor *monitor_cur(void) { return cur_mon; } int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) { abort(); } -void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) {} -void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp) {} #ifndef _WIN32 static void test_socket_fd_pass_name_good(void) |