[PATCH 36/80] qemu: blockjob: Remove pre-blockdev blockjob setup

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_blockjob.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 304008a31a..03c46923b3 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -250,16 +250,8 @@ qemuBlockJobDiskNewPull(virDomainObj *vm, virStorageSource *base, unsigned int jobflags) { - qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(qemuBlockJobData) job = NULL; - g_autofree char *jobname = NULL; - - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - jobname = g_strdup_printf("pull-%s-%s", disk->dst, disk->src->nodeformat); - } else { - if (!(jobname = qemuAliasDiskDriveFromDisk(disk))) - return NULL; - } + g_autofree char *jobname = g_strdup_printf("pull-%s-%s", disk->dst, disk->src->nodeformat); if (!(job = qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_PULL, jobname))) return NULL; @@ -283,21 +275,13 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm, bool delete_imgs, unsigned int jobflags) { - qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(qemuBlockJobData) job = NULL; - g_autofree char *jobname = NULL; + g_autofree char *jobname = g_strdup_printf("commit-%s-%s", disk->dst, top->nodeformat); qemuBlockJobType jobtype = QEMU_BLOCKJOB_TYPE_COMMIT; if (topparent == NULL) jobtype = QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - jobname = g_strdup_printf("commit-%s-%s", disk->dst, top->nodeformat); - } else { - if (!(jobname = qemuAliasDiskDriveFromDisk(disk))) - return NULL; - } - if (!(job = qemuBlockJobDataNew(jobtype, jobname))) return NULL; @@ -352,16 +336,8 @@ qemuBlockJobDiskNewCopy(virDomainObj *vm, bool reuse, unsigned int jobflags) { - qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(qemuBlockJobData) job = NULL; - g_autofree char *jobname = NULL; - - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - jobname = g_strdup_printf("copy-%s-%s", disk->dst, disk->src->nodeformat); - } else { - if (!(jobname = qemuAliasDiskDriveFromDisk(disk))) - return NULL; - } + g_autofree char *jobname = g_strdup_printf("copy-%s-%s", disk->dst, disk->src->nodeformat); if (!(job = qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_COPY, jobname))) return NULL; -- 2.36.1