From 51688727a7278bdbc9cdb49ab6bc11f38995ab26 Mon Sep 17 00:00:00 2001 Message-Id: <51688727a7278bdbc9cdb49ab6bc11f38995ab26@dist-git> From: Peter Krempa Date: Tue, 4 Feb 2020 15:08:22 +0100 Subject: [PATCH] qemu: blockjob: Store 'flags' for all the block job types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The flags may control important aspects of the block job which may influence also the termination of the job. Store the 'flags' for all the block job types. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko (cherry picked from commit ccd4228afff22214ea9b9199b2228d79a5cb5877) https://bugzilla.redhat.com/show_bug.cgi?id=1207659 Message-Id: <27c11423760ca65573e2539ac822e88d20ad2916.1580824112.git.pkrempa@redhat.com> Reviewed-by: Ján Tomko --- src/qemu/qemu_blockjob.c | 13 ++++++++++--- src/qemu/qemu_blockjob.h | 9 ++++++--- src/qemu/qemu_driver.c | 7 ++++--- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 3dc9222a6f..6b59bbeb2c 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -252,7 +252,8 @@ qemuBlockJobDiskNew(virDomainObjPtr vm, qemuBlockJobDataPtr qemuBlockJobDiskNewPull(virDomainObjPtr vm, virDomainDiskDefPtr disk, - virStorageSourcePtr base) + virStorageSourcePtr base, + unsigned int jobflags) { qemuDomainObjPrivatePtr priv = vm->privateData; g_autoptr(qemuBlockJobData) job = NULL; @@ -269,6 +270,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm, return NULL; job->data.pull.base = base; + job->jobflags = jobflags; if (qemuBlockJobRegister(job, vm, disk, true) < 0) return NULL; @@ -283,7 +285,8 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, virStorageSourcePtr topparent, virStorageSourcePtr top, virStorageSourcePtr base, - bool delete_imgs) + bool delete_imgs, + unsigned int jobflags) { qemuDomainObjPrivatePtr priv = vm->privateData; g_autoptr(qemuBlockJobData) job = NULL; @@ -307,6 +310,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, job->data.commit.top = top; job->data.commit.base = base; job->data.commit.deleteCommittedImages = delete_imgs; + job->jobflags = jobflags; if (qemuBlockJobRegister(job, vm, disk, true) < 0) return NULL; @@ -350,7 +354,8 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, virDomainDiskDefPtr disk, virStorageSourcePtr mirror, bool shallow, - bool reuse) + bool reuse, + unsigned int jobflags) { qemuDomainObjPrivatePtr priv = vm->privateData; g_autoptr(qemuBlockJobData) job = NULL; @@ -371,6 +376,8 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, if (shallow && !reuse) job->data.copy.shallownew = true; + job->jobflags = jobflags; + if (qemuBlockJobRegister(job, vm, disk, true) < 0) return NULL; diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index 53c495fa8a..4045878568 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -176,7 +176,8 @@ qemuBlockJobDiskNew(virDomainObjPtr vm, qemuBlockJobDataPtr qemuBlockJobDiskNewPull(virDomainObjPtr vm, virDomainDiskDefPtr disk, - virStorageSourcePtr base); + virStorageSourcePtr base, + unsigned int jobflags); qemuBlockJobDataPtr qemuBlockJobDiskNewCommit(virDomainObjPtr vm, @@ -184,7 +185,8 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, virStorageSourcePtr topparent, virStorageSourcePtr top, virStorageSourcePtr base, - bool delete_imgs); + bool delete_imgs, + unsigned int jobflags); qemuBlockJobDataPtr qemuBlockJobNewCreate(virDomainObjPtr vm, @@ -197,7 +199,8 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, virDomainDiskDefPtr disk, virStorageSourcePtr mirror, bool shallow, - bool reuse); + bool reuse, + unsigned int jobflags); qemuBlockJobDataPtr qemuBlockJobDiskNewBackup(virDomainObjPtr vm, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0667402ebb..71c75b25a6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17686,7 +17686,7 @@ qemuDomainBlockPullCommon(virDomainObjPtr vm, speed <<= 20; } - if (!(job = qemuBlockJobDiskNewPull(vm, disk, baseSource))) + if (!(job = qemuBlockJobDiskNewPull(vm, disk, baseSource, flags))) goto endjob; if (blockdev) { @@ -18373,7 +18373,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, goto endjob; } - if (!(job = qemuBlockJobDiskNewCopy(vm, disk, mirror, mirror_shallow, mirror_reuse))) + if (!(job = qemuBlockJobDiskNewCopy(vm, disk, mirror, mirror_shallow, mirror_reuse, flags))) goto endjob; disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE; @@ -18794,7 +18794,8 @@ qemuDomainBlockCommit(virDomainPtr dom, if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource, baseSource, - flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE))) + flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE, + flags))) goto endjob; disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE; -- 2.25.0