Remove pre-blockdev disk setup code

[PATCH 23/80] qemu: migration: Assume support for QEMU_CAPS_BLOCKDEV_DEL

Posted by Peter Krempa 3 years, 4 months ago

The migration code was using few blockdev bits before blockdev was
fully integrated to allow TLS with NBD.

Since we now always use blockdev we can remove the check.

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

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 042e8bb10a..16d65ff22e 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -4803,14 +4803,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
                 host = spec->dest.host.name;
             }

-            /* Allow migration with TLS only when we also support TLS for the NBD connection */
-            if (flags & VIR_MIGRATE_TLS &&
-                !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_DEL)) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               _("NBD migration with TLS is not supported"));
-                goto error;
-            }
-
             if (qemuMigrationSrcNBDStorageCopy(driver, vm, mig,
                                                host,
                                                priv->migMaxBandwidth,
-- 
2.36.1

Re: [PATCH 23/80] qemu: migration: Assume support for QEMU_CAPS_BLOCKDEV_DEL

Posted by Pavel Hrdina 3 years, 4 months ago

On Tue, Jul 26, 2022 at 04:37:01PM +0200, Peter Krempa wrote:
> The migration code was using few blockdev bits before blockdev was
> fully integrated to allow TLS with NBD.
> 
> Since we now always use blockdev we can remove the check.
> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>  src/qemu/qemu_migration.c | 8 --------
>  1 file changed, 8 deletions(-)

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