From 83137f5d3710ffe5a36ba9218ddc382d6675dc32 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 6 Dec 2019 16:54:33 +0100 Subject: [PATCH] qemu: migration: Simplify handling of 'diskAlias' when adding NBD exports Declare the variable inside the loop with automatic clearing. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dabdda2715..af22dfb48d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -377,7 +377,6 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; unsigned short port = 0; - char *diskAlias = NULL; size_t i; virStorageNetHostDef server = { .name = (char *)listenAddr, /* cast away const */ @@ -392,6 +391,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; + g_autofree char *diskAlias = NULL; /* check whether disk should be migrated */ if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) @@ -404,7 +404,6 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, goto cleanup; } - VIR_FREE(diskAlias); if (!(diskAlias = qemuAliasDiskDriveFromDisk(disk))) goto cleanup; @@ -433,7 +432,6 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, ret = 0; cleanup: - VIR_FREE(diskAlias); if (ret < 0 && nbdPort == 0) virPortAllocatorRelease(port); return ret; -- GitLab