From 1d53e96aad7702dfa89e128a30c596c5da0f8a18 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 19 Jul 2022 21:09:23 +0200 Subject: [PATCH] qemu: migration_cookie: Remove pre-blockdev code paths MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Ján Tomko --- src/qemu/qemu_migration_cookie.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 981f5fa66c..bd939a12be 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -478,7 +478,6 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, { qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(GHashTable) stats = virHashNew(g_free); - bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); size_t i; int rc; @@ -498,11 +497,11 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, if (qemuDomainObjEnterMonitorAsync(vm, priv->job.asyncJob) < 0) return -1; - if (blockdev) - rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats); - else - rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats); + + rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats); + qemuDomainObjExitMonitor(vm); + if (rc < 0) return -1; @@ -510,14 +509,8 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, virDomainDiskDef *disk = vm->def->disks[i]; qemuBlockStats *entry; - if (blockdev) { - if (!(entry = virHashLookup(stats, disk->src->nodeformat))) - continue; - } else { - if (!disk->info.alias || - !(entry = virHashLookup(stats, disk->info.alias))) - continue; - } + if (!(entry = virHashLookup(stats, disk->src->nodeformat))) + continue; mig->nbd->disks[mig->nbd->ndisks].target = g_strdup(disk->dst); mig->nbd->disks[mig->nbd->ndisks].capacity = entry->capacity; -- 2.39.5