10:32 a.m.
Add a @detach parameter to the API in order allow running the QEMU
code as a thread.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_monitor.c | 7 +++++--
src/qemu/qemu_monitor.h | 3 ++-
src/qemu/qemu_monitor_json.c | 4 +++-
src/qemu/qemu_monitor_json.h | 3 ++-
tests/qemumonitorjsontest.c | 3 ++-
6 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a203c9297..266a76b0e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3796,7 +3796,7 @@ qemuDumpToFd(virQEMUDriverPtr driver,
}
}
- ret = qemuMonitorDumpToFd(priv->mon, fd, dumpformat);
+ ret = qemuMonitorDumpToFd(priv->mon, fd, dumpformat, false);
cleanup:
ignore_value(qemuDomainObjExitMonitor(driver, vm));
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index a8ca9a566..6f10d958a 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2802,7 +2802,10 @@ qemuMonitorGetDumpGuestMemoryCapability(qemuMonitorPtr mon,
int
-qemuMonitorDumpToFd(qemuMonitorPtr mon, int fd, const char *dumpformat)
+qemuMonitorDumpToFd(qemuMonitorPtr mon,
+ int fd,
+ const char *dumpformat,
+ bool detach)
{
int ret;
VIR_DEBUG("fd=%d dumpformat=%s", fd, dumpformat);
@@ -2812,7 +2815,7 @@ qemuMonitorDumpToFd(qemuMonitorPtr mon, int fd, const char
*dumpformat)
if (qemuMonitorSendFileHandle(mon, "dump", fd) < 0)
return -1;
- ret = qemuMonitorJSONDump(mon, "fd:dump", dumpformat);
+ ret = qemuMonitorJSONDump(mon, "fd:dump", dumpformat, detach);
if (ret < 0) {
if (qemuMonitorCloseFileHandle(mon, "dump") < 0)
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 5749af168..27687c5af 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -791,7 +791,8 @@ qemuMonitorDumpStatsPtr qemuMonitorQueryDump(qemuMonitorPtr mon);
int qemuMonitorDumpToFd(qemuMonitorPtr mon,
int fd,
- const char *dumpformat);
+ const char *dumpformat,
+ bool detach);
int qemuMonitorGraphicsRelocate(qemuMonitorPtr mon,
int type,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 33ec3347e..0bcee4a3d 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -3266,7 +3266,8 @@ qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitorPtr mon,
int
qemuMonitorJSONDump(qemuMonitorPtr mon,
const char *protocol,
- const char *dumpformat)
+ const char *dumpformat,
+ bool detach)
{
int ret = -1;
virJSONValuePtr cmd = NULL;
@@ -3276,6 +3277,7 @@ qemuMonitorJSONDump(qemuMonitorPtr mon,
"b:paging", false,
"s:protocol", protocol,
"S:format", dumpformat,
+ "B:detach", detach,
NULL);
if (!cmd)
return -1;
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index f9fcba77f..6c760bdb6 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -170,7 +170,8 @@ int qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitorPtr mon,
int qemuMonitorJSONDump(qemuMonitorPtr mon,
const char *protocol,
- const char *dumpformat);
+ const char *dumpformat,
+ bool detach);
int qemuMonitorJSONGraphicsRelocate(qemuMonitorPtr mon,
int type,
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index fe46a33eb..1eeefbce9 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1330,7 +1330,8 @@ GEN_TEST_FUNC(qemuMonitorJSONSetMigrationDowntime, 1)
GEN_TEST_FUNC(qemuMonitorJSONMigrate, QEMU_MONITOR_MIGRATE_BACKGROUND |
QEMU_MONITOR_MIGRATE_NON_SHARED_DISK |
QEMU_MONITOR_MIGRATE_NON_SHARED_INC, "tcp:localhost:12345")
-GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol",
"dummy_memory_dump_format")
+GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol",
"dummy_memory_dump_format",
+ true)
GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
"localhost", 12345, 12346, NULL)
GEN_TEST_FUNC(qemuMonitorJSONAddNetdev, "some_dummy_netdevstr")
--
2.13.6