ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kevin Wolf 2020-02-24 15:30:00 +01:00
parent 39411120b7
commit aa70683ded
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.objs
View File

@ -33,6 +33,8 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS
storage-daemon-obj-y = block/ qom/ storage-daemon-obj-y = block/ qom/
storage-daemon-obj-y += blockdev.o blockdev-nbd.o iothread.o 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 # Target independent part of system emulation. The long term path is to

13
qemu-storage-daemon.c
View File

@ -50,8 +50,16 @@
#include "qemu/option.h" #include "qemu/option.h"
#include "qom/object_interfaces.h" #include "qom/object_interfaces.h"
#include "sysemu/runstate.h"
#include "trace/control.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) static void help(void)
{ {
printf( printf(
@ -241,6 +249,7 @@ int main(int argc, char *argv[])
error_init(argv[0]); error_init(argv[0]);
qemu_init_exec_dir(argv[0]); qemu_init_exec_dir(argv[0]);
os_setup_signal_handling();
module_call_init(MODULE_INIT_QOM); module_call_init(MODULE_INIT_QOM);
module_call_init(MODULE_INIT_TRACE); module_call_init(MODULE_INIT_TRACE);
@ -256,5 +265,9 @@ int main(int argc, char *argv[])
qemu_init_main_loop(&error_fatal); qemu_init_main_loop(&error_fatal);
process_options(argc, argv); process_options(argc, argv);
while (!exit_requested) {
main_loop_wait(false);
}
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }