mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
qemu: Allways assume QEMU_CAPS_CHANGE_BACKING_FILE
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 <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
d1e0eaabb1
commit
e6f50bab56
@ -14501,13 +14501,6 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
|
|||||||
|
|
||||||
if (baseSource) {
|
if (baseSource) {
|
||||||
if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE) {
|
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 &&
|
if (blockdev &&
|
||||||
qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0)
|
qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0)
|
||||||
goto endjob;
|
goto endjob;
|
||||||
@ -15638,12 +15631,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
|
|||||||
|
|
||||||
if (flags & VIR_DOMAIN_BLOCK_COMMIT_RELATIVE &&
|
if (flags & VIR_DOMAIN_BLOCK_COMMIT_RELATIVE &&
|
||||||
topSource != disk->src) {
|
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 &&
|
if (blockdev && top_parent &&
|
||||||
qemuBlockUpdateRelativeBacking(vm, top_parent, disk->src) < 0)
|
qemuBlockUpdateRelativeBacking(vm, top_parent, disk->src) < 0)
|
||||||
goto endjob;
|
goto endjob;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user