maint: clean up _virDomainInterfaceStats

Clean up all _virDomainInterfaceStats.

Signed-off-by: Wang Yufei <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 a7366e44c33811c2283df564221728c6da9b07ca..b02e1c046c5653cdc5f10d03fc97c393e70155af 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -517,7 +517,7 @@ typedef int
 typedef int
 (*virDrvDomainInterfaceStats)(virDomainPtr domain,
                               const char *path,
-                              struct _virDomainInterfaceStats *stats);
+                              virDomainInterfaceStatsPtr stats);
 
 typedef int
 (*virDrvDomainSetInterfaceParameters)(virDomainPtr dom,

diff --git a/src/libvirt.c b/src/libvirt.c
index 98f7cc84acb5cee428ba59111694a81e2433b32b..de306838c36d14655992723d03d71aef3b205908 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -8047,8 +8047,8 @@ virDomainInterfaceStats(virDomainPtr dom, const char *path,
                         virDomainInterfaceStatsPtr stats, size_t size)
 {
     virConnectPtr conn;
-    struct _virDomainInterfaceStats stats2 = { -1, -1, -1, -1,
-                                               -1, -1, -1, -1 };
+    virDomainInterfaceStatsStruct stats2 = { -1, -1, -1, -1,
+                                             -1, -1, -1, -1 };
 
     VIR_DOMAIN_DEBUG(dom, "path=%s, stats=%p, size=%zi",
                      path, stats, size);

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index e5b6662fdb0c2f03fd5881e104ddf2df92492723..321858312484c8f8847ec5ea082549a9de9ef3b2 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -3084,7 +3084,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
 static int
 lxcDomainInterfaceStats(virDomainPtr dom,
                         const char *path,
-                        struct _virDomainInterfaceStats *stats)
+                        virDomainInterfaceStatsPtr stats)
 {
     virDomainObjPtr vm;
     size_t i;
@@ -3126,7 +3126,7 @@ lxcDomainInterfaceStats(virDomainPtr dom,
 static int
 lxcDomainInterfaceStats(virDomainPtr dom,
                         const char *path ATTRIBUTE_UNUSED,
-                        struct _virDomainInterfaceStats *stats ATTRIBUTE_UNUSED)
+                        virDomainInterfaceStatsPtr stats ATTRIBUTE_UNUSED)
 {
     virReportUnsupportedError();
     return -1;

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 6c73eaf264e9bd912d061eeabc50351b2a34771c..b62273a2c0eff8df216a5e7d3b6c7407954ec1a7 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1975,7 +1975,7 @@ openvzGetVEStatus(virDomainObjPtr vm, int *status, int *reason)
 static int
 openvzDomainInterfaceStats(virDomainPtr dom,
                            const char *path,
-                           struct _virDomainInterfaceStats *stats)
+                           virDomainInterfaceStatsPtr stats)
 {
     struct openvz_driver *driver = dom->conn->privateData;
     virDomainObjPtr vm;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 209c40e936be80190e38c80c2694ae386ca58c1f..77710a96b08d0bfddd7a770588b173a5a0688802 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9850,7 +9850,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom,
 static int
 qemuDomainInterfaceStats(virDomainPtr dom,
                          const char *path,
-                         struct _virDomainInterfaceStats *stats)
+                         virDomainInterfaceStatsPtr stats)
 {
     virDomainObjPtr vm;
     size_t i;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 9918d2c4b03f6d03f7b1b32c94849857323a2c3b..8ae4c449aba766350f2ea129c51370420a3d8bd3 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3422,7 +3422,7 @@ static int testDomainBlockStats(virDomainPtr domain,
 
 static int testDomainInterfaceStats(virDomainPtr domain,
                                     const char *path,
-                                    struct _virDomainInterfaceStats *stats)
+                                    virDomainInterfaceStatsPtr stats)
 {
     testConnPtr privconn = domain->conn->privateData;
     virDomainObjPtr privdom;

diff --git a/src/util/virstats.c b/src/util/virstats.c
index b10fd851fcd2ee6a14d07782c8714a11e4faafe2..c4725edbd7b1dd341d9451af50ecf643f8ed82b5 100644 (file)
--- a/src/util/virstats.c
+++ b/src/util/virstats.c
@@ -51,7 +51,7 @@
 #ifdef __linux__
 int
 virNetInterfaceStats(const char *path,
-                     struct _virDomainInterfaceStats *stats)
+                     virDomainInterfaceStatsPtr stats)
 {
     int path_len;
     FILE *fp;
@@ -122,7 +122,7 @@ virNetInterfaceStats(const char *path,
 #elif defined(HAVE_GETIFADDRS) && defined(AF_LINK)
 int
 virNetInterfaceStats(const char *path,
-                     struct _virDomainInterfaceStats *stats)
+                     virDomainInterfaceStatsPtr stats)
 {
     struct ifaddrs *ifap, *ifa;
     struct if_data *ifd;
@@ -168,7 +168,7 @@ virNetInterfaceStats(const char *path,
 #else
 int
 virNetInterfaceStats(const char *path ATTRIBUTE_UNUSED,
-                     struct _virDomainInterfaceStats *stats ATTRIBUTE_UNUSED)
+                     virDomainInterfaceStatsPtr stats ATTRIBUTE_UNUSED)
 {
     virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                    _("interface stats not implemented on this platform"));

diff --git a/src/util/virstats.h b/src/util/virstats.h
index 9724d8e6e92072200822f74e7a8944090df7eb96..d2c6b640e63fd4d88a1081226b33378a08e291a1 100644 (file)
--- a/src/util/virstats.h
+++ b/src/util/virstats.h
@@ -26,6 +26,6 @@
 # include "internal.h"
 
 extern int virNetInterfaceStats(const char *path,
-                                struct _virDomainInterfaceStats *stats);
+                                virDomainInterfaceStatsPtr stats);
 
 #endif /* __STATS_LINUX_H__ */

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 0fc3aca700627f3bcc378da6fb98df91457198bb..04eb6e20a76706f1683c2a3ef6da20584db95c58 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -2242,7 +2242,7 @@ xenUnifiedDomainBlockStats(virDomainPtr dom, const char *path,
 
 static int
 xenUnifiedDomainInterfaceStats(virDomainPtr dom, const char *path,
-                               struct _virDomainInterfaceStats *stats)
+                               virDomainInterfaceStatsPtr stats)
 {
     virDomainDefPtr def = NULL;
     int ret = -1;

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 857065339088e4a1f8e10d119f85e57bd4b4f9ff..27f19ed6a33fae9d5c7986cdabac11d652e679dd 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -1451,7 +1451,7 @@ xenHypervisorDomainBlockStats(virConnectPtr conn,
 int
 xenHypervisorDomainInterfaceStats(virDomainDefPtr def,
                                   const char *path,
-                                  struct _virDomainInterfaceStats *stats)
+                                  virDomainInterfaceStatsPtr stats)
 {
 #ifdef __linux__
     int rqdomid, device;

diff --git a/src/xen/xen_hypervisor.h b/src/xen/xen_hypervisor.h
index 2990e51ed435d4465edbb84090f8dd5c7bf926cb..5358d1515efeaa27b481846d95b4ceb196565316 100644 (file)
--- a/src/xen/xen_hypervisor.h
+++ b/src/xen/xen_hypervisor.h
@@ -129,7 +129,7 @@ int     xenHypervisorDomainBlockStats   (virConnectPtr conn,
           ATTRIBUTE_NONNULL (1);
 int     xenHypervisorDomainInterfaceStats (virDomainDefPtr def,
                                            const char *path,
-                                           struct _virDomainInterfaceStats *stats)
+                                           virDomainInterfaceStatsPtr stats)
           ATTRIBUTE_NONNULL (1);
 
 int     xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn,

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index d013ca8b055cd3dc40515d91733ad0d1a0e48a99..d0545cb35a13f1484db279d8c2305fc8f314fa6b 100644 (file)
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -1047,7 +1047,7 @@ cmdDomIfstat(vshControl *ctl, const vshCmd *cmd)
 {
     virDomainPtr dom;
     const char *name = NULL, *device = NULL;
-    struct _virDomainInterfaceStats stats;
+    virDomainInterfaceStatsStruct stats;
     bool ret = false;
 
     if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))