提交 f5eadd1d 编写于 作者: P Peter Krempa

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: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 f2bc59e4
...@@ -86,7 +86,7 @@ static void ...@@ -86,7 +86,7 @@ static void
qemuBlockJobEventProcess(virQEMUDriverPtr driver, qemuBlockJobEventProcess(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
qemuDomainAsyncJob asyncJob, int asyncJob,
int type, int type,
int status) int status)
{ {
...@@ -210,7 +210,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, ...@@ -210,7 +210,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
*/ */
int int
qemuBlockJobUpdateDisk(virDomainObjPtr vm, qemuBlockJobUpdateDisk(virDomainObjPtr vm,
qemuDomainAsyncJob asyncJob, int asyncJob,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
char **error) char **error)
{ {
...@@ -270,7 +270,7 @@ qemuBlockJobSyncBeginDisk(virDomainDiskDefPtr disk) ...@@ -270,7 +270,7 @@ qemuBlockJobSyncBeginDisk(virDomainDiskDefPtr disk)
*/ */
void void
qemuBlockJobSyncEndDisk(virDomainObjPtr vm, qemuBlockJobSyncEndDisk(virDomainObjPtr vm,
qemuDomainAsyncJob asyncJob, int asyncJob,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
VIR_DEBUG("disk=%s", disk->dst); VIR_DEBUG("disk=%s", disk->dst);
......
...@@ -24,16 +24,15 @@ ...@@ -24,16 +24,15 @@
# include "internal.h" # include "internal.h"
# include "qemu_conf.h" # include "qemu_conf.h"
# include "qemu_domain.h"
int qemuBlockJobUpdateDisk(virDomainObjPtr vm, int qemuBlockJobUpdateDisk(virDomainObjPtr vm,
qemuDomainAsyncJob asyncJob, int asyncJob,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
char **error); char **error);
void qemuBlockJobSyncBeginDisk(virDomainDiskDefPtr disk); void qemuBlockJobSyncBeginDisk(virDomainDiskDefPtr disk);
void qemuBlockJobSyncEndDisk(virDomainObjPtr vm, void qemuBlockJobSyncEndDisk(virDomainObjPtr vm,
qemuDomainAsyncJob asyncJob, int asyncJob,
virDomainDiskDefPtr disk); virDomainDiskDefPtr disk);
#endif /* LIBVIRT_QEMU_BLOCKJOB_H */ #endif /* LIBVIRT_QEMU_BLOCKJOB_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册