diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-02-24 15:30:00 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-03-06 17:21:28 +0100 |
| commit | aa70683ded5ac3c1468883f4b09d7d4077ae33ca (patch) | |
| tree | 185793af896c037d697175aa6e9d009446fe5eff | |
| parent | 39411120b7bd58cdd1bdf0e14d3adb5a513dc6c7 (diff) | |
| download | qemu-aa70683ded5ac3c1468883f4b09d7d4077ae33ca.zip qemu-aa70683ded5ac3c1468883f4b09d7d4077ae33ca.tar.gz qemu-aa70683ded5ac3c1468883f4b09d7d4077ae33ca.tar.bz2 | |
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 <kwolf@redhat.com>
Message-Id: <20200224143008.13362-13-kwolf@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | Makefile.objs | 2 | ||||
| -rw-r--r-- | qemu-storage-daemon.c | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index bacbdb5..2554e33 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 5904d3c..14093ac 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; } |