[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/6] nbd: disable signals and forking on Windows builds
From: |
Eric Blake |
Subject: |
[PULL 6/6] nbd: disable signals and forking on Windows builds |
Date: |
Wed, 2 Sep 2020 16:54:00 -0500 |
From: Daniel P. Berrangé <berrange@redhat.com>
Disabling these parts are sufficient to get the qemu-nbd program
compiling in a Windows build.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200825103850.119911-4-berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
qemu-nbd.c | 5 +++++
meson.build | 7 ++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index dc6ef089afd5..33476a1000c8 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -899,6 +899,7 @@ int main(int argc, char **argv)
#endif
if ((device && !verbose) || fork_process) {
+#ifndef WIN32
int stderr_fd[2];
pid_t pid;
int ret;
@@ -962,6 +963,10 @@ int main(int argc, char **argv)
*/
exit(errors);
}
+#else /* WIN32 */
+ error_report("Unable to fork into background on Windows hosts");
+ exit(EXIT_FAILURE);
+#endif /* WIN32 */
}
if (device != NULL && sockpath == NULL) {
diff --git a/meson.build b/meson.build
index 55c7d2318cdb..5aaa3647305d 100644
--- a/meson.build
+++ b/meson.build
@@ -1095,12 +1095,9 @@ if have_tools
dependencies: [authz, block, crypto, io, qom, qemuutil], install:
true)
qemu_io = executable('qemu-io', files('qemu-io.c'),
dependencies: [block, qemuutil], install: true)
- qemu_block_tools += [qemu_img, qemu_io]
- if targetos != 'windows'
- qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
+ qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
dependencies: [block, qemuutil], install: true)
- qemu_block_tools += [qemu_nbd]
- endif
+ qemu_block_tools += [qemu_img, qemu_io, qemu_nbd]
subdir('storage-daemon')
subdir('contrib/rdmacm-mux')
--
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, 2020/09/02
- [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 <=
- Re: [PULL 0/6] NBD patches for 2020-09-02, Peter Maydell, 2020/09/04