[libvirt] [PATCH 3/3] maint: clean up _virDomainMemoryStat

[Wang Yufei]

Yes, all of these patches below are from me.

On 2014/9/18 1:21, Eric Blake wrote:

> On 09/16/2014 07:19 AM, James wrote:
>> I clean up all _virDomainMemoryStat.
>>
>> Signed-off-by: James <james.wangyufei at huawei.com>
>> Signed-off-by: Wang Rui <moon.wangrui at huawei.com>
>> ---
>>  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(-)
> 
> ACK; same story about the commit cleanup.  I'd also like to push a
> .mailmap entry to consolidate your prior entries; am I correct that all
> of these are from you?
> 
> $ git shortlog --author=james.wangyufei at huawei.com
> James (1):
>       util: virTimeFieldsThenRaw never returns negative
> 
> Wang Yufei (4):
>       qemu: Avoid assigning unavailable migration ports
>       docs: fix virDomainRestoreFlags description bug
>       docs: fix double articles bug
>       cgroup: Fix start VMs coincidently failed
> 
> Wangyufei (A) (1):
>       docs: delete extra character
> 
> Wangyufei (James) (1):
>       qemuAgentDispose: Reset lastError
> 
> 
> 
>>
>> 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;
>>
> 



-- 
Best Regards

Wang Yufei