From aa70683ded5ac3c1468883f4b09d7d4077ae33ca Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 24 Feb 2020 15:30:00 +0100 Subject: [PATCH] qemu-storage-daemon: Add main loop Instead of exiting after processing all command line options, start a main loop and keep processing events until exit is requested with a signal (e.g. SIGINT). Now qemu-storage-daemon can be used as an alternative for qemu-nbd that provides a few features that were previously only available from QMP, such as access to options only available with -blockdev and the socket types 'vsock' and 'fd'. Signed-off-by: Kevin Wolf Message-Id: <20200224143008.13362-13-kwolf@redhat.com> Acked-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- Makefile.objs | 2 ++ qemu-storage-daemon.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Makefile.objs b/Makefile.objs index bacbdb55bc..2554e331d5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -33,6 +33,8 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS storage-daemon-obj-y = block/ qom/ storage-daemon-obj-y += blockdev.o blockdev-nbd.o iothread.o +storage-daemon-obj-$(CONFIG_WIN32) += os-win32.o +storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o ###################################################################### # Target independent part of system emulation. The long term path is to diff --git a/qemu-storage-daemon.c b/qemu-storage-daemon.c index 5904d3c5b4..14093ac3a0 100644 --- a/qemu-storage-daemon.c +++ b/qemu-storage-daemon.c @@ -50,8 +50,16 @@ #include "qemu/option.h" #include "qom/object_interfaces.h" +#include "sysemu/runstate.h" #include "trace/control.h" +static volatile bool exit_requested = false; + +void qemu_system_killed(int signal, pid_t pid) +{ + exit_requested = true; +} + static void help(void) { printf( @@ -241,6 +249,7 @@ int main(int argc, char *argv[]) error_init(argv[0]); qemu_init_exec_dir(argv[0]); + os_setup_signal_handling(); module_call_init(MODULE_INIT_QOM); module_call_init(MODULE_INIT_TRACE); @@ -256,5 +265,9 @@ int main(int argc, char *argv[]) qemu_init_main_loop(&error_fatal); process_options(argc, argv); + while (!exit_requested) { + main_loop_wait(false); + } + return EXIT_SUCCESS; }