From 37e801340ac6902e63e83983f5e606fbc38a23e6 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 6 Dec 2019 17:22:53 +0100 Subject: [PATCH] qemu: migration: Access job name from job struct qemuMigrationSrcNBDCopyCancelOne uses the block job data structure but generated it's own job name rather than taking it from the block job data. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2416dbe432..b14a1bcd15 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -649,7 +649,6 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; - char *diskAlias = NULL; int ret = -1; int status; int rv; @@ -668,13 +667,10 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr driver, goto cleanup; } - if (!(diskAlias = qemuAliasDiskDriveFromDisk(disk))) - return -1; - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup; - rv = qemuMonitorBlockJobCancel(priv->mon, diskAlias); + rv = qemuMonitorBlockJobCancel(priv->mon, job->name); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) goto cleanup; @@ -682,7 +678,6 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr driver, ret = 0; cleanup: - VIR_FREE(diskAlias); return ret; }