From 18a6dc93e5f697f22ad1abfb70c40ef87fbea3fb Mon Sep 17 00:00:00 2001 From: Wang Yufei Date: Tue, 16 Sep 2014 21:19:47 +0800 Subject: [PATCH] maint: clean up _virDomainMemoryStat Clean up all _virDomainMemoryStat. Signed-off-by: James Signed-off-by: Wang Rui Signed-off-by: Eric Blake --- 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 0ea2815854..daa4b601e4 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 76142bdb9d..bb748c4ded 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 8ab4cf2df0..c3cd62c048 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 443ea0cd0d..5fd89a3c4d 100644 --- 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 2bc82617fe..46d2782e74 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 4a1b04b474..75a3a7b4f4 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 b351b736d8..2af0d4fc33 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;