NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: blockjob: Remove header dependency on qemu_domain.h

Browse Source 
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>
This commit is contained in:
Peter Krempa 2018-10-16 16:43:49 +02:00
parent f2bc59e48e
commit f5eadd1d92
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_blockjob.c
View File

@ -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,
*/ */
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)
*/ */
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);

5
src/qemu/qemu_blockjob.h
View File

@ -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 */