diff options
| author | Daniel P. Berrangé | 2020-08-25 12:38:49 +0200 |
|---|---|---|
| committer | Eric Blake | 2020-09-02 23:47:55 +0200 |
| commit | 6e64dd572aa548aa6664ed02c6901d691f6a10ba (patch) | |
| tree | c0bfad755c89bd46f249cb5ce2a2373b165a1c22 /qemu-nbd.c | |
| parent | block: add missing socket_init() calls to tools (diff) | |
| download | qemu-6e64dd572aa548aa6664ed02c6901d691f6a10ba.tar.gz qemu-6e64dd572aa548aa6664ed02c6901d691f6a10ba.tar.xz qemu-6e64dd572aa548aa6664ed02c6901d691f6a10ba.zip | |
nbd: skip SIGTERM handler if NBD device support is not built
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.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200825103850.119911-3-berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qemu-nbd.c')
| -rw-r--r-- | qemu-nbd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qemu-nbd.c b/qemu-nbd.c index b102874f0f..dc6ef089af 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -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); |