From ca429f102cfb7b3999eaa1ce2c9499b3bcae09d2 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 17 Mar 2025 17:15:22 +0100 Subject: [PATCH] qemu: monitor: Wire up 'replaces' attribute for 'blockdev-mirror' The 'replaces' field controls which node will be replaced by the job. This can be used to e.g. keep filter nodes in place after the copy finishes. This will be used to keep the 'copy-on-read' and 'throttle' layers in place after a copy. This patch wires up the monitor and test, but the real callers pass NULL for now. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_driver.c | 1 + src/qemu/qemu_migration.c | 1 + src/qemu/qemu_monitor.c | 9 +++++---- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 2 ++ src/qemu/qemu_monitor_json.h | 1 + tests/qemumonitorjsontest.c | 2 +- 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d72805f0c7..655521b5b7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14383,6 +14383,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, ret = qemuMonitorBlockdevMirror(priv->mon, job->name, true, qemuDomainDiskGetTopNodename(disk), qemuBlockStorageSourceGetEffectiveNodename(mirror), + NULL, bandwidth, granularity, buf_size, mirror_shallow, syncWrites); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 02ba35dc59..75f5b0fa95 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1213,6 +1213,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *vm, mon_ret = qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), diskAlias, true, qemuDomainDiskGetTopNodename(disk), qemuBlockStorageSourceGetEffectiveNodename(copysrc), + NULL, mirror_speed, 0, 0, mirror_shallow, syncWrites); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 8d8e73d38d..a903e4ac7d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2784,20 +2784,21 @@ qemuMonitorBlockdevMirror(qemuMonitor *mon, bool persistjob, const char *device, const char *target, + const char *replaces, unsigned long long bandwidth, unsigned int granularity, unsigned long long buf_size, bool shallow, bool syncWrite) { - VIR_DEBUG("jobname=%s, persistjob=%d, device=%s, target=%s, bandwidth=%lld, " + VIR_DEBUG("jobname=%s, persistjob=%d, device=%s, target=%s, replaces=%s, bandwidth=%lld, " "granularity=%#x, buf_size=%lld, shallow=%d syncWrite=%d", - NULLSTR(jobname), persistjob, device, target, bandwidth, granularity, - buf_size, shallow, syncWrite); + NULLSTR(jobname), persistjob, device, target, NULLSTR(replaces), + bandwidth, granularity, buf_size, shallow, syncWrite); QEMU_CHECK_MONITOR(mon); - return qemuMonitorJSONBlockdevMirror(mon, jobname, persistjob, device, target, + return qemuMonitorJSONBlockdevMirror(mon, jobname, persistjob, device, target, replaces, bandwidth, granularity, buf_size, shallow, syncWrite); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f7b9263b64..8c3fb5e131 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -981,6 +981,7 @@ int qemuMonitorBlockdevMirror(qemuMonitor *mon, bool persistjob, const char *device, const char *target, + const char *replaces, unsigned long long bandwidth, unsigned int granularity, unsigned long long buf_size, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9c60807926..646d8df242 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4004,6 +4004,7 @@ qemuMonitorJSONBlockdevMirror(qemuMonitor *mon, bool persistjob, const char *device, const char *target, + const char *replaces, unsigned long long speed, unsigned int granularity, unsigned long long buf_size, @@ -4032,6 +4033,7 @@ qemuMonitorJSONBlockdevMirror(qemuMonitor *mon, "S:job-id", jobname, "s:device", device, "s:target", target, + "S:replaces", replaces, "Y:speed", speed, "z:granularity", granularity, "P:buf-size", buf_size, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 25e3ae2cbb..77b8bf4a1b 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -272,6 +272,7 @@ qemuMonitorJSONBlockdevMirror(qemuMonitor *mon, bool persistjob, const char *device, const char *target, + const char *replaces, unsigned long long speed, unsigned int granularity, unsigned long long buf_size, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index f0f6a329c8..afc2e54fd0 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1155,7 +1155,7 @@ GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE, "localhost", 12345, 12346, "certsubjectval") GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0") GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0") -GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true) +GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", "replacenode", 1024, 1234, 31234, true, true) GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", "backingnode", "backingfilename", 1024) GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", "topnode", "basenode", "backingfilename", 1024, VIR_TRISTATE_BOOL_YES) GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, NULL, "/foo/bar")