maint: clean up _virDomainBlockStats

Clean up all _virDomainBlockStats.

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/src/driver.h b/src/driver.h
index b02e1c046c5653cdc5f10d03fc97c393e70155af..76142bdb9ded93e8116b17c9c47e56a5c67e4170 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -505,7 +505,7 @@ typedef int
 typedef int
 (*virDrvDomainBlockStats)(virDomainPtr domain,
                           const char *path,
-                          struct _virDomainBlockStats *stats);
+                          virDomainBlockStatsPtr stats);
 
 typedef int
 (*virDrvDomainBlockStatsFlags)(virDomainPtr domain,

diff --git a/src/libvirt.c b/src/libvirt.c
index de306838c36d14655992723d03d71aef3b205908..7c6382512049b3a146d142ee54fd8a367e380cbd 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -7908,7 +7908,7 @@ virDomainBlockStats(virDomainPtr dom, const char *disk,
                     virDomainBlockStatsPtr stats, size_t size)
 {
     virConnectPtr conn;
-    struct _virDomainBlockStats stats2 = { -1, -1, -1, -1, -1 };
+    virDomainBlockStatsStruct stats2 = { -1, -1, -1, -1, -1 };
 
     VIR_DOMAIN_DEBUG(dom, "disk=%s, stats=%p, size=%zi", disk, stats, size);
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 321858312484c8f8847ec5ea082549a9de9ef3b2..8ab4cf2df088ba64ca41030cb4f4e2c2580ec81a 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2301,7 +2301,7 @@ lxcDomainMergeBlkioDevice(virBlkioDevicePtr *dest_array,
 static int
 lxcDomainBlockStats(virDomainPtr dom,
                     const char *path,
-                    struct _virDomainBlockStats *stats)
+                    virDomainBlockStatsPtr stats)
 {
     int ret = -1, idx;
     virDomainObjPtr vm;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 77710a96b08d0bfddd7a770588b173a5a0688802..443ea0cd0d50f6b85ac8bf8b74fbf7f756c4cefe 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9603,7 +9603,7 @@ qemuDomainBlockResize(virDomainPtr dom,
 static int
 qemuDomainBlockStats(virDomainPtr dom,
                      const char *path,
-                     struct _virDomainBlockStats *stats)
+                     virDomainBlockStatsPtr stats)
 {
     virQEMUDriverPtr driver = dom->conn->privateData;
     int idx;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 8ae4c449aba766350f2ea129c51370420a3d8bd3..9adf6f767c65584bf0e5718ffefc46addbd07980 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3369,7 +3369,7 @@ testDomainSetSchedulerParameters(virDomainPtr domain,
 
 static int testDomainBlockStats(virDomainPtr domain,
                                 const char *path,
-                                struct _virDomainBlockStats *stats)
+                                virDomainBlockStatsPtr stats)
 {
     testConnPtr privconn = domain->conn->privateData;
     virDomainObjPtr privdom;

diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index 27e1019c5cdfd2df924a147311a46fc1dc942cd0..58e796d390f2c5a7c7f4fb456010296ad6c334dc 100644 (file)
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -152,7 +152,7 @@ check_bd_connected(xenUnifiedPrivatePtr priv, int device, int domid)
 
 static int
 read_bd_stats(xenUnifiedPrivatePtr priv,
-              int device, int domid, struct _virDomainBlockStats *stats)
+              int device, int domid, virDomainBlockStatsPtr stats)
 {
     stats->rd_req   = read_bd_stat(device, domid, "rd_req");
     stats->rd_bytes = read_bd_stat(device, domid, "rd_sect");
@@ -343,7 +343,7 @@ int
 xenLinuxDomainBlockStats(xenUnifiedPrivatePtr priv,
                          virDomainDefPtr def,
                          const char *path,
-                         struct _virDomainBlockStats *stats)
+                         virDomainBlockStatsPtr stats)
 {
     int device = xenLinuxDomainDeviceID(def->id, path);
 

diff --git a/src/xen/block_stats.h b/src/xen/block_stats.h
index 6633d972d0cb051dedad6ac06cdff9f451c5e60e..6cc99598dfcc6af11e98071e7168ae3a97c2eba1 100644 (file)
--- a/src/xen/block_stats.h
+++ b/src/xen/block_stats.h
@@ -29,7 +29,7 @@
 
 extern int xenLinuxDomainBlockStats (xenUnifiedPrivatePtr priv,
                                      virDomainDefPtr def, const char *path,
-                                     struct _virDomainBlockStats *stats);
+                                     virDomainBlockStatsPtr stats);
 
 extern int xenLinuxDomainDeviceID(int domid, const char *dev);
 

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 04eb6e20a76706f1683c2a3ef6da20584db95c58..11ae8f933c3cde74ddd4b334f662fcc6d55ba792 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -2222,7 +2222,7 @@ xenUnifiedDomainSetSchedulerParameters(virDomainPtr dom,
 
 static int
 xenUnifiedDomainBlockStats(virDomainPtr dom, const char *path,
-                           struct _virDomainBlockStats *stats)
+                           virDomainBlockStatsPtr stats)
 {
     virDomainDefPtr def = NULL;
     int ret = -1;

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 27f19ed6a33fae9d5c7986cdabac11d652e679dd..d3d4aea1916bd18af8efb0cdb3f42ba5e37034fc 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -1423,7 +1423,7 @@ int
 xenHypervisorDomainBlockStats(virConnectPtr conn,
                               virDomainDefPtr def,
                               const char *path,
-                              struct _virDomainBlockStats *stats)
+                              virDomainBlockStatsPtr stats)
 {
 #ifdef __linux__
     xenUnifiedPrivatePtr priv = conn->privateData;

diff --git a/src/xen/xen_hypervisor.h b/src/xen/xen_hypervisor.h
index 5358d1515efeaa27b481846d95b4ceb196565316..f59847ff144cccaf7b9973678fc03073b678b7c1 100644 (file)
--- a/src/xen/xen_hypervisor.h
+++ b/src/xen/xen_hypervisor.h
@@ -125,7 +125,7 @@ int     xenHypervisorSetSchedulerParameters(virConnectPtr conn,
 int     xenHypervisorDomainBlockStats   (virConnectPtr conn,
                                          virDomainDefPtr def,
                                          const char *path,
-                                         struct _virDomainBlockStats *stats)
+                                         virDomainBlockStatsPtr stats)
           ATTRIBUTE_NONNULL (1);
 int     xenHypervisorDomainInterfaceStats (virDomainDefPtr def,
                                            const char *path,

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index d0545cb35a13f1484db279d8c2305fc8f314fa6b..b351b736d8c15dbe0eb7a909e1a8a326c1d7be48 100644 (file)
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -899,7 +899,7 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd)
 {
     virDomainPtr dom;
     const char *name = NULL, *device = NULL;
-    struct _virDomainBlockStats stats;
+    virDomainBlockStatsStruct stats;
     virTypedParameterPtr params = NULL;
     virTypedParameterPtr par = NULL;
     char *value = NULL;