qemu: blockjob: Add reference to disk into struct qemuBlockJobData

Block jobs can also happen on objects which are not a disk at a given
point (e.g. the frontend was not hotplugged yet) and thus will be
eventually kept separately. Add a reference back to the disk for
blockjobs which do correspond to a disk.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 5a2c6bb5277e1122178fb1d204858fd2a059d703..1941c0763e70de896cccac21023dc1b09b9fc7e3 100644 (file)
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -99,6 +99,7 @@ qemuBlockJobDataPtr
 qemuBlockJobDiskNew(virDomainDiskDefPtr disk)
 {
     qemuBlockJobDataPtr job = QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob;
+    job->disk = disk;
 
     qemuBlockJobDataReset(job);
     return virObjectRef(job);

diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index 1a8863440dbe6414c33e591c9fa71a304f2fe39a..5155d18f881d26a2d1a1248ed928fdb6fe59890e 100644 (file)
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@@ -32,6 +32,8 @@ typedef qemuBlockJobData *qemuBlockJobDataPtr;
 struct _qemuBlockJobData {
     virObject parent;
 
+    virDomainDiskDefPtr disk; /* may be NULL, if blockjob does not correspond to any disk */
+
     bool started;
     int type;
     char *errmsg;