Re: [libvirt] [PATCHv4 1/2] Add a new param 'vcpu_time' to virDomainGetCPUStats

On 05/09/2012 02:41 AM, Hu Tao wrote: Here would be a good place to describe the relation between the two parameters. We didn't really use flags in this patch, but it doesn't hurt to add it now. You meant s/CPUTIME/VCPUTIME/ on one of these two STREQ. ACK with this squashed in: diff --git i/include/libvirt/libvirt.h.in w/include/libvirt/libvirt.h.in index 2449cee..a817db8 100644 --- i/include/libvirt/libvirt.h.in +++ w/include/libvirt/libvirt.h.in @@ -1339,7 +1339,8 @@ int virDomainGetState (virDomainPtr domain, /** * VIR_DOMAIN_CPU_STATS_CPUTIME: - * cpu usage in nanoseconds, as a ullong + * cpu usage (sum of both vcpu and hypervisor usage) in nanoseconds, + * as a ullong */ #define VIR_DOMAIN_CPU_STATS_CPUTIME "cpu_time" @@ -1357,7 +1358,8 @@ int virDomainGetState (virDomainPtr domain, /** * VIR_DOMAIN_CPU_STATS_VCPUTIME: - * vcpu usage in nanoseconds, as a ullong + * vcpu usage in nanoseconds (cpu_time excluding hypervisor time), + * as a ullong */ #define VIR_DOMAIN_CPU_STATS_VCPUTIME "vcpu_time" diff --git i/tools/virsh.c w/tools/virsh.c index 414c810..46239fa 100644 --- i/tools/virsh.c +++ w/tools/virsh.c @@ -5632,7 +5632,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) pos = i * nparams + j; vshPrint(ctl, "\t%-12s ", params[pos].field); if ((STREQ(params[pos].field, VIR_DOMAIN_CPU_STATS_CPUTIME) || - STREQ(params[pos].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) && + STREQ(params[pos].field, VIR_DOMAIN_CPU_STATS_VCPUTIME)) && params[j].type == VIR_TYPED_PARAM_ULLONG) { vshPrint(ctl, "%9lld.%09lld seconds\n", params[pos].value.ul / 1000000000, -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org