Remove pre-blockdev disk setup code

[PATCH 01/80] qemu: Allways assume QEMU_CAPS_CHANGE_BACKING_FILE

Posted by Peter Krempa 3 years, 4 months ago

The 'change-backing-file' command was added in qemu-2.1 and doesn't have
any dependancies. We use it as witness for using blockjobs with relative
backing paths. Always assume it's support.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 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 9013e6fb8d..15742706fc 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14557,13 +14557,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;
@@ -15697,12 +15690,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;
-- 
2.36.1

Re: [PATCH 01/80] qemu: Allways assume QEMU_CAPS_CHANGE_BACKING_FILE

Posted by Pavel Hrdina 3 years, 4 months ago

On Tue, Jul 26, 2022 at 04:36:39PM +0200, Peter Krempa wrote:
> The 'change-backing-file' command was added in qemu-2.1 and doesn't have
> any dependancies. We use it as witness for using blockjobs with relative
> backing paths. Always assume it's support.

s/dependancies/dependencies/

> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>  src/qemu/qemu_driver.c | 13 -------------
>  1 file changed, 13 deletions(-)

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

Re: [PATCH 01/80] qemu: Allways assume QEMU_CAPS_CHANGE_BACKING_FILE

Posted by Jonathon Jongsma 3 years, 4 months ago

On 8/3/22 3:16 AM, Pavel Hrdina wrote:
> On Tue, Jul 26, 2022 at 04:36:39PM +0200, Peter Krempa wrote:
>> The 'change-backing-file' command was added in qemu-2.1 and doesn't have
>> any dependancies. We use it as witness for using blockjobs with relative
>> backing paths. Always assume it's support.
> 
> s/dependancies/dependencies/

Also: s/support/supported/

> 
>> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>> ---
>>   src/qemu/qemu_driver.c | 13 -------------
>>   1 file changed, 13 deletions(-)
> 
> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>