diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-03 21:35:01 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-03 21:35:01 +0100 |
| commit | df8176274a19c3b4502a10b2bffba914f690f1ab (patch) | |
| tree | f1ac1c93dc46ea3574f04c2de57ad718e18da4c8 /qemu-io.c | |
| parent | 67a7bfe560a1bba59efab085cb3430f45176d382 (diff) | |
| parent | eb705985f43d631438a318f1146eac61ae10d273 (diff) | |
| download | focaccia-qemu-df8176274a19c3b4502a10b2bffba914f690f1ab.tar.gz focaccia-qemu-df8176274a19c3b4502a10b2bffba914f690f1ab.zip | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-09-02' into staging
nbd patches for 2020-09-02 - fix a few iotests affected by earlier nbd changes - avoid blocking qemu by nbd client in connect() - build qemu-nbd for mingw # gpg: Signature made Wed 02 Sep 2020 22:52:31 BST # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full] # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-nbd-2020-09-02: nbd: disable signals and forking on Windows builds nbd: skip SIGTERM handler if NBD device support is not built block: add missing socket_init() calls to tools block/nbd: use non-blocking connect: fix vm hang on connect() iotests/259: Fix reference output iotests/059: Fix reference output Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-io.c')
| -rw-r--r-- | qemu-io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-io.c b/qemu-io.c index 3adc5a7d0d..7cc832b3d6 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -25,6 +25,7 @@ #include "qemu/config-file.h" #include "qemu/readline.h" #include "qemu/log.h" +#include "qemu/sockets.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qdict.h" #include "qom/object_interfaces.h" @@ -542,6 +543,7 @@ int main(int argc, char **argv) signal(SIGPIPE, SIG_IGN); #endif + socket_init(); error_init(argv[0]); module_call_init(MODULE_INIT_TRACE); qemu_init_exec_dir(argv[0]); |