From 5b99bdea842d4190d2471769903cdcc1621eb493 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Fri, 19 Jun 2020 11:11:31 +0100 Subject: qemu-storage-daemon: remember to add qemu_object_opts The --object option is supported by qemu-storage-daemon but the qemu_object_opts QemuOptsList wasn't being added. As a result calls to qemu_find_opts("object") failed with "There is no option group 'object'". This patch fixes the object-del QMP command. Signed-off-by: Stefan Hajnoczi Message-Id: <20200619101132.2401756-2-stefanha@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- qemu-storage-daemon.c | 1 + 1 file changed, 1 insertion(+) (limited to 'qemu-storage-daemon.c') diff --git a/qemu-storage-daemon.c b/qemu-storage-daemon.c index 9e7adfe3a6..a01cbd6371 100644 --- a/qemu-storage-daemon.c +++ b/qemu-storage-daemon.c @@ -316,6 +316,7 @@ int main(int argc, char *argv[]) module_call_init(MODULE_INIT_QOM); module_call_init(MODULE_INIT_TRACE); + qemu_add_opts(&qemu_object_opts); qemu_add_opts(&qemu_trace_opts); qcrypto_init(&error_fatal); bdrv_init(); -- cgit 1.4.1 From f10802d2c9fd8bfd92c70f465da1a5992445157f Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Fri, 19 Jun 2020 11:11:32 +0100 Subject: qemu-storage-daemon: add missing cleanup calls Several components used by qemu-storage-daemon have cleanup functions that aren't called. Keep the "valgrind --leak-check=full" as clean as possible by invoking the necessary cleanup functions. Signed-off-by: Stefan Hajnoczi Message-Id: <20200619101132.2401756-3-stefanha@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- qemu-storage-daemon.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qemu-storage-daemon.c') diff --git a/qemu-storage-daemon.c b/qemu-storage-daemon.c index a01cbd6371..7e9b0e0d3f 100644 --- a/qemu-storage-daemon.c +++ b/qemu-storage-daemon.c @@ -335,5 +335,9 @@ int main(int argc, char *argv[]) main_loop_wait(false); } + monitor_cleanup(); + qemu_chr_cleanup(); + user_creatable_cleanup(); + return EXIT_SUCCESS; } -- cgit 1.4.1