- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/3] Add "memfd" memory backing type (resend)
by marcandre.lureau＠redhat.com 16 Nov '18

16 Nov '18

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, This is an alternative series from "[PATCH 0/5] Use memfd if possible". Instead of automatically using memfd for anonymous memory when available (as suggested by Daniel), it introduces the "memfd" memory backing type. Although using memfd transparently when possible is a good idea, it is a source of various complications for migration & save/restore. This could eventually be challenged in a different series. *please*: The first two patches have been modified and reviewed by John Ferlan. Hopefully they can be merged early, regardless of the last patch outcome, to avoid the painful rebase conflicts due to capabilities checks introduction. Thanks :) v3: - rebased, to fix capabilities check and ping the series Marc-André Lureau (3): qemu: add memory-backend-memfd capability check qemu: check memory-backend-memfd.hugetlb capability qemu: add memfd source type docs/formatdomain.html.in | 9 +- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 10 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 69 +++++++---- src/qemu/qemu_domain.c | 12 +- .../caps_2.12.0.aarch64.replies | 94 ++++++++++++--- .../caps_2.12.0.aarch64.xml | 4 +- .../caps_2.12.0.ppc64.replies | 90 +++++++++++--- .../caps_2.12.0.ppc64.xml | 4 +- .../caps_2.12.0.s390x.replies | 98 ++++++++++++---- .../caps_2.12.0.s390x.xml | 4 +- .../caps_2.12.0.x86_64.replies | 110 +++++++++++++----- .../caps_2.12.0.x86_64.xml | 4 +- .../caps_3.0.0.ppc64.replies | 90 +++++++++++--- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 4 +- .../caps_3.0.0.riscv32.replies | 86 +++++++++++--- .../caps_3.0.0.riscv32.xml | 2 + .../caps_3.0.0.riscv64.replies | 86 +++++++++++--- .../caps_3.0.0.riscv64.xml | 2 + .../caps_3.0.0.s390x.replies | 98 ++++++++++++---- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 4 +- .../caps_3.0.0.x86_64.replies | 110 +++++++++++++----- .../caps_3.0.0.x86_64.xml | 4 +- .../memfd-memory-numa.x86_64-latest.args | 34 ++++++ tests/qemuxml2argvdata/memfd-memory-numa.xml | 36 ++++++ tests/qemuxml2argvtest.c | 2 + 29 files changed, 869 insertions(+), 204 deletions(-) create mode 100644 tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memfd-memory-numa.xml -- 2.19.1.708.g4ede3d42df

4 10

[libvirt] [PATCH] docs: Add notes for VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA
by Han Han 16 Nov '18

16 Nov '18

When listing snapshot with VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA, it always returns 0 or no snapshot. Because we never implement funtions to list no-metadata snapshot in virDomainSnapshotObjListGetNames(): if ((data.flags & VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA) == VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA) return 0; Add notes for that flag. Please update the comment and man page of that flag when no-metadata snapshot list is implemented in the future. Signed-off-by: Han Han <hhan(a)redhat.com> --- include/libvirt/libvirt-domain-snapshot.h | 5 ++++- tools/virsh.pod | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-domain-snapshot.h b/include/libvirt/libvirt-domain-snapshot.h index 20771f9b1e..2e19a52a5c 100644 --- a/include/libvirt/libvirt-domain-snapshot.h +++ b/include/libvirt/libvirt-domain-snapshot.h @@ -93,7 +93,10 @@ char *virDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, * of flag (1<<0) depends on which function it is passed to; but serves * to toggle the per-call default of whether the listing is shallow or * recursive. Remaining bits come in groups; if all bits from a group are - * 0, then that group is not used to filter results. */ + * 0, then that group is not used to filter results. Internal functions + * for listing no-metadata snapshots aren't implemented. Functions above + * will return 0 when VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA is used. + * */ typedef enum { VIR_DOMAIN_SNAPSHOT_LIST_ROOTS = (1 << 0), /* Filter by snapshots with no parents, when diff --git a/tools/virsh.pod b/tools/virsh.pod index 86c041d575..b3d3840c2b 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -4689,6 +4689,9 @@ B<undefine> of a persistent domain, or be lost on B<destroy> of a transient domain. Likewise, if I<--no-metadata> is specified, the list will be filtered to just snapshots that exist without the need for libvirt metadata. +Note that - It will return no snapshot when I<--no-metadata> is +used since internal functions for listing no-metadata snapshot +are not implemented. If I<--inactive> is specified, the list will be filtered to snapshots that were taken when the domain was shut off. If I<--active> is -- 2.19.1

3 3

[libvirt] [PATCH] [patch] docs: remove redundant words and blank lines
by luzhipeng＠uniudc.com 16 Nov '18

16 Nov '18

From: ZhiPeng Lu <luzhipeng(a)uniudc.com> Signed-off-by: ZhiPeng Lu <luzhipeng(a)uniudc.com> --- docs/formatdomain.html.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8a23b78..de25ad3 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2835,7 +2835,6 @@ </source> <target dev='sdb' bus='scsi'/> </disk> - </disk> <disk type='network' device='lun'> <driver name='qemu' type='raw'/> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'> @@ -5216,7 +5215,6 @@ <virtualport> <parameters instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> </virtualport> - </interface> </devices> ...</pre> @@ -5709,8 +5707,7 @@ qemu-kvm -net nic,model=? /dev/null <host csum='off' gso='off' tso4='off' tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/> <guest csum='off' tso4='off' tso6='off' ecn='off' ufo='off'/> </driver> - - </interface> + </interface> </devices> ...</pre> @@ -6212,7 +6209,7 @@ qemu-kvm -net nic,model=? /dev/null <route family='ipv4' address='192.168.122.0' prefix='24' gateway='192.168.122.1'/> <route family='ipv4' address='192.168.122.8' gateway='192.168.122.1'/> </hostdev> - + ... </devices> ... </pre> -- 1.8.3.1

1 0

[libvirt] [PATCH v2 0/5] qemu_domain, qemu_process: maxCpus check to non-x86 guests
by Daniel Henrique Barboza 15 Nov '18

15 Nov '18

v2: - original patch was split in 3 patches as John Ferlan requested; - patches 4 and 5 are cleanups; - first patch link: https://www.redhat.com/archives/libvir-list/2018-October/msg00251.html Daniel Henrique Barboza (5): qemu_process.c: adding maxCpus value to error message qemu_process.c: make qemuValidateCpuCount public qemu_domain.c: moving maxCpu validation to qemuDomainDefValidate qemu_process.c: moving qemuValidateCpuCount to qemu_domain.c qemu_process.c: removing qemuProcessStartValidateXML src/qemu/qemu_domain.c | 27 +++++++++++++++++++ src/qemu/qemu_process.c | 57 ++++------------------------------------- 2 files changed, 32 insertions(+), 52 deletions(-) -- 2.19.1

2 9

[libvirt] [REPOST PATCH v2 00/12] Allow modification of IOThread polling values (redux)
by John Ferlan 15 Nov '18

15 Nov '18

v2: https://www.redhat.com/archives/libvir-list/2018-October/msg01065.html NB: Minor mods for this are change using 4.10.0 instead of 4.9.0, merge of qemu_capabilities conflict, and updated news.xml ...... v2 Cover Letter: v1: https://www.redhat.com/archives/libvir-list/2018-October/msg00456.html Changes since v1 (from code review) Patch 2: Move the job back into qemuDomainGetIOThreadsLive Patch 3: Add check for ActiveJob before allowing, use true for *StatsWorker, and print 'iothread' in output not 'block' Patch 5: Use virCheckPositiveArgGoto(nparams, error) instead of using virCheckNonNegativeArgGoto(nparams, error). And then remove the if (nparams) before the virCheckNonNullArgGoto(params, error); Patch 6: Add ability to determine which parameter was set via bool set_poll_{max_ns|grow|shrink} values. Then use those in the macro that sets the value to determine whether or not the value will be set based on whether it was changed. Patch 10: Use bool's to set_ when the value is found in the incoming params list. Remove the check that says poll_max_ns needs to be set. Testing proves that if it's set to 0, then the grow and shrink values can be changed (although they do nothing) Patch 12: (NEW) - News article ...... v1 Cover Letter: This series attempts to resurrect the concept of being able to modify the IOThread polling parameters; however, in a slightly different manner than the previous series posted by posted by Pavel Hrdina <phrdina redhat com>: https://www.redhat.com/archives/libvir-list/2017-February/msg01047.html The work is prompted by continued pleas found in the bz: https://bugzilla.redhat.com/show_bug.cgi?id=1545732 to provide some way to modify the paremters without needing to supply QEMU command line pass through values. It's accepted that the values being changed are fairly or extremely low level type knobs; however, it's also shown that by being able to turn the knob it is possible for certain, specific appliances to be able to gain a performance benefit for the thread at the expense of other competing threads. Unlike the previous series, this series does not attempt to save the polling values in the guest XML. Rather, it only modifies the live guest's IOThread with new values. It also doesn't provide the polling values in a virsh iothread* command, rather it uses the domstats in order to fetch and display the values. The theory being this leaves the onus on the higher level appliance/application to provide the "proper guidance" and "concerns" related to changing the values to the consumer. Not saving the values means whatever values that are chosen do not "live" in perpetuity. Once the guest is shut down or the IOThread removed from guest, the hypervisor default values take over again. Perhaps not a perfect situation in terms of what the bz requests; however, storage of default values that could cause performance issues is not an optimal situation. So this I figured is a "comprimise" of sorts. If it's still felt that no we don't want to do this, then fine, but please in doing so own the bz, state your case, and close it. I'm 50/50 on it, but figured at least I'd present this option and see what the concensus was. John Ferlan (12): qemu: Check for and return IOThread polling values if available qemu: Split qemuDomainGetIOThreadsLive qemu: Implement the ability to return IOThread stats virsh: Add ability to display IOThread stats lib: Introduce virDomainSetIOThreadParams qemu: Add monitor functions to set IOThread params qemu: Alter qemuDomainChgIOThread to take enum instead of bool qemu: Alter qemuDomainChgIOThread to take qemuMonitorIOThreadInfo qemu: Detect whether iothread polling is supported qemu: Introduce qemuDomainSetIOThreadParams tools: Add virsh iothreadset command docs: Add news article for IOThread polling docs/news.xml | 13 + include/libvirt/libvirt-domain.h | 45 ++ src/driver-hypervisor.h | 8 + src/libvirt-domain.c | 108 +++++ src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 384 ++++++++++++++++-- src/qemu/qemu_monitor.c | 19 + src/qemu/qemu_monitor.h | 9 + src/qemu/qemu_monitor_json.c | 50 +++ src/qemu/qemu_monitor_json.h | 4 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 21 +- src/remote_protocol-structs | 10 + .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + tools/virsh-domain-monitor.c | 7 + tools/virsh-domain.c | 110 +++++ tools/virsh.pod | 47 ++- 36 files changed, 825 insertions(+), 37 deletions(-) -- 2.17.2

3 19

[libvirt] [PATCH v3] qemu: agent: Avoid agentError when closing the QEMU agent
by Wang Yechao 15 Nov '18

15 Nov '18

The commit 89563efc0209b854d2b2e554423423d7602acdbd fix the monitor error when closing the QEMU monitor. The QEMU agent has a problem similar to QEMU monitor. So fix the QEMU agent with the same method. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- Changes in v3: - change the commit messages --- src/qemu/qemu_agent.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 97ad0e7..d842b0e 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -530,6 +530,9 @@ static void qemuAgentUpdateWatch(qemuAgentPtr mon) VIR_EVENT_HANDLE_HANGUP | VIR_EVENT_HANDLE_ERROR; + if (!mon->watch) + return; + if (mon->lastError.code == VIR_ERR_OK) { events |= VIR_EVENT_HANDLE_READABLE; @@ -555,6 +558,12 @@ qemuAgentIO(int watch, int fd, int events, void *opaque) VIR_DEBUG("Agent %p I/O on watch %d fd %d events %d", mon, watch, fd, events); #endif + if (mon->fd == -1 || mon->watch == 0) { + virObjectUnlock(mon); + virObjectUnref(mon); + return; + } + if (mon->fd != fd || mon->watch != watch) { if (events & (VIR_EVENT_HANDLE_HANGUP | VIR_EVENT_HANDLE_ERROR)) eof = true; @@ -788,8 +797,10 @@ void qemuAgentClose(qemuAgentPtr mon) virObjectLock(mon); if (mon->fd >= 0) { - if (mon->watch) + if (mon->watch) { virEventRemoveHandle(mon->watch); + mon->watch = 0; + } VIR_FORCE_CLOSE(mon->fd); } -- 1.8.3.1

2 1

[libvirt] [PATCH v3 00/10] Cold(un)plug and hot(un)plug support for hub
by Han Han 15 Nov '18

15 Nov '18

Changes from v2: - Add codes to check if hub is busy before hotunplug. (I am not sure if I covered all the usb devices in qemuDomainHubIsBusy. Please help to review it :) ) - Remove wrongly pasted codes - Update titles of commit msgs - Update news.xml v2: https://www.redhat.com/archives/libvir-list/2018-October/msg00719.html Han Han (10): qemu: Allow coldplugging of hub device qemu: Allow coldunplugging of hub device qemu: Refactor hub alias assignment for hotplug qemu: Make qemuBuildHubDevStr global conf: Add virDomainHubDefFree to libvirt_private.syms qemu: Implement usb hub device hotplug conf: Add function virDomainUSBAddressIsAttachedToHub qemu: Check whether hub device is busy qemu: Implement usb hub device hotunplug news: Cold(un)plug and hot(un)plug support for usb hub docs/news.xml | 10 ++ src/conf/domain_addr.c | 22 +++++ src/conf/domain_addr.h | 5 + src/conf/domain_conf.c | 30 ++++++ src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 3 + src/qemu/qemu_alias.c | 22 ++++- src/qemu/qemu_alias.h | 4 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 4 + src/qemu/qemu_driver.c | 30 +++++- src/qemu/qemu_hotplug.c | 203 ++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 8 ++ 13 files changed, 336 insertions(+), 10 deletions(-) -- 2.19.1

2 14

[libvirt] [PATCH] util: Fix virpci compilation on non-Linux
by Andrea Bolognani 15 Nov '18

15 Nov '18

We were mistakenly skipping virZPCIDeviceAddressIsEmpty() and virZPCIDeviceAddressIsValid() when compiling on non-Linux, which unsurprisingly ended up causing linking failures later in the build process. Clue-stick-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as build fix. src/util/virpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index efa2d1662a..66aae60baa 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2561,7 +2561,6 @@ virPCIDeviceAddressParse(char *address, return ret; } -#ifdef __linux__ bool virZPCIDeviceAddressIsValid(virZPCIDeviceAddressPtr zpci) @@ -2588,6 +2587,7 @@ virZPCIDeviceAddressIsEmpty(const virZPCIDeviceAddress *addr) return !(addr->uid || addr->fid); } +#ifdef __linux__ /* * returns true if equal -- 2.19.1

1 0

[libvirt] [PATCH] docs: remove redundant word
by luzhipeng＠uniudc.com 15 Nov '18

15 Nov '18

From: ZhiPeng Lu <luzhipeng(a)uniudc.com> Signed-off-by: ZhiPeng Lu <luzhipeng(a)uniudc.com> --- docs/formatdomain.html.in | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8a23b78..fa5fa19 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2835,7 +2835,6 @@ </source> <target dev='sdb' bus='scsi'/> </disk> - </disk> <disk type='network' device='lun'> <driver name='qemu' type='raw'/> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'> -- 1.8.3.1

1 0

[libvirt] [PATCHv8 1/2] qemu: Report cache occupancy (CMT) with domstats
by Wang Huaqiang 15 Nov '18

15 Nov '18

Adding the interface in qemu to report CMT statistic information through command 'virsh domstats --cpu-total'. Below is a typical output: # virsh domstats 1 --cpu-total Domain: 'ubuntu16.04-base' ... cpu.cache.monitor.count=2 cpu.cache.monitor.0.name=vcpus_1 cpu.cache.monitor.0.vcpus=1 cpu.cache.monitor.0.bank.count=2 cpu.cache.monitor.0.bank.0.id=0 cpu.cache.monitor.0.bank.0.bytes=4505600 cpu.cache.monitor.0.bank.1.id=1 cpu.cache.monitor.0.bank.1.bytes=5586944 cpu.cache.monitor.1.name=vcpus_4-6 cpu.cache.monitor.1.vcpus=4,5,6 cpu.cache.monitor.1.bank.count=2 cpu.cache.monitor.1.bank.0.id=0 cpu.cache.monitor.1.bank.0.bytes=17571840 cpu.cache.monitor.1.bank.1.id=1 cpu.cache.monitor.1.bank.1.bytes=29106176 Signed-off-by: Wang Huaqiang <huaqiang.wang(a)intel.com> --- src/libvirt-domain.c | 9 +++ src/qemu/qemu_driver.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7690339..4895f9f 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11345,6 +11345,15 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "cpu.user" - user cpu time spent in nanoseconds as unsigned long long. * "cpu.system" - system cpu time spent in nanoseconds as unsigned long * long. + * "cpu.cache.monitor.count" - tocal cache monitoring groups + * "cpu.cache.monitor.M.name" - name of cache monitoring group 'M' + * "cpu.cache.monitor.M.vcpus" - vcpus for cache monitoring group 'M' + * "cpu.cache.monitor.M.bank.count" - total bank number of cache monitoring + * group 'M' + * "cpu.cache.monitor.M.bank.N.id" - OS assigned cache bank id for cache + * 'N' in cache monitoring group 'M' + * "cpu.cache.monitor.M.bank.N.bytes" - monitor's cache occupancy of cache + * bank 'N' in cache monitoring group 'M' * * VIR_DOMAIN_STATS_BALLOON: * Return memory balloon device information. diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 89d46ee..d41ae66 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19698,6 +19698,199 @@ typedef enum { #define HAVE_JOB(flags) ((flags) & QEMU_DOMAIN_STATS_HAVE_JOB) +typedef struct _virQEMUCpuResMonitorData virQEMUCpuResMonitorData; +typedef virQEMUCpuResMonitorData *virQEMUCpuResMonitorDataPtr; +struct _virQEMUCpuResMonitorData{ + const char *name; + char *vcpus; + virResctrlMonitorType tag; + virResctrlMonitorStatsPtr stats; + size_t nstats; +}; + + +static int +qemuDomainGetCpuResMonitorData(virDomainObjPtr dom, + virQEMUCpuResMonitorDataPtr mondata) +{ + virDomainResctrlDefPtr resctrl = NULL; + size_t i = 0; + size_t j = 0; + size_t l = 0; + + for (i = 0; i < dom->def->nresctrls; i++) { + resctrl = dom->def->resctrls[i]; + + for (j = 0; j < resctrl->nmonitors; j++) { + virDomainResctrlMonDefPtr domresmon = NULL; + virResctrlMonitorPtr monitor = resctrl->monitors[j]->instance; + + domresmon = resctrl->monitors[j]; + mondata[l].tag = domresmon->tag; + + /* If virBitmapFormat successfully returns an vcpu string, then + * mondata[l].vcpus is assigned with an memory space holding it, + * let this newly allocated memory buffer to be freed along with + * the free of 'mondata' */ + if (!(mondata[l].vcpus = virBitmapFormat(domresmon->vcpus))) + return -1; + + if (!(mondata[l].name = virResctrlMonitorGetID(monitor))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not get monitor ID")); + return -1; + } + + if (domresmon->tag == VIR_RESCTRL_MONITOR_TYPE_CACHE) { + if (virResctrlMonitorGetCacheOccupancy(monitor, + &mondata[l].stats, + &mondata[l].nstats) < 0) + return -1; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid CPU resource type")); + return -1; + } + + l++; + } + } + + return 0; +} + + +static int +qemuDomainGetStatsCpuResMonitorPerTag(virQEMUCpuResMonitorDataPtr mondata, + size_t nmondata, + virResctrlMonitorType tag, + virDomainStatsRecordPtr record, + int *maxparams) +{ + char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; + unsigned int nmonitors = 0; + const char *resname = NULL; + const char *resnodename = NULL; + size_t i = 0; + + for (i = 0; i < nmondata; i++) { + if (mondata[i].tag == tag) + nmonitors++; + } + + if (!nmonitors) + return 0; + + if (tag == VIR_RESCTRL_MONITOR_TYPE_CACHE) { + resname = "cache"; + resnodename = "bank"; + } else if (tag == VIR_RESCTRL_MONITOR_TYPE_MEMBW) { + resname = "memBW"; + resnodename = "node"; + } else { + return 0; + } + + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "cpu.%s.monitor.count", resname); + if (virTypedParamsAddUInt(&record->params, &record->nparams, + maxparams, param_name, nmonitors) < 0) + return -1; + + for (i = 0; i < nmonitors; i++) { + size_t l = 0; + + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "cpu.%s.monitor.%zd.name", resname, i); + if (virTypedParamsAddString(&record->params, + &record->nparams, + maxparams, + param_name, + mondata[i].name) < 0) + return -1; + + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "cpu.%s.monitor.%zd.vcpus", resname, i); + if (virTypedParamsAddString(&record->params, &record->nparams, + maxparams, param_name, + mondata[i].vcpus) < 0) + return -1; + + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "cpu.%s.monitor.%zd.%s.count", resname, i, resnodename); + if (virTypedParamsAddUInt(&record->params, &record->nparams, + maxparams, param_name, + mondata[i].nstats) < 0) + return -1; + + for (l = 0; l < mondata[i].nstats; l++) { + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "cpu.%s.monitor.%zd.%s.%zd.id", + resname, i, resnodename, l); + if (virTypedParamsAddUInt(&record->params, &record->nparams, + maxparams, param_name, + mondata[i].stats[l].id) < 0) + return -1; + + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "cpu.%s.monitor.%zd.%s.%zd.bytes", + resname, i, resnodename, l); + if (virTypedParamsAddUInt(&record->params, &record->nparams, + maxparams, param_name, + mondata[i].stats[l].val) < 0) + return -1; + } + } + + return 0; +} + + +static int +qemuDomainGetStatsCpuResMonitor(virDomainObjPtr dom, + virDomainStatsRecordPtr record, + int *maxparams) +{ + virDomainResctrlDefPtr resctrl = NULL; + virQEMUCpuResMonitorDataPtr mondata = NULL; + unsigned int nmonitors = 0; + size_t i = 0; + int ret = -1; + + if (!virDomainObjIsActive(dom)) + return 0; + + for (i = 0; i < dom->def->nresctrls; i++) { + resctrl = dom->def->resctrls[i]; + nmonitors += resctrl->nmonitors; + } + + if (!nmonitors) + return 0; + + if (VIR_ALLOC_N(mondata, nmonitors) < 0) + return -1; + + if (qemuDomainGetCpuResMonitorData(dom, mondata) < 0) + goto cleanup; + + for (i = VIR_RESCTRL_MONITOR_TYPE_UNSUPPORT + 1; + i < VIR_RESCTRL_MONITOR_TYPE_LAST; i++) { + if (qemuDomainGetStatsCpuResMonitorPerTag(mondata, nmonitors, i, + record, maxparams) < 0) + goto cleanup; + } + + ret = 0; + cleanup: + for (i = 0; i < nmonitors; i++) + VIR_FREE(mondata[i].vcpus); + VIR_FREE(mondata); + + return ret; +} + + static int qemuDomainGetStatsCpuCgroup(virDomainObjPtr dom, virDomainStatsRecordPtr record, @@ -19747,6 +19940,11 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, { if (qemuDomainGetStatsCpuCgroup(dom, record, maxparams) < 0) return -1; + + if (qemuDomainGetStatsCpuResMonitor(dom, record, maxparams) < 0) + return -1; + + return 0; } -- 2.7.4

3 3