From ba8ae0532b3039ed308320f733aa1618fbe5758b Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 9 Aug 2023 14:18:58 +0200 Subject: [PATCH] qemuMigrationSrcBeginPhase: Require storage migration when 'migrate_disks' parameter is specified MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If a user passes a list of disks to migrate but don't actually use 'VIR_MIGRATE_NON_SHARED_DISK' or 'VIR_MIGRATE_NON_SHARED_INC' flags the parameter would be simply ignored without informing the user of the error. Add a proper error in such case. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_migration.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a3fe6be4e9..d21551ab07 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2644,6 +2644,12 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, migrate_disks, nmigrate_disks)) cookieFlags |= QEMU_MIGRATION_COOKIE_NBD; + } else { + if (nmigrate_disks > 0) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("use of 'VIR_MIGRATE_PARAM_MIGRATE_DISKS' requires use of 'VIR_MIGRATE_NON_SHARED_DISK' or 'VIR_MIGRATE_NON_SHARED_INC' flag")); + return NULL; + } } if (virDomainDefHasMemoryHotplug(vm->def) ||