Skip to contentSkip to conversation

nbd: build qemu-nbd on Windows

PATCH In review Daniel P. Berrangé 3 participants 9 messages Aug 25, 2020 – Sep 3, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

v2 cover nbd: build qemu-nbd on Windows

We are already building the NBD client and server on Windows when it is used via the main system emulator binaries. This demonstrates there is no fundamental blocker to buildig the qemu-nbd binary too.

Changed in v2:

- Split second patch into two parts
- Use HAVE_NBD_DEVICE condition to disable SIGTERM handler not WIN32

Daniel P. Berrangé (3):
block: add missing socket_init() calls to tools
nbd: skip SIGTERM handler if NBD device support is not built
nbd: disable signals and forking on Windows builds

 meson.build |  7 ++-----
 qemu-img.c  |  2 ++
 qemu-io.c   |  2 ++
 qemu-nbd.c  | 11 ++++++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/3 block: add missing socket_init() calls to tools

Any tool that uses sockets needs to call socket_init() in order to work on the Windows platform.

---
 qemu-img.c | 2 ++
 qemu-io.c  | 2 ++
 qemu-nbd.c | 1 +
 3 files changed, 5 insertions(+)
qemu-img.c +2 -0
index 5308773811..eb2fc1f862 100644
@@ -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]);
qemu-io.c +2 -0
index 3adc5a7d0d..7cc832b3d6 100644
@@ -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]);
qemu-nbd.c +1 -0
index d2657b8db5..b102874f0f 100644
@@ -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);
Signature · 1 line
2.26.2
#2 lore raw

PATCH v2 2/3 nbd: skip SIGTERM handler if NBD device support is not built

In reply to Daniel P. Berrangé

The termsig_handler function is used by the client thread handling the host NBD device connection to do a graceful shutdown. IOW, if we have disabled NBD device support at compile time, we don't need the SIGTERM handler. This fixes a build issue for Windows.

---
 qemu-nbd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
qemu-nbd.c +4 -1
index b102874f0f..dc6ef089af 100644
@@ -155,12 +155,13 @@ QEMU_COPYRIGHT "\n"
     , name);
 }
 
+#if HAVE_NBD_DEVICE
 static void termsig_handler(int signum)
 {
     atomic_cmpxchg(&state, RUNNING, TERMINATE);
     qemu_notify_event();
 }
-
+#endif /* HAVE_NBD_DEVICE */
 
 static int qemu_nbd_client_list(SocketAddress *saddr, QCryptoTLSCreds *tls,
                                 const char *hostname)
@@ -587,6 +588,7 @@ int main(int argc, char **argv)
     unsigned socket_activation;
     const char *pid_file_name = NULL;
 
+#if HAVE_NBD_DEVICE
     /* The client thread uses SIGTERM to interrupt the server.  A signal
      * handler ensures that "qemu-nbd -v -c" exits with a nice status code.
      */
@@ -594,6 +596,7 @@ int main(int argc, char **argv)
     memset(&sa_sigterm, 0, sizeof(sa_sigterm));
     sa_sigterm.sa_handler = termsig_handler;
     sigaction(SIGTERM, &sa_sigterm, NULL);
+#endif /* HAVE_NBD_DEVICE */
 
 #ifdef CONFIG_POSIX
     signal(SIGPIPE, SIG_IGN);
Signature · 1 line
2.26.2
Reviewed-by on v2 2/3
#3 lore raw

Re: [PATCH v2 2/3] nbd: skip SIGTERM handler if NBD device support is not built

Quoted 9 lines · Daniel P. Berrangé

The termsig_handler function is used by the client thread handling the host NBD device connection to do a graceful shutdown. IOW, if we have disabled NBD device support at compile time, we don't need the SIGTERM handler. This fixes a build issue for Windows.

---
  qemu-nbd.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#4 lore raw

PATCH v2 3/3 nbd: disable signals and forking on Windows builds

In reply to Daniel P. Berrangé

Disabling these parts are sufficient to get the qemu-nbd program compiling in a Windows build.

---
 meson.build | 7 ++-----
 qemu-nbd.c  | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)
meson.build +2 -5
index df5bf728b5..1071871605 100644
@@ -1074,12 +1074,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 == 'linux' or targetos == 'sunos' or targetos.endswith('bsd')
-    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')
qemu-nbd.c +5 -0
index dc6ef089af..33476a1000 100644
@@ -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) {
Signature · 1 line
2.26.2
Reviewed-by on v2 3/3
#5 lore raw

Re: [PATCH v2 3/3] nbd: disable signals and forking on Windows builds

Quoted 8 lines · Daniel P. Berrangé

Disabling these parts are sufficient to get the qemu-nbd program compiling in a Windows build.

---
  meson.build | 7 ++-----
  qemu-nbd.c  | 5 +++++
  2 files changed, 7 insertions(+), 5 deletions(-)

Queuing through my NBD tree.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#6 lore raw

Re: [PATCH v2 3/3] nbd: disable signals and forking on Windows builds

In reply to Daniel P. Berrangé
Quoted 43 lines · Daniel P. Berrangé

Disabling these parts are sufficient to get the qemu-nbd program compiling in a Windows build.

---
 meson.build | 7 ++-----
 qemu-nbd.c  | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)
meson.build +2 -5
index df5bf728b5..1071871605 100644
@@ -1074,12 +1074,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 == 'linux' or targetos == 'sunos' or
 targetos.endswith('bsd')
-    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')

qemu-nbd.c +1 -0
index dc6ef089af..33476a1000 100644
@@ -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;

qemu-nbd.c int main(int argc, char **argv) · line 971

Quoted 9 lines
qemu-nbd.c +4 -0
@@ -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 */
     }
 

May us replace fork with alternative such as spawn?

Quoted 7 lines
qemu-nbd.c +0 -1
     if (device != NULL && sockpath == NULL) {
--

2.26.2

Signature · 6 lines
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo
#7 lore raw

Re: [PATCH v2 3/3] nbd: disable signals and forking on Windows builds

Quoted 16 lines · 罗勇刚(Yonggang Luo)
Quoted 13 lines · Daniel P. Berrangé

Disabling these parts are sufficient to get the qemu-nbd program compiling in a Windows build.

---
  meson.build | 7 ++-----
  qemu-nbd.c  | 5 +++++
  2 files changed, 7 insertions(+), 5 deletions(-)

+++ b/qemu-nbd.c

(quoted diff) +0 -0
@@ -899,6 +899,7 @@ int main(int argc, char **argv)
  #endif
 
Quoted 16 lines
Quoted 6 lines
qemu-nbd.c +1 -0
      if ((device && !verbose) || fork_process) {
+#ifndef WIN32
          int stderr_fd[2];
          pid_t pid;
          int ret;

qemu-nbd.c int main(int argc, char **argv) · line 971

Quoted 9 lines
qemu-nbd.c +4 -0
@@ -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 */
      }
 

May us replace fork with alternative such as spawn?

You're certainly welcome to propose a patch along those lines, if spawning a task is a common Windows counterpart to the Unix notion of forking off a daemon. But even requiring qemu-nbd to run in the foreground is already an improvement over what we had previously, so any change to use spawn will be a separate series, and will not hold up this one.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#8 lore raw

Re: [PATCH v2 3/3] nbd: disable signals and forking on Windows builds

Quoted 33 lines · Eric Blake
Quoted 16 lines · 罗勇刚(Yonggang Luo)
Quoted 13 lines · Daniel P. Berrangé

Disabling these parts are sufficient to get the qemu-nbd program compiling in a Windows build.

---
  meson.build | 7 ++-----
  qemu-nbd.c  | 5 +++++
  2 files changed, 7 insertions(+), 5 deletions(-)

+++ b/qemu-nbd.c

(quoted diff) +0 -0
@@ -899,6 +899,7 @@ int main(int argc, char **argv)
  #endif
 
Quoted 11 lines

qemu-nbd.c int main(int argc, char **argv) · line 967

Quoted 11 lines
qemu-nbd.c +3 -0
      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");

Quoted 4 lines
Quoted 4 lines
qemu-nbd.c +2 -0
+        exit(EXIT_FAILURE);
+#endif /* WIN32 */
      }
 
Quoted 8 lines
Quoted 1 line

May us replace fork with alternative such as spawn?

You're certainly welcome to propose a patch along those lines, if spawning a task is a common Windows counterpart to the Unix notion of forking off a daemon. But even requiring qemu-nbd to run in the foreground is already an improvement over what we had previously, so any change to use spawn will be a separate series, and will not hold up this

Yes, of cause.

Quoted 8 lines

one.

--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org

Signature · 6 lines
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo