[PATCH RFC 06/51] qemu: blockjob: Remove header dependency on qemu_domain.h

[Peter Krempa <pkrempa@xxxxxxxxxx>]

The blockjob module uses 'qemuDomainAsyncJob' in it's public headers.
As I plan adding a new structure containing job data which will need to
be included in "qemu_domain.h" it's necessary to break the circular
dependency.

Convert 'qemuDomainAsyncJob' type to 'int' as it's an enum.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_blockjob.c | 6 +++---
 src/qemu/qemu_blockjob.h | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 8b51235795..1b6d16cbb9 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -85,7 +85,7 @@ static void
 qemuBlockJobEventProcess(virQEMUDriverPtr driver,
                          virDomainObjPtr vm,
                          virDomainDiskDefPtr disk,
-                         qemuDomainAsyncJob asyncJob,
+                         int asyncJob,
                          int type,
                          int status)
 {
@@ -209,7 +209,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
  */
 int
 qemuBlockJobUpdateDisk(virDomainObjPtr vm,
-                       qemuDomainAsyncJob asyncJob,
+                       int asyncJob,
                        virDomainDiskDefPtr disk,
                        char **error)
 {
@@ -269,7 +269,7 @@ qemuBlockJobSyncBeginDisk(virDomainDiskDefPtr disk)
  */
 void
 qemuBlockJobSyncEndDisk(virDomainObjPtr vm,
-                        qemuDomainAsyncJob asyncJob,
+                        int asyncJob,
                         virDomainDiskDefPtr disk)
 {
     VIR_DEBUG("disk=%s", disk->dst);
diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index 9f7677dc1e..0c440757f2 100644
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@@ -24,16 +24,15 @@

 # include "internal.h"
 # include "qemu_conf.h"
-# include "qemu_domain.h"

 int qemuBlockJobUpdateDisk(virDomainObjPtr vm,
-                           qemuDomainAsyncJob asyncJob,
+                           int asyncJob,
                            virDomainDiskDefPtr disk,
                            char **error);

 void qemuBlockJobSyncBeginDisk(virDomainDiskDefPtr disk);
 void qemuBlockJobSyncEndDisk(virDomainObjPtr vm,
-                             qemuDomainAsyncJob asyncJob,
+                             int asyncJob,
                              virDomainDiskDefPtr disk);

 #endif /* __QEMU_BLOCKJOB_H__ */
-- 
2.19.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list