4:17 p.m.
This patch series introduces funcionality for waiting for a job from a
different context, for now only for dump jobs, plus testing.
This can be useful in situations where the original requester of the job
crashes/restarts and then needs to continue waiting for that potentially
ongoing job. To avoid waiting for the wrong job type, the caller must
specify the required job type. For now I've only implemented this for
dump jobs; if the logic is correct I can extended it for all other job
types.
The first patch introduces the core functionality. I see that there is a
function specifically for waiting for a dump job:
qemuDumpWaitForCompletion. Ideally we should only use
qemuDomainObjWait, which would work for any job type, however I'm not
sure it's correct to use it instead of qemuDumpWaitForCompletion because
the latter checks dumpCompleted. It's not obvious to me what is the
purpose of dumpCompleted, is it because qemuDomainObjWait can return
because some other job, running in parallel with the dump job, has
completed, so it's effectively a false alarm?
The second patch is mainly for testing the wait functionality via virsh.
The remaining patches extend the test hypervisor's functionality on dump
testing.
4:17 p.m.
New subject: [RFC 1/6] introduce virDomainJobWait
This patch introduces virDomainJobWait, which waits for the specified
domain job to finish. The caller specifies the desired job type to wait
for. For now, only dump jobs are supported.
This functionality is needed so that the process that started the dump
job can pick it up and continue waiting for it in case it restarted.
Signed-off-by: Thanos Makatos <thanos.makatos(a)nutanix.com>
---
include/libvirt/libvirt-domain.h | 54 ++++++++++++++++++--------------
src/driver-hypervisor.h | 4 +++
src/libvirt-domain.c | 22 ++++++++++++-
src/libvirt_public.syms | 1 +
src/qemu/qemu_driver.c | 28 +++++++++++++++++
src/remote/remote_driver.c | 1 +
src/remote/remote_protocol.x | 14 ++++++++-
src/remote_protocol-structs | 5 +++
8 files changed, 104 insertions(+), 25 deletions(-)
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index 30cce85b29..7ca77f2e41 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -1681,6 +1681,7 @@ int virDomainCoreDumpWithFormat (virDomainPtr
domain,
unsigned int dumpformat,
unsigned int flags);
+
/*
* Screenshot of current domain console
*/
@@ -3130,6 +3131,36 @@ typedef enum {
int virDomainBlockJobAbort(virDomainPtr dom, const char *disk,
unsigned int flags);
+/**
+ * virDomainJobOperation:
+ *
+ * Since: 3.3.0
+ */
+typedef enum {
+ VIR_DOMAIN_JOB_OPERATION_UNKNOWN = 0, /* (Since: 3.3.0) */
+ VIR_DOMAIN_JOB_OPERATION_START = 1, /* (Since: 3.3.0) */
+ VIR_DOMAIN_JOB_OPERATION_SAVE = 2, /* (Since: 3.3.0) */
+ VIR_DOMAIN_JOB_OPERATION_RESTORE = 3, /* (Since: 3.3.0) */
+ VIR_DOMAIN_JOB_OPERATION_MIGRATION_IN = 4, /* (Since: 3.3.0) */
+ VIR_DOMAIN_JOB_OPERATION_MIGRATION_OUT = 5, /* (Since: 3.3.0) */
+ VIR_DOMAIN_JOB_OPERATION_SNAPSHOT = 6, /* (Since: 3.3.0) */
+ VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_REVERT = 7, /* (Since: 3.3.0) */
+ VIR_DOMAIN_JOB_OPERATION_DUMP = 8, /* (Since: 3.3.0) */
+ VIR_DOMAIN_JOB_OPERATION_BACKUP = 9, /* (Since: 6.0.0) */
+ VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_DELETE = 10, /* (Since: 9.0.0) */
+
+# ifdef VIR_ENUM_SENTINELS
+ VIR_DOMAIN_JOB_OPERATION_LAST /* (Since: 3.3.0) */
+# endif
+} virDomainJobOperation;
+
+/*
+ * Wait for job to finish
+ *
+ * Since 10.1.0
+ */
+int virDomainJobWait (virDomainPtr domain, int op);
+
/**
* virDomainBlockJobInfoFlags:
*
@@ -4185,29 +4216,6 @@ typedef enum {
int virDomainAbortJobFlags(virDomainPtr dom,
unsigned int flags);
-/**
- * virDomainJobOperation:
- *
- * Since: 3.3.0
- */
-typedef enum {
- VIR_DOMAIN_JOB_OPERATION_UNKNOWN = 0, /* (Since: 3.3.0) */
- VIR_DOMAIN_JOB_OPERATION_START = 1, /* (Since: 3.3.0) */
- VIR_DOMAIN_JOB_OPERATION_SAVE = 2, /* (Since: 3.3.0) */
- VIR_DOMAIN_JOB_OPERATION_RESTORE = 3, /* (Since: 3.3.0) */
- VIR_DOMAIN_JOB_OPERATION_MIGRATION_IN = 4, /* (Since: 3.3.0) */
- VIR_DOMAIN_JOB_OPERATION_MIGRATION_OUT = 5, /* (Since: 3.3.0) */
- VIR_DOMAIN_JOB_OPERATION_SNAPSHOT = 6, /* (Since: 3.3.0) */
- VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_REVERT = 7, /* (Since: 3.3.0) */
- VIR_DOMAIN_JOB_OPERATION_DUMP = 8, /* (Since: 3.3.0) */
- VIR_DOMAIN_JOB_OPERATION_BACKUP = 9, /* (Since: 6.0.0) */
- VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_DELETE = 10, /* (Since: 9.0.0) */
-
-# ifdef VIR_ENUM_SENTINELS
- VIR_DOMAIN_JOB_OPERATION_LAST /* (Since: 3.3.0) */
-# endif
-} virDomainJobOperation;
-
/**
* VIR_DOMAIN_JOB_OPERATION:
*
diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
index 5219344b72..717a5d511f 100644
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -750,6 +750,9 @@ typedef int
(*virDrvDomainAbortJobFlags)(virDomainPtr domain,
unsigned int flags);
+typedef int
+(*virDrvDomainJobWait)(virDomainPtr domain, int op);
+
typedef int
(*virDrvDomainMigrateGetMaxDowntime)(virDomainPtr domain,
unsigned long long *downtime,
@@ -1602,6 +1605,7 @@ struct _virHypervisorDriver {
virDrvDomainGetJobStats domainGetJobStats;
virDrvDomainAbortJob domainAbortJob;
virDrvDomainAbortJobFlags domainAbortJobFlags;
+ virDrvDomainJobWait domainJobWait;
virDrvDomainMigrateGetMaxDowntime domainMigrateGetMaxDowntime;
virDrvDomainMigrateSetMaxDowntime domainMigrateSetMaxDowntime;
virDrvDomainMigrateGetCompressionCache domainMigrateGetCompressionCache;
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 83abad251e..846d711f1b 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -1527,7 +1527,6 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to,
return -1;
}
-
/**
* virDomainScreenshot:
* @domain: a domain object
@@ -10660,6 +10659,27 @@ virDomainBlockJobAbort(virDomainPtr dom, const char *disk,
return -1;
}
+/**
+ * virDomainJobWait:
+ * @domain: a domain object
+ * @op: the job type to wait for
+ *
+ * Waits for the specified pending domain job to complete.
+ *
+ * Returns 0 in case of success and -1 in case of failure.
+ *
+ * Since: 10.1.0
+ */
+int
+virDomainJobWait(virDomainPtr domain, int op)
+{
+ if (domain->conn->driver->domainJobWait) {
+ return domain->conn->driver->domainJobWait(domain, op);
+ }
+ virReportError(VIR_ERR_NO_SUPPORT, "%s",
+ _("does not support waiting for domain job to complete"));
+ return -1;
+}
/**
* virDomainGetBlockJobInfo:
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 0304b8f824..0bb679efd0 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -941,6 +941,7 @@ LIBVIRT_9.7.0 {
LIBVIRT_10.1.0 {
global:
virNodeDeviceUpdate;
+ virDomainJobWait;
} LIBVIRT_9.7.0;
# .... define new API here using predicted next version number ....
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 448e6b1591..8f6a6c4306 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3286,6 +3286,33 @@ qemuDomainCoreDump(virDomainPtr dom,
flags);
}
+static int
+qemuDomainJobWait(virDomainPtr dom, int op)
+{
+ virDomainObj *vm;
+ int ret = -1;
+
+ if (!(vm = qemuDomainObjFromDomain(dom)))
+ return -1;
+
+ if (virDomainJobWaitEnsureACL(dom->conn, vm->def) < 0)
+ goto cleanup;
+
+ if (virDomainObjCheckActive(vm) < 0)
+ goto cleanup;
+
+ if ((virDomainJobOperation)op == VIR_DOMAIN_JOB_OPERATION_DUMP &&
+ vm->job->asyncJob == VIR_ASYNC_JOB_DUMP)
+ ret = qemuDomainObjWait(vm);
+ else
+ virReportError(VIR_ERR_OPERATION_INVALID,
+ _("job mismatch, want=%d have=%d"), op,
vm->job->asyncJob);
+
+cleanup:
+ virDomainObjEndAPI(&vm);
+ return ret;
+}
+
static char *
qemuDomainScreenshot(virDomainPtr dom,
@@ -20060,6 +20087,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
.domainGetJobStats = qemuDomainGetJobStats, /* 1.0.3 */
.domainAbortJob = qemuDomainAbortJob, /* 0.7.7 */
.domainAbortJobFlags = qemuDomainAbortJobFlags, /* 8.5.0 */
+ .domainJobWait = qemuDomainJobWait, /* 10.1.0 */
.domainMigrateGetMaxDowntime = qemuDomainMigrateGetMaxDowntime, /* 3.7.0 */
.domainMigrateSetMaxDowntime = qemuDomainMigrateSetMaxDowntime, /* 0.8.0 */
.domainMigrateGetCompressionCache = qemuDomainMigrateGetCompressionCache, /* 1.0.3
*/
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index f156475bd2..42577c4a0d 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -7721,6 +7721,7 @@ static virHypervisorDriver hypervisor_driver = {
.domainGetJobStats = remoteDomainGetJobStats, /* 1.0.3 */
.domainAbortJob = remoteDomainAbortJob, /* 0.7.7 */
.domainAbortJobFlags = remoteDomainAbortJobFlags, /* 8.5.0 */
+ .domainJobWait = remoteDomainJobWait, /* 10.1.0 */
.domainMigrateGetMaxDowntime = remoteDomainMigrateGetMaxDowntime, /* 3.7.0 */
.domainMigrateSetMaxDowntime = remoteDomainMigrateSetMaxDowntime, /* 0.8.0 */
.domainMigrateGetCompressionCache = remoteDomainMigrateGetCompressionCache, /* 1.0.3
*/
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 71ae0cf6c1..482f249f46 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -1406,6 +1406,11 @@ struct remote_domain_block_job_abort_args {
unsigned int flags;
};
+struct remote_domain_job_wait_args {
+ remote_nonnull_domain dom;
+ int op;
+};
+
struct remote_domain_get_block_job_info_args {
remote_nonnull_domain dom;
remote_nonnull_string path;
@@ -7037,5 +7042,12 @@ enum remote_procedure {
* @acl:
node_device:save:!VIR_NODE_DEVICE_UPDATE_AFFECT_CONFIG|VIR_NODE_DEVICE_UPDATE_AFFECT_LIVE
* @acl: node_device:save:VIR_NODE_DEVICE_UPDATE_AFFECT_CONFIG
*/
- REMOTE_PROC_NODE_DEVICE_UPDATE = 447
+ REMOTE_PROC_NODE_DEVICE_UPDATE = 447,
+
+ /**
+ * @generate: both
+ * @acl: domain:read
+ */
+ REMOTE_PROC_DOMAIN_JOB_WAIT = 448
+
};
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index ee2ec3e6fa..78a5fd45b9 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -979,6 +979,10 @@ struct remote_domain_block_job_abort_args {
remote_nonnull_string path;
u_int flags;
};
+struct remote_domain_job_wait_args {
+ remote_nonnull_domain dom;
+ int op;
+};
struct remote_domain_get_block_job_info_args {
remote_nonnull_domain dom;
remote_nonnull_string path;
@@ -3749,4 +3753,5 @@ enum remote_procedure {
REMOTE_PROC_NETWORK_GET_METADATA = 445,
REMOTE_PROC_NETWORK_EVENT_CALLBACK_METADATA_CHANGE = 446,
REMOTE_PROC_NODE_DEVICE_UPDATE = 447,
+ REMOTE_PROC_DOMAIN_CORE_DUMP_WAIT = 448
};
--
2.30.2
4:17 p.m.
New subject: [RFC 2/6] add wait option to virsh dump
This patch introduces the --wait option to virsh dump, which allows
waiting for an already ongoing dump operation.
---
tools/virsh-domain.c | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index e69d14a6aa..bcaa4e7101 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5421,7 +5421,6 @@ static const vshCmdOptDef opts_dump[] = {
VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE),
{.name = "file",
.type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
.help = N_("where to dump the core")
},
VIRSH_COMMON_OPT_LIVE(N_("perform a live core dump if supported")),
@@ -5451,6 +5450,10 @@ static const vshCmdOptDef opts_dump[] = {
.completer = virshDomainCoreDumpFormatCompleter,
.help = N_("specify the format of memory-only dump")
},
+ {.name = "wait",
+ .type = VSH_OT_BOOL,
+ .help = N_("specify the format of memory-only dump")
+ },
{.name = NULL}
};
@@ -5515,16 +5518,31 @@ doDump(void *opaque)
}
}
- if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) {
- if (virDomainCoreDumpWithFormat(dom, to, dumpformat, flags) < 0) {
- vshError(ctl, _("Failed to core dump domain '%1$s' to
%2$s"), name, to);
+ if (vshCommandOptBool(cmd, "wait")) {
+ if (flags != 0) {
+ vshError(ctl, "%s", _("--wait cannot be used with any other
option"));
+ goto out;
+ }
+ if (virDomainJobWait(dom, (int)VIR_DOMAIN_JOB_OPERATION_DUMP) < 0) {
+ vshError(ctl, _("Failed to wait for core dump domain"));
goto out;
}
} else {
- if (virDomainCoreDump(dom, to, flags) < 0) {
- vshError(ctl, _("Failed to core dump domain '%1$s' to
%2$s"), name, to);
+ if (to == NULL) {
+ vshError(ctl, _("missing required argument --file"));
goto out;
}
+ if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) {
+ if (virDomainCoreDumpWithFormat(dom, to, dumpformat, flags) < 0) {
+ vshError(ctl, _("Failed to core dump domain '%1$s' to
%2$s"), name, to);
+ goto out;
+ }
+ } else {
+ if (virDomainCoreDump(dom, to, flags) < 0) {
+ vshError(ctl, _("Failed to core dump domain '%1$s' to
%2$s"), name, to);
+ goto out;
+ }
+ }
}
data->ret = 0;
--
2.30.2
4:17 p.m.
New subject: [RFC 3/6] test_driver: allow win-dmp format
Signed-off-by: Thanos Makatos <thanos.makatos(a)nutanix.com>
---
src/test/test_driver.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index ed0cdc0dab..c892ecefaa 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2621,7 +2621,8 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain,
}
/* we don't support non-raw formats in test driver */
- if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) {
+ if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW
+ && dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_WIN_DMP) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("kdump-compressed format is not supported here"));
goto cleanup;
--
2.30.2
4:18 p.m.
New subject: [RFC 4/6] test_driver: introduce testDomainJobWait
This patch adds function testDomainJobWait. Since the test_driver
exists in the application's address space, it is impossible to test the
scenario where an application starts a core dump job, restarts, and then
joins it. To get around this problem, we simulate a dump job by having
testDomainGetJobStats check for the LIBVIRT_TEST_DRIVER_DUMP_JOB
environment variable and it's value used by testDomainJobWait as
the return value of the dump job.
Signed-off-by: Thanos Makatos <thanos.makatos(a)nutanix.com>
---
src/test/test_driver.c | 114 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 114 insertions(+)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index c892ecefaa..a9c7dbaee1 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1603,6 +1603,78 @@ testConnectBaselineCPU(virConnectPtr conn G_GNUC_UNUSED,
return cpustr;
}
+
+static int
+testDomainDumpJobInfoToParams(int *type,
+ virTypedParameterPtr *params,
+ int *nparams)
+{
+ virTypedParameterPtr par = NULL;
+ int maxpar = 0;
+ int npar = 0;
+
+ if (virTypedParamsAddInt(&par, &npar, &maxpar,
+ VIR_DOMAIN_JOB_OPERATION,
+ VIR_DOMAIN_JOB_OPERATION_DUMP) < 0)
+ goto error;
+
+ if (virTypedParamsAddULLong(&par, &npar, &maxpar,
+ VIR_DOMAIN_JOB_TIME_ELAPSED,
+ 0) < 0)
+ goto error;
+
+ if (virTypedParamsAddULLong(&par, &npar, &maxpar,
+ VIR_DOMAIN_JOB_MEMORY_TOTAL,
+ 0) < 0 ||
+ virTypedParamsAddULLong(&par, &npar, &maxpar,
+ VIR_DOMAIN_JOB_MEMORY_PROCESSED,
+ 0) < 0 ||
+ virTypedParamsAddULLong(&par, &npar, &maxpar,
+ VIR_DOMAIN_JOB_MEMORY_REMAINING,
+ 0) < 0)
+ goto error;
+
+ *type = VIR_DOMAIN_JOB_UNBOUNDED;
+ *params = par;
+ *nparams = npar;
+ return 0;
+
+error:
+ virTypedParamsFree(par, npar);
+ return -1;
+}
+
+
+/*
+ * If the environment variable LIBVIRT_TEST_DRIVER_DUMP_JOB is set, it returns
+ * a fake dump job.
+ */
+static int
+testDomainGetJobStats(virDomainPtr dom,
+ int *type,
+ virTypedParameterPtr *params,
+ int *nparams,
+ unsigned int flags)
+{
+ virDomainObj *obj;
+ int ret = 0;
+
+ virCheckFlags(0, -1);
+
+ if (!(obj = testDomObjFromDomain(dom)))
+ return -1;
+
+ if (getenv("LIBVIRT_TEST_DRIVER_DUMP_JOB")) {
+ VIR_DEBUG("pretending there's a dump job");
+ ret = testDomainDumpJobInfoToParams(type, params, nparams);
+ } else
+ *type = VIR_DOMAIN_JOB_NONE;
+
+ virDomainObjEndAPI(&obj);
+ return ret;
+}
+
+
static int testNodeGetInfo(virConnectPtr conn,
virNodeInfoPtr info)
{
@@ -2656,6 +2728,46 @@ testDomainCoreDump(virDomainPtr domain,
}
+/*
+ * If the environment variable LIBVIRT_TEST_DRIVER_DUMP_JOB is set, its value
+ * is used as the return value.
+ */
+static int
+testDomainJobWait(virDomainPtr domain, int op)
+{
+ virDomainObj *vm;
+ int ret = 0;
+ char *s;
+
+ if (!(vm = testDomObjFromDomain(domain)))
+ return -1;
+
+ if ((virDomainJobOperation)op != VIR_DOMAIN_JOB_OPERATION_DUMP) {
+ virReportError(VIR_ERR_NO_SUPPORT,
+ _("waiting for job type %d not supported "), op);
+ goto out;
+ }
+
+ s = getenv("LIBVIRT_TEST_DRIVER_DUMP_JOB");
+ if (s) {
+ VIR_DEBUG("pretending there's a dump job, rc=%s", s);
+ ret = atoi(s);
+ if (ret != 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("dump fake fail"));
+ }
+ } else {
+ if (virDomainObjWait(vm) < 0) {
+ VIR_WARN("virDomainObjWait failed");
+ ret = -1;
+ }
+ }
+out:
+ virDomainObjEndAPI(&vm);
+ return ret;
+}
+
+
static char *
testDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED)
{
@@ -10544,6 +10656,8 @@ static virHypervisorDriver testHypervisorDriver = {
.domainSnapshotDelete = testDomainSnapshotDelete, /* 1.1.4 */
.connectBaselineCPU = testConnectBaselineCPU, /* 1.2.0 */
+ .domainGetJobStats = testDomainGetJobStats, /* 10.1.0 */
+ .domainJobWait = testDomainJobWait, /* 10.1.0 */
.domainCheckpointCreateXML = testDomainCheckpointCreateXML, /* 5.6.0 */
.domainCheckpointGetXMLDesc = testDomainCheckpointGetXMLDesc, /* 5.6.0 */
--
2.30.2
4:18 p.m.
New subject: [RFC 5/6] test_driver: allow and ignore more flags in testDomainCoreDumpWithFormat
It doesn't make sense to honor them, so we may just allow them.
---
src/test/test_driver.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index a9c7dbaee1..2a31511e3e 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2664,7 +2664,8 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain,
virObjectEvent *event = NULL;
int ret = -1;
- virCheckFlags(VIR_DUMP_CRASH, -1);
+ virCheckFlags(VIR_DUMP_CRASH | VIR_DUMP_LIVE | VIR_DUMP_BYPASS_CACHE |
+ VIR_DUMP_MEMORY_ONLY, -1);
if (!(privdom = testDomObjFromDomain(domain)))
--
2.30.2
4:18 p.m.
New subject: [RFC 6/6] test_driver: dump: store dump flags as payload
This way we can inspect the dump file and confirm that the test_driver
really used the dump format we specified.
Signed-off-by: Thanos Makatos <thanos.makatos(a)nutanix.com>
---
src/test/test_driver.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2a31511e3e..4f78f39de9 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2663,6 +2663,8 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain,
virDomainObj *privdom;
virObjectEvent *event = NULL;
int ret = -1;
+ char *buf = NULL;
+ int size;
virCheckFlags(VIR_DUMP_CRASH | VIR_DUMP_LIVE | VIR_DUMP_BYPASS_CACHE |
VIR_DUMP_MEMORY_ONLY, -1);
@@ -2680,7 +2682,13 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain,
domain->name, to);
goto cleanup;
}
- if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) {
+ ret = asprintf(&buf, "%s_%u", TEST_SAVE_MAGIC, dumpformat);
+ if (ret == -1) {
+ goto cleanup;
+ }
+ size = ret;
+ ret = -1;
+ if (safewrite(fd, buf, size) < 0) {
virReportSystemError(errno,
_("domain '%1$s' coredump: failed to write
header to %2$s"),
domain->name, to);
@@ -2712,6 +2720,7 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain,
ret = 0;
cleanup:
+ free(buf);
VIR_FORCE_CLOSE(fd);
virDomainObjEndAPI(&privdom);
virObjectEventStateQueue(privconn->eventState, event);
--
2.30.2
285
days inactive
285
days old
6 comments
1 participants
participants (1)
-
Thanos Makatos