From: Shivangi Dhir <shivangi.dhir.02@gmail.com>
Date: Thu, 17 Sep 2015 08:46:56 +0000 (+0530)
Subject: qemu: Make virtType of type virDomainVirtType
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7383b8cc068f0e9fd77ca25c6737cd90dbf1c967;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

qemu: Make virtType of type virDomainVirtType

Earlier virtType was of type int. After, introducing the enum VIR_DOMAIN_VIRT_NONE,
the type of virtType is modified to virDomainVirtType.
---

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 901361be4..a101e2a55 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 15ba39b30..49d4aa2c0 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 720fb2de2..2ce39581f 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 5c2f50ffa..df0c82a34 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 b76d85b9b..120bd935a 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 d5ef08904..f44da20fc 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 3fa603bcd..53c503dc0 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 7d4741e4a..46d4e1ed9 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;