maint: clean up _virDomainMemoryStat

Clean up all _virDomainMemoryStat.

Signed-off-by: James <james.wangyufei@huawei.com>
Signed-off-by: Wang Rui <moon.wangrui@huawei.com>
Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/daemon/remote.c b/daemon/remote.c
index 0ea28158543ec55bbe0c4de0fd665c789c96b39e..daa4b601e40880e30ed84ab0fa1772f52bd651bc 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1604,7 +1604,7 @@ remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED,
                                 remote_domain_memory_stats_ret *ret)
 {
     virDomainPtr dom = NULL;
-    struct _virDomainMemoryStat *stats = NULL;
+    virDomainMemoryStatPtr stats = NULL;
     int nr_stats;
     size_t i;
     int rv = -1;

diff --git a/src/driver.h b/src/driver.h
index 76142bdb9ded93e8116b17c9c47e56a5c67e4170..bb748c4dedbb6ba25feb817019e6bff1b9ff54e0 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -535,7 +535,7 @@ typedef int
 
 typedef int
 (*virDrvDomainMemoryStats)(virDomainPtr domain,
-                           struct _virDomainMemoryStat *stats,
+                           virDomainMemoryStatPtr stats,
                            unsigned int nr_stats,
                            unsigned int flags);
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 8ab4cf2df088ba64ca41030cb4f4e2c2580ec81a..c3cd62c04847af6d23215a9bb76925fedb453334 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -5387,7 +5387,7 @@ lxcNodeGetInfo(virConnectPtr conn,
 
 static int
 lxcDomainMemoryStats(virDomainPtr dom,
-                     struct _virDomainMemoryStat *stats,
+                     virDomainMemoryStatPtr stats,
                      unsigned int nr_stats,
                      unsigned int flags)
 {

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 443ea0cd0d50f6b85ac8bf8b74fbf7f756c4cefe..5fd89a3c4d79374f25191dbc19f0226f000e315e 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10187,7 +10187,7 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
 
 static int
 qemuDomainMemoryStats(virDomainPtr dom,
-                      struct _virDomainMemoryStat *stats,
+                      virDomainMemoryStatPtr stats,
                       unsigned int nr_stats,
                       unsigned int flags)
 {

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 2bc82617fe8a2963eca70f148412652dde21c7ef..46d2782e741be8f2d534311b1e7487782bd29e87 100644 (file)
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -684,7 +684,7 @@ int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon,
 
     if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) {
         offset += strlen(BALLOON_PREFIX);
-        struct _virDomainMemoryStat stats[1];
+        virDomainMemoryStatStruct stats[1];
 
         if (qemuMonitorParseBalloonInfo(offset, stats, 1) == 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR,

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 4a1b04b474c47048caf38c82fbbbf4a2c2914af8..75a3a7b4f46887c6bf63f2bdf84efb388bfb0758 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -2690,7 +2690,7 @@ remoteDomainGetSchedulerType(virDomainPtr domain, int *nparams)
 
 static int
 remoteDomainMemoryStats(virDomainPtr domain,
-                        struct _virDomainMemoryStat *stats,
+                        virDomainMemoryStatPtr stats,
                         unsigned int nr_stats,
                         unsigned int flags)
 {

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index b351b736d8c15dbe0eb7a909e1a8a326c1d7be48..2af0d4fc33475f25e07e88083ab9f7741f1cec09 100644 (file)
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -295,7 +295,7 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd)
 {
     virDomainPtr dom;
     const char *name;
-    struct _virDomainMemoryStat stats[VIR_DOMAIN_MEMORY_STAT_NR];
+    virDomainMemoryStatStruct stats[VIR_DOMAIN_MEMORY_STAT_NR];
     unsigned int nr_stats;
     size_t i;
     int ret = false;