[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/6] block: add missing socket_init() calls to tools
From: |
Eric Blake |
Subject: |
[PULL 4/6] block: add missing socket_init() calls to tools |
Date: |
Wed, 2 Sep 2020 16:53:58 -0500 |
From: Daniel P. Berrangé <berrange@redhat.com>
Any tool that uses sockets needs to call socket_init() in order to work
on the Windows platform.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200825103850.119911-2-berrange@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
qemu-img.c | 2 ++
qemu-io.c | 2 ++
qemu-nbd.c | 1 +
3 files changed, 5 insertions(+)
diff --git a/qemu-img.c b/qemu-img.c
index 5308773811f3..eb2fc1f86243 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -41,6 +41,7 @@
#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
+#include "qemu/sockets.h"
#include "qemu/units.h"
#include "qom/object_interfaces.h"
#include "sysemu/block-backend.h"
@@ -5410,6 +5411,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]);
diff --git a/qemu-io.c b/qemu-io.c
index 3adc5a7d0d3f..7cc832b3d618 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]);
diff --git a/qemu-nbd.c b/qemu-nbd.c
index d2657b8db50d..b102874f0f46 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -599,6 +599,7 @@ int main(int argc, char **argv)
signal(SIGPIPE, SIG_IGN);
#endif
+ socket_init();
error_init(argv[0]);
module_call_init(MODULE_INIT_TRACE);
qcrypto_init(&error_fatal);
--
2.28.0
- [PULL 0/6] NBD patches for 2020-09-02, Eric Blake, 2020/09/02
- [PULL 1/6] iotests/059: Fix reference output, Eric Blake, 2020/09/02
- [PULL 4/6] block: add missing socket_init() calls to tools,
Eric Blake <=
- [PULL 3/6] block/nbd: use non-blocking connect: fix vm hang on connect(), Eric Blake, 2020/09/02
- [PULL 5/6] nbd: skip SIGTERM handler if NBD device support is not built, Eric Blake, 2020/09/02
- [PULL 2/6] iotests/259: Fix reference output, Eric Blake, 2020/09/02
- [PULL 6/6] nbd: disable signals and forking on Windows builds, Eric Blake, 2020/09/02
- Re: [PULL 0/6] NBD patches for 2020-09-02, Peter Maydell, 2020/09/04