qemu: blockjob: Remove header dependency on qemu_domain.h

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@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 1b7c107ab89f4e8b6a7a7c5808007a805949cabc..763a28de5b546588fa900d2b667c091d3605dfed 100644 (file)
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -86,7 +86,7 @@ static void
 qemuBlockJobEventProcess(virQEMUDriverPtr driver,
                          virDomainObjPtr vm,
                          virDomainDiskDefPtr disk,
-                         qemuDomainAsyncJob asyncJob,
+                         int asyncJob,
                          int type,
                          int status)
 {
@@ -210,7 +210,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
  */
 int
 qemuBlockJobUpdateDisk(virDomainObjPtr vm,
-                       qemuDomainAsyncJob asyncJob,
+                       int asyncJob,
                        virDomainDiskDefPtr disk,
                        char **error)
 {
@@ -270,7 +270,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 5d2459635e26497463ba8e69ebe39f114b1ce61e..0b28a6fa57c680920d1770562913e622bd1edfb0 100644 (file)
--- 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 /* LIBVIRT_QEMU_BLOCKJOB_H */