diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-23 15:15:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-23 15:15:46 +0100 |
| commit | 9ba7dd14355bb7957680d5ef764471ab102df099 (patch) | |
| tree | 7b25641ad2d46dca31fe8cb540d2213cf26b4065 /tests | |
| parent | 55b1f14cefcb19ce6d5e28c4c83404230888aa7e (diff) | |
| parent | 62aa1d887ff9fc76adb488d31447d126a78f4b8f (diff) | |
| download | qemu-9ba7dd14355bb7957680d5ef764471ab102df099.zip qemu-9ba7dd14355bb7957680d5ef764471ab102df099.tar.gz qemu-9ba7dd14355bb7957680d5ef764471ab102df099.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-07-23' into staging
QAPI and monitor patches for 2018-07-23 (3.0.0-rc2)
# gpg: Signature made Mon 23 Jul 2018 14:08:37 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2018-07-23:
monitor: Fix unsafe sharing of @cur_mon among threads
qapi: Make 'allow-oob' optional in SchemaInfoCommand
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-util-sockets.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c index acadd85..6195a3a 100644 --- a/tests/test-util-sockets.c +++ b/tests/test-util-sockets.c @@ -69,7 +69,7 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) * stubs/monitor.c is defined, to make sure monitor.o is discarded * otherwise we get duplicate syms at link time. */ -Monitor *cur_mon; +__thread Monitor *cur_mon; void monitor_init(Chardev *chr, int flags) {} |