diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 901361be419d7186cc8b6acc4bea234029153ae2..a101e2a55358a20ac834b89240a3334d8bd2bf95 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2192,7 +2192,7 @@ struct _virDomainKeyWrapDef { typedef struct _virDomainDef virDomainDef; typedef virDomainDef *virDomainDefPtr; struct _virDomainDef { - int virtType; + virDomainVirtType virtType; int id; unsigned char uuid[VIR_UUID_BUFLEN]; char *name; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 15ba39b30fac378cb33b63fd9e756716738769c3..49d4aa2c0f7f727c1e128b724b1deceb41bbd276 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1635,7 +1635,7 @@ qemuMonitorSetLink(qemuMonitorPtr mon, int qemuMonitorGetVirtType(qemuMonitorPtr mon, - int *virtType) + virDomainVirtType *virtType) { QEMU_CHECK_MONITOR(mon); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 720fb2de275766e7887ff687442f22a5ed34e19b..2ce39581fb8dbd054cbb303ef389ca5f238f4bfc 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -360,7 +360,7 @@ int qemuMonitorSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorGetCPUInfo(qemuMonitorPtr mon, int **pids); int qemuMonitorGetVirtType(qemuMonitorPtr mon, - int *virtType); + virDomainVirtType *virtType); int qemuMonitorGetBalloonInfo(qemuMonitorPtr mon, unsigned long long *currmem); int qemuMonitorGetMemoryStats(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5c2f50ffaa2c50386d7a992404e05ce10087f9e3..df0c82a34eb4348423a006b49f132eda89f0dc01 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1339,7 +1339,7 @@ int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon, int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, - int *virtType) + virDomainVirtType *virtType) { int ret; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-kvm", diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index b76d85b9b6218a894aee0f65fcb6363019393e87..120bd935a43301be8141b496c3eb7082bf62607b 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -56,7 +56,7 @@ int qemuMonitorJSONSystemReset(qemuMonitorPtr mon); int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon, int **pids); int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, - int *virtType); + virDomainVirtType *virtType); int qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, virDomainVideoDefPtr video, char *path); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index d5ef089042ca7a150a488518a541c16ab02b1a19..f44da20fc97b0975ba7ee6f39320e3840ecdf0b3 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -564,7 +564,7 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, int qemuMonitorTextGetVirtType(qemuMonitorPtr mon, - int *virtType) + virDomainVirtType *virtType) { char *reply = NULL; diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 3fa603bcd444c02a0ac614aa00409c3722423386..53c503dc0beb09463c92cc956b1aa4af00e17450 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -52,7 +52,7 @@ int qemuMonitorTextSystemReset(qemuMonitorPtr mon); int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, int **pids); int qemuMonitorTextGetVirtType(qemuMonitorPtr mon, - int *virtType); + virDomainVirtType *virtType); int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon, unsigned long long *currmem); int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 7d4741e4a7a25d1a37904feb868bd3e4e17d85d4..46d4e1ed94dd9608227371630bf58ed60814e0bf 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1311,7 +1311,7 @@ testQemuMonitorJSONqemuMonitorJSONGetVirtType(const void *data) virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); int ret = -1; - int virtType; + virDomainVirtType virtType; if (!test) return -1;