From e6f50bab565606cd56eabab0369c0d26d40fce03 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 15 Jul 2022 16:04:23 +0200 Subject: [PATCH] qemu: Allways assume QEMU_CAPS_CHANGE_BACKING_FILE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'change-backing-file' command was added in qemu-2.1 and doesn't have any dependencies. We use it as witness for using blockjobs with relative backing paths. Always assume it's supported. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Ján Tomko --- src/qemu/qemu_driver.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0f4c443f09..945873e815 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14501,13 +14501,6 @@ qemuDomainBlockPullCommon(virDomainObj *vm, if (baseSource) { if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE) { - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHANGE_BACKING_FILE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("this QEMU binary doesn't support relative " - "block pull/rebase")); - goto endjob; - } - if (blockdev && qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0) goto endjob; @@ -15638,12 +15631,6 @@ qemuDomainBlockCommit(virDomainPtr dom, if (flags & VIR_DOMAIN_BLOCK_COMMIT_RELATIVE && topSource != disk->src) { - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHANGE_BACKING_FILE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("this qemu doesn't support relative block commit")); - goto endjob; - } - if (blockdev && top_parent && qemuBlockUpdateRelativeBacking(vm, top_parent, disk->src) < 0) goto endjob;