I clean up all _virDomainInterfaceStats. Signed-off-by: James <james.wangyufei(a)huawei.com&gt; Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com&gt; --- src/driver.h | 2 +- src/libvirt.c | 4 ++-- src/lxc/lxc_driver.c | 4 ++-- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/test/test_driver.c | 2 +- src/util/virstats.c | 6 +++--- src/util/virstats.h | 2 +- src/xen/xen_driver.c | 2 +- src/xen/xen_hypervisor.c | 2 +- src/xen/xen_hypervisor.h | 2 +- tools/virsh-domain-monitor.c | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/driver.h b/src/driver.h index a7366e4..b02e1c0 100644 --- 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 f7e5a37..83403b7 100644 --- 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 e5b6662..3218583 100644 --- 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 6c73eaf..b62273a 100644 --- 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 6008aeb..406f295 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9841,7 +9841,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 9918d2c..8ae4c44 100644 --- 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 b10fd85..c4725ed 100644 --- 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 9724d8e..d2c6b64 100644 --- 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 0fc3aca..04eb6e2 100644 --- 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 8570653..27f19ed 100644 --- 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 2990e51..5358d15 100644 --- 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 055d8d2..e828ea9 100644 --- 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))) -- 1.7.12.4

I clean up all _virDomainBlockStats. Signed-off-by: James <james.wangyufei(a)huawei.com&gt; Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com&gt; --- src/driver.h | 2 +- src/libvirt.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/test/test_driver.c | 2 +- src/xen/block_stats.c | 4 ++-- src/xen/block_stats.h | 2 +- src/xen/xen_driver.c | 2 +- src/xen/xen_hypervisor.c | 2 +- src/xen/xen_hypervisor.h | 2 +- tools/virsh-domain-monitor.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/driver.h b/src/driver.h index b02e1c0..76142bd 100644 --- 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 83403b7..8ca8aed 100644 --- 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 3218583..8ab4cf2 100644 --- 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 406f295..9f5c977 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9595,7 +9595,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 8ae4c44..9adf6f7 100644 --- 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 27e1019..58e796d 100644 --- 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 6633d97..6cc9959 100644 --- 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 04eb6e2..11ae8f9 100644 --- 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 27f19ed..d3d4aea 100644 --- 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 5358d15..f59847f 100644 --- 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 e828ea9..b2e1fc8 100644 --- 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; -- 1.7.12.4

I clean up all _virDomainMemoryStat. Signed-off-by: James <james.wangyufei(a)huawei.com&gt; Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com&gt; --- daemon/remote.c | 2 +- src/driver.h | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor_text.c | 2 +- src/remote/remote_driver.c | 2 +- tools/virsh-domain-monitor.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 0ea2815..daa4b60 100644 --- 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 76142bd..bb748c4 100644 --- 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 8ab4cf2..c3cd62c 100644 --- 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 9f5c977..59a4b3c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10178,7 +10178,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 2bc8261..46d2782 100644 --- 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 4a1b04b..75a3a7b 100644 --- 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 b2e1fc8..4f6aaa3 100644 --- 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; -- 1.7.12.4

Yes, all of these patches below are from me. On 2014/9/18 1:21, Eric Blake wrote: -- Best Regards Wang Yufei