January 2017 - Devel - libvirt List Archives

[libvirt] [PATCH v1 0/4] bhyve: rework SATA address allocation
by Roman Bogorodskiy 30 Jan '17

30 Jan '17

This series reworks SATA address allocation in the bhyve driver. While commit messages provide enough details (I hope), there are some general important notes: - currently, sata devices get PCI addresses and this no longer works, so right now bhyve driver fails on any SATA device - While this series fixes SATA devices' addresses (I hope *again*), old Domain XMLs with already generated PCI addresses will not work. Also, it will not work for XMLs where user manually specified PCI address for a disk, though it worked before. This is not good and I'm open for suggestions how to handle that. I'm thinking about writing a tiny Python script that will drop incorrect addresses from domain XMLs. Fabian Freyer (1): bhyve: detect 32 SATA devices per controller support Roman Bogorodskiy (3): bhyve: add virBhyveDriverCreateXMLConf bhyve: fix SATA address allocation bhyve: add tests for SATA address allocation po/POTFILES.in | 1 + src/bhyve/bhyve_capabilities.c | 59 ++++- src/bhyve/bhyve_capabilities.h | 3 +- src/bhyve/bhyve_command.c | 143 +++++++++--- src/bhyve/bhyve_device.c | 33 ++- src/bhyve/bhyve_domain.c | 69 +++++- src/bhyve/bhyve_domain.h | 2 + src/bhyve/bhyve_driver.c | 4 +- .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 4 +- ...bhyvexml2argv-addr-more-than-32-sata-disks.args | 21 ++ ...yvexml2argv-addr-more-than-32-sata-disks.ldargs | 3 + .../bhyvexml2argv-addr-more-than-32-sata-disks.xml | 196 ++++++++++++++++ .../bhyvexml2argv-addr-multiple-sata-disks.args | 9 + .../bhyvexml2argv-addr-multiple-sata-disks.ldargs | 3 + .../bhyvexml2argv-addr-multiple-sata-disks.xml | 31 +++ ...2argv-addr-no32devs-more-than-32-sata-disks.xml | 196 ++++++++++++++++ ...xml2argv-addr-no32devs-multiple-sata-disks.args | 11 + ...l2argv-addr-no32devs-multiple-sata-disks.ldargs | 3 + ...exml2argv-addr-no32devs-multiple-sata-disks.xml | 31 +++ ...yvexml2argv-addr-no32devs-single-sata-disk.args | 9 + ...exml2argv-addr-no32devs-single-sata-disk.ldargs | 3 + ...hyvexml2argv-addr-no32devs-single-sata-disk.xml | 21 ++ .../bhyvexml2argv-addr-single-sata-disk.args | 9 + .../bhyvexml2argv-addr-single-sata-disk.ldargs | 3 + .../bhyvexml2argv-addr-single-sata-disk.xml | 21 ++ tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 4 +- .../bhyvexml2argv-bhyveload-bootorder.args | 5 +- .../bhyvexml2argv-bhyveload-bootorder1.args | 5 +- .../bhyvexml2argv-bhyveload-bootorder3.args | 5 +- .../bhyvexml2argv-bhyveload-explicitargs.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 2 +- .../bhyvexml2argv-custom-loader.args | 4 +- .../bhyvexml2argv-disk-cdrom-grub.args | 4 +- .../bhyvexml2argv-disk-cdrom.args | 4 +- .../bhyvexml2argv-grub-bootorder.args | 6 +- .../bhyvexml2argv-grub-bootorder2.args | 6 +- .../bhyvexml2argv-grub-defaults.args | 4 +- .../bhyvexml2argvdata/bhyvexml2argv-localtime.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 4 +- .../bhyvexml2argv-serial-grub-nocons.args | 2 +- .../bhyvexml2argv-serial-grub.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 2 +- tests/bhyvexml2argvtest.c | 25 ++- .../bhyvexml2xmlout-acpiapic.xml | 5 +- ...hyvexml2xmlout-addr-more-than-32-sata-disks.xml | 246 +++++++++++++++++++++ .../bhyvexml2xmlout-addr-multiple-sata-disks.xml | 45 ++++ ...ml2xmlout-addr-no32devs-multiple-sata-disks.xml | 51 +++++ ...vexml2xmlout-addr-no32devs-single-sata-disk.xml | 33 +++ .../bhyvexml2xmlout-addr-single-sata-disk.xml | 33 +++ tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder1.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder2.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder3.xml | 5 +- .../bhyvexml2xmlout-bhyveload-bootorder4.xml | 5 +- .../bhyvexml2xmlout-bhyveload-explicitargs.xml | 5 +- .../bhyvexml2xmlout-console.xml | 5 +- .../bhyvexml2xmlout-custom-loader.xml | 5 +- .../bhyvexml2xmlout-disk-cdrom-grub.xml | 5 +- .../bhyvexml2xmlout-disk-cdrom.xml | 5 +- .../bhyvexml2xmlout-disk-virtio.xml | 1 + .../bhyvexml2xmlout-grub-bootorder.xml | 5 +- .../bhyvexml2xmlout-grub-bootorder2.xml | 5 +- .../bhyvexml2xmlout-grub-defaults.xml | 5 +- .../bhyvexml2xmlout-localtime.xml | 5 +- .../bhyvexml2xmlout-macaddr.xml | 5 +- .../bhyvexml2xmlout-metadata.xml | 6 +- .../bhyvexml2xmlout-serial-grub-nocons.xml | 5 +- .../bhyvexml2xmlout-serial-grub.xml | 5 +- .../bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml | 5 +- tests/bhyvexml2xmltest.c | 42 +++- 71 files changed, 1398 insertions(+), 139 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-more-than-32-sata-disks.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-more-than-32-sata-disks.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-sata-disks.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-multiple-sata-disks.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-no32devs-single-sata-disk.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-sata-disk.xml -- 2.11.0

4 15

[libvirt] [PATCH] vz: don't show bootorder for containers
by Nikolay Shirokovskiy 30 Jan '17

30 Jan '17

Because this is invalid xml for containers. This patch almost reverts 7eda8369, but still skips converting vz sdk bootorder for containers to libvirt bootorder because we use boot order in containers for quite different purpurse. --- I know I reviewed this code just recently. It is just got out of my sight. src/vz/vz_sdk.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index ced58e5..43a6340 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1695,21 +1695,6 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TYPE sdkType, int sdkIndex, return ret; } -static void -prlsdkConvertBootOrderCt(virDomainDefPtr def) -{ - size_t i; - for (i = 0; i < def->nfss; i++) { - - if (STREQ(def->fss[i]->dst, "/")) { - def->os.nBootDevs = 0; - return; - } - } - def->os.nBootDevs = 1; - def->os.bootDevs[0] = VIR_DOMAIN_BOOT_DISK; -} - static int prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def) { @@ -1870,12 +1855,8 @@ prlsdkLoadDomain(vzDriverPtr driver, goto error; /* depends on prlsdkAddDomainHardware */ - if (IS_CT(def)) { - prlsdkConvertBootOrderCt(def); - } else { - if (prlsdkConvertBootOrderVm(sdkdom, def) < 0) - goto error; - } + if (!IS_CT(def) && prlsdkConvertBootOrderVm(sdkdom, def) < 0) + goto error; pret = PrlVmCfg_GetEnvId(sdkdom, &envId); prlsdkCheckRetGoto(pret, error); -- 1.8.3.1

2 2

[libvirt] [PATCH 0/5] implement .connectGetAllDomainStats
by Nikolay Shirokovskiy 30 Jan '17

30 Jan '17

Nikolay Shirokovskiy (5): vz: provide block stats for all domain stats vz: add net group to all domain stats vz: add vcpu group to all domain stats vz: add balloon group to all domain stats vz: add state group to all domain stats src/vz/vz_driver.c | 366 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 8 ++ 2 files changed, 374 insertions(+) -- 1.8.3.1

2 8

[libvirt] [PATCH] Add libvirt-go-xml and libvirt-console-proxy to downloads
by Daniel P. Berrange 30 Jan '17

30 Jan '17

Add recently created modules to the download page list. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/downloads.html.in | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 25dc54d..99da7a6 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -198,6 +198,40 @@ <td></td> </tr> <tr> + <td>Go XML</td> + <td> + <a href="ftp://libvirt.org/libvirt/go/">ftp</a> + <a href="http://libvirt.org/sources/go/">http</a> + <a href="https://libvirt.org/sources/go/">https</a> + </td> + <td> + <a href="http://libvirt.org/git/?p=libvirt-go-xml.git;a=summary">libvirt</a> + </td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-go-xml">gitlab</a> + <a href="https://github.com/libvirt/libvirt-go-xml">github</a> + </td> + <td> + <a href="https://godoc.org/github.com/libvirt/libvirt-go-xml">api ref</a> + </td> + </tr> + <tr> + <td>Console Proxy</td> + <td> + <a href="ftp://libvirt.org/libvirt/consoleproxy/">ftp</a> + <a href="http://libvirt.org/sources/consoleproxy/">http</a> + <a href="https://libvirt.org/sources/consoleproxy/">https</a> + </td> + <td> + <a href="http://libvirt.org/git/?p=libvirt-console-proxy.git;a=summary">libvirt</a> + </td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-console-proxy">gitlab</a> + <a href="https://github.com/libvirt/libvirt-console-proxy">github</a> + </td> + <td></td> + </tr> + <tr> <td>CIM provider</td> <td> <a href="ftp://libvirt.org/libvirt/CIM/">ftp</a> -- 2.9.3

2 1

[libvirt] [PATCH] qemuBuildChrChardevStr: Don't leak @charAlias
by Michal Privoznik 30 Jan '17

30 Jan '17

==12618== 110 bytes in 10 blocks are definitely lost in loss record 269 of 295 ==12618== at 0x4C2AE5F: malloc (vg_replace_malloc.c:297) ==12618== by 0x1CFC6DD7: vasprintf (vasprintf.c:73) ==12618== by 0x1912B2FC: virVasprintfInternal (virstring.c:551) ==12618== by 0x1912B411: virAsprintfInternal (virstring.c:572) ==12618== by 0x50B1FF: qemuAliasChardevFromDevAlias (qemu_alias.c:638) ==12618== by 0x518CCE: qemuBuildChrChardevStr (qemu_command.c:4973) ==12618== by 0x522DA0: qemuBuildShmemBackendChrStr (qemu_command.c:8674) ==12618== by 0x523209: qemuBuildShmemCommandLine (qemu_command.c:8789) ==12618== by 0x526135: qemuBuildCommandLine (qemu_command.c:9843) ==12618== by 0x48B4BA: qemuProcessCreatePretendCmd (qemu_process.c:5897) ==12618== by 0x4378C9: testCompareXMLToArgv (qemuxml2argvtest.c:498) ==12618== by 0x44D5A6: virTestRun (testutils.c:180) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6d6587235..1396661ca 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4969,9 +4969,10 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, virBuffer buf = VIR_BUFFER_INITIALIZER; bool telnet; char *charAlias = NULL; + char *ret = NULL; if (!(charAlias = qemuAliasChardevFromDevAlias(alias))) - goto error; + goto cleanup; switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_NULL: @@ -4999,13 +5000,13 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("append not supported in this QEMU binary")); - goto error; + goto cleanup; } if (qemuBuildChrChardevFileStr(virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND) ? logManager : NULL, cmd, def, &buf, "path", dev->data.file.path, "append", dev->data.file.append) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_PIPE: @@ -5062,17 +5063,17 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, if (chrSourcePriv && chrSourcePriv->secinfo && qemuBuildObjectSecretCommandLine(cmd, chrSourcePriv->secinfo) < 0) - goto error; + goto cleanup; if (qemuBuildTLSx509CommandLine(cmd, cfg->chardevTLSx509certdir, dev->data.tcp.listen, cfg->chardevTLSx509verify, !!cfg->chardevTLSx509secretUUID, charAlias, qemuCaps) < 0) - goto error; + goto cleanup; if (!(objalias = qemuAliasTLSObjFromChardevAlias(charAlias))) - goto error; + goto cleanup; virBufferAsprintf(&buf, ",tls-creds=%s", objalias); VIR_FREE(objalias); } @@ -5089,7 +5090,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("spicevmc not supported in this QEMU binary")); - goto error; + goto cleanup; } virBufferAsprintf(&buf, "spicevmc,id=%s,name=%s", charAlias, virDomainChrSpicevmcTypeToString(dev->data.spicevmc)); @@ -5099,7 +5100,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("spiceport not supported in this QEMU binary")); - goto error; + goto cleanup; } virBufferAsprintf(&buf, "spiceport,id=%s,name=%s", charAlias, dev->data.spiceport.channel); @@ -5109,30 +5110,29 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported chardev '%s'"), virDomainChrTypeToString(dev->type)); - goto error; + goto cleanup; } if (dev->logfile) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_LOGFILE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("logfile not supported in this QEMU binary")); - goto error; + goto cleanup; } if (qemuBuildChrChardevFileStr(logManager, cmd, def, &buf, "logfile", dev->logfile, "logappend", dev->logappend) < 0) - goto error; + goto cleanup; } if (virBufferCheckError(&buf) < 0) - goto error; + goto cleanup; - return virBufferContentAndReset(&buf); - - error: + ret = virBufferContentAndReset(&buf); + cleanup: VIR_FREE(charAlias); virBufferFreeAndReset(&buf); - return NULL; + return ret; } -- 2.11.0

2 1

[libvirt] [PATCH] spec: Enable qemu driver for RHEL-7 on aarch64
by Jiri Denemark 30 Jan '17

30 Jan '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7d8858d3f..e8c272bd7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -36,7 +36,7 @@ %define with_qemu_tcg 0 %define qemu_kvm_arches x86_64 %if 0%{?rhel} >= 7 - %define qemu_kvm_arches x86_64 %{power64} + %define qemu_kvm_arches x86_64 %{power64} aarch64 %endif %endif -- 2.11.0

2 1

[libvirt] [PATCH 0/5] Various blkdeviotune fixes (but mostly group_name, well, almost exclusively)
by Martin Kletzander 29 Jan '17

29 Jan '17

So I wanted to fix the last thing in Bug 1344897 [1], just two error messages. But I couldn't test it out because recent addition of group_name broke setting blkdeviotune on new enough QEMU. Yes, that means 3.0.0 doesn't work with new enough QEMU. Or namespaces. Still not totally a brown-bag release though. Let's see if we can find more things like that =) [1] https://bugzilla.redhat.com/show_bug.cgi?id=1344897 Martin Kletzander (5): qemu: Only set group_name when actually requested qemu: Don't lose group_name virsh: Actually make blkdeviotune --group_name work virsh: Use consistent naming for blkdeviotune options qemu: Add better message for some invalid block I/O settings src/qemu/qemu_driver.c | 62 ++++++++++++++++++++++++++++++++++---------------- tools/virsh-domain.c | 11 ++++++--- tools/virsh.pod | 4 ++-- 3 files changed, 53 insertions(+), 24 deletions(-) -- 2.11.0

3 26

[libvirt] [PATCH] qemu: assign USB addresses on redirdev hotplug too
by Ján Tomko 27 Jan '17

27 Jan '17

https://bugzilla.redhat.com/show_bug.cgi?id=1375410 --- src/qemu/qemu_hotplug.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a6de254..57ecc02 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1587,6 +1587,7 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, virJSONValuePtr secProps = NULL; char *tlsAlias = NULL; char *secAlias = NULL; + bool need_release = false; virErrorPtr orig_err; qemuDomainPrepareChardevSourceTLS(redirdev->source, cfg); @@ -1597,6 +1598,11 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, if (!(charAlias = qemuAliasChardevFromDevAlias(redirdev->info.alias))) goto cleanup; + if ((rc = virDomainUSBAddressEnsure(priv->usbaddrs, &redirdev->info)) < 0) + goto cleanup; + if (rc == 1) + need_release = true; + if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) goto cleanup; @@ -1649,6 +1655,8 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, audit: virDomainAuditRedirdev(vm, redirdev, "attach", ret == 0); cleanup: + if (ret < 0 && need_release) + qemuDomainReleaseDeviceAddress(vm, &redirdev->info, NULL); VIR_FREE(tlsAlias); virJSONValueFree(tlsProps); VIR_FREE(secAlias); -- 2.10.2

2 1

[libvirt] [PATCH] [PATCH go] Add support for more perf events
by Nitesh Konkar 27 Jan '17

27 Jan '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- connect.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain_compat.h | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) diff --git a/connect.go b/connect.go index a95cf18..425b3c7 100644 --- a/connect.go +++ b/connect.go @@ -2253,6 +2253,24 @@ type DomainStatsPerf struct { StalledCyclesBackend uint64 RefCpuCyclesSet bool RefCpuCycles uint64 + CpuClockSet bool + CpuClock uint64 + TaskClockSet bool + TaskClock uint64 + PageFaultsSet bool + PageFaults uint64 + ContextSwitchesSet bool + ContextSwitches uint64 + CpuMigrationsSet bool + CpuMigrations uint64 + PageFaultsMinSet bool + PageFaultsMin uint64 + PageFaultsMajSet bool + PageFaultsMaj uint64 + AlignmentFaultsSet bool + AlignmentFaults uint64 + EmulationFaultsSet bool + EmulationFaults uint64 } func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParamsFieldInfo { @@ -2309,6 +2327,42 @@ func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParams set: &params.RefCpuCyclesSet, ul: &params.RefCpuCycles, }, + "perf.cpu_clock": typedParamsFieldInfo{ + set: &params.CpuClockSet, + ul: &params.CpuClock, + }, + "perf.task_clock": typedParamsFieldInfo{ + set: &params.TaskClockSet, + ul: &params.TaskClock, + }, + "perf.page_faults": typedParamsFieldInfo{ + set: &params.PageFaultsSet, + ul: &params.PageFaults, + }, + "perf.context_switches": typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + ul: &params.ContextSwitches, + }, + "perf.cpu_migrations": typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + ul: &params.CpuMigrations, + }, + "perf.page_faults_min": typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + ul: &params.PageFaultsMin, + }, + "perf.page_faults_maj": typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + ul: &params.PageFaultsMaj, + }, + "perf.alignment_faults": typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + ul: &params.AlignmentFaults, + }, + "perf.emulation_faults": typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + ul: &params.EmulationFaults, + }, } } diff --git a/domain.go b/domain.go index cf2d007..a31eeff 100644 --- a/domain.go +++ b/domain.go @@ -3187,6 +3187,24 @@ type DomainPerfEvents struct { StalledCyclesBackend bool RefCpuCyclesSet bool RefCpuCycles bool + CpuClockSet bool + CpuClock bool + TaskClockSet bool + TaskClock bool + PageFaultsSet bool + PageFaults bool + ContextSwitchesSet bool + ContextSwitches bool + CpuMigrationsSet bool + CpuMigrations bool + PageFaultsMinSet bool + PageFaultsMin bool + PageFaultsMajSet bool + PageFaultsMaj bool + AlignmentFaultsSet bool + AlignmentFaults bool + EmulationFaultsSet bool + EmulationFaults bool } /* Remember to also update DomainStatsPerf in connect.go when adding to the stuct above */ @@ -3245,6 +3263,42 @@ func getDomainPerfEventsFieldInfo(params *DomainPerfEvents) map[string]typedPara set: &params.RefCpuCyclesSet, b: &params.RefCpuCycles, }, + C.VIR_PERF_PARAM_CPU_CLOCK: typedParamsFieldInfo{ + set: &params.CpuClockSet, + b: &params.CpuClock, + }, + C.VIR_PERF_PARAM_TASK_CLOCK: typedParamsFieldInfo{ + set: &params.TaskClockSet, + b: &params.TaskClock, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS: typedParamsFieldInfo{ + set: &params.PageFaultsSet, + b: &params.PageFaults, + }, + C.VIR_PERF_PARAM_CONTEXT_SWITCHES: typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + b: &params.ContextSwitches, + }, + C.VIR_PERF_PARAM_CPU_MIGRATIONS: typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + b: &params.CpuMigrations, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MIN: typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + b: &params.PageFaultsMin, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MAJ: typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + b: &params.PageFaultsMaj, + }, + C.VIR_PERF_PARAM_ALIGNMENT_FAULTS: typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + b: &params.AlignmentFaults, + }, + C.VIR_PERF_PARAM_REF_EMULATION_FAULTS: typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + b: &params.EmulationFaults, + }, } } diff --git a/domain_compat.h b/domain_compat.h index 14072d0..55dd1ea 100644 --- a/domain_compat.h +++ b/domain_compat.h @@ -45,6 +45,42 @@ #define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" #endif +#ifndef VIR_PERF_PARAM_CPU_CLOCK +#define VIR_PERF_PARAM_CPU_CLOCK "cpu_clock" +#endif + +#ifndef VIR_PERF_PARAM_TASK_CLOCK +#define VIR_PERF_PARAM_TASK_CLOCK "task_clock" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS +#define VIR_PERF_PARAM_PAGE_FAULTS "page_faults" +#endif + +#ifndef VIR_PERF_PARAM_CONTEXT_SWITCHES +#define VIR_PERF_PARAM_CONTEXT_SWITCHES "context_switches" +#endif + +#ifndef VIR_PERF_PARAM_CPU_MIGRATIONS +#define VIR_PERF_PARAM_CPU_MIGRATIONS "cpu_migrations" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MIN +#define VIR_PERF_PARAM_PAGE_FAULTS_MIN "page_faults_min" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MAJ +#define VIR_PERF_PARAM_PAGE_FAULTS_MAJ "page_faults_maj" +#endif + +#ifndef VIR_PERF_PARAM_ALIGNMENT_FAULTS +#define VIR_PERF_PARAM__ALIGNMENT_FAULTS "alignment_faults" +#endif + +#ifndef VIR_PERF_PARAM_EMULATION_FAULTS +#define VIR_PERF_PARAM_EMULATION_FAULTS "emulation_faults" +#endif + #ifndef VIR_DOMAIN_EVENT_ID_METADATA_CHANGE #define VIR_DOMAIN_EVENT_ID_METADATA_CHANGE 23 #endif -- 1.9.3

2 1

[libvirt] [PATCH] [PATCH perl] Add support for more perf events
by Nitesh Konkar 27 Jan '17

27 Jan '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- connect.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ domain_compat.h | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) diff --git a/connect.go b/connect.go index a95cf18..425b3c7 100644 --- a/connect.go +++ b/connect.go @@ -2253,6 +2253,24 @@ type DomainStatsPerf struct { StalledCyclesBackend uint64 RefCpuCyclesSet bool RefCpuCycles uint64 + CpuClockSet bool + CpuClock uint64 + TaskClockSet bool + TaskClock uint64 + PageFaultsSet bool + PageFaults uint64 + ContextSwitchesSet bool + ContextSwitches uint64 + CpuMigrationsSet bool + CpuMigrations uint64 + PageFaultsMinSet bool + PageFaultsMin uint64 + PageFaultsMajSet bool + PageFaultsMaj uint64 + AlignmentFaultsSet bool + AlignmentFaults uint64 + EmulationFaultsSet bool + EmulationFaults uint64 } func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParamsFieldInfo { @@ -2309,6 +2327,42 @@ func getDomainStatsPerfFieldInfo(params *DomainStatsPerf) map[string]typedParams set: &params.RefCpuCyclesSet, ul: &params.RefCpuCycles, }, + "perf.cpu_clock": typedParamsFieldInfo{ + set: &params.CpuClockSet, + ul: &params.CpuClock, + }, + "perf.task_clock": typedParamsFieldInfo{ + set: &params.TaskClockSet, + ul: &params.TaskClock, + }, + "perf.page_faults": typedParamsFieldInfo{ + set: &params.PageFaultsSet, + ul: &params.PageFaults, + }, + "perf.context_switches": typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + ul: &params.ContextSwitches, + }, + "perf.cpu_migrations": typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + ul: &params.CpuMigrations, + }, + "perf.page_faults_min": typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + ul: &params.PageFaultsMin, + }, + "perf.page_faults_maj": typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + ul: &params.PageFaultsMaj, + }, + "perf.alignment_faults": typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + ul: &params.AlignmentFaults, + }, + "perf.emulation_faults": typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + ul: &params.EmulationFaults, + }, } } diff --git a/domain.go b/domain.go index cf2d007..a31eeff 100644 --- a/domain.go +++ b/domain.go @@ -3187,6 +3187,24 @@ type DomainPerfEvents struct { StalledCyclesBackend bool RefCpuCyclesSet bool RefCpuCycles bool + CpuClockSet bool + CpuClock bool + TaskClockSet bool + TaskClock bool + PageFaultsSet bool + PageFaults bool + ContextSwitchesSet bool + ContextSwitches bool + CpuMigrationsSet bool + CpuMigrations bool + PageFaultsMinSet bool + PageFaultsMin bool + PageFaultsMajSet bool + PageFaultsMaj bool + AlignmentFaultsSet bool + AlignmentFaults bool + EmulationFaultsSet bool + EmulationFaults bool } /* Remember to also update DomainStatsPerf in connect.go when adding to the stuct above */ @@ -3245,6 +3263,42 @@ func getDomainPerfEventsFieldInfo(params *DomainPerfEvents) map[string]typedPara set: &params.RefCpuCyclesSet, b: &params.RefCpuCycles, }, + C.VIR_PERF_PARAM_CPU_CLOCK: typedParamsFieldInfo{ + set: &params.CpuClockSet, + b: &params.CpuClock, + }, + C.VIR_PERF_PARAM_TASK_CLOCK: typedParamsFieldInfo{ + set: &params.TaskClockSet, + b: &params.TaskClock, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS: typedParamsFieldInfo{ + set: &params.PageFaultsSet, + b: &params.PageFaults, + }, + C.VIR_PERF_PARAM_CONTEXT_SWITCHES: typedParamsFieldInfo{ + set: &params.ContextSwitchesSet, + b: &params.ContextSwitches, + }, + C.VIR_PERF_PARAM_CPU_MIGRATIONS: typedParamsFieldInfo{ + set: &params.CpuMigrationsSet, + b: &params.CpuMigrations, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MIN: typedParamsFieldInfo{ + set: &params.PageFaultsMinSet, + b: &params.PageFaultsMin, + }, + C.VIR_PERF_PARAM_PAGE_FAULTS_MAJ: typedParamsFieldInfo{ + set: &params.PageFaultsMajSet, + b: &params.PageFaultsMaj, + }, + C.VIR_PERF_PARAM_ALIGNMENT_FAULTS: typedParamsFieldInfo{ + set: &params.AlignmentFaultsSet, + b: &params.AlignmentFaults, + }, + C.VIR_PERF_PARAM_REF_EMULATION_FAULTS: typedParamsFieldInfo{ + set: &params.EmulationFaultsSet, + b: &params.EmulationFaults, + }, } } diff --git a/domain_compat.h b/domain_compat.h index 14072d0..55dd1ea 100644 --- a/domain_compat.h +++ b/domain_compat.h @@ -45,6 +45,42 @@ #define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" #endif +#ifndef VIR_PERF_PARAM_CPU_CLOCK +#define VIR_PERF_PARAM_CPU_CLOCK "cpu_clock" +#endif + +#ifndef VIR_PERF_PARAM_TASK_CLOCK +#define VIR_PERF_PARAM_TASK_CLOCK "task_clock" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS +#define VIR_PERF_PARAM_PAGE_FAULTS "page_faults" +#endif + +#ifndef VIR_PERF_PARAM_CONTEXT_SWITCHES +#define VIR_PERF_PARAM_CONTEXT_SWITCHES "context_switches" +#endif + +#ifndef VIR_PERF_PARAM_CPU_MIGRATIONS +#define VIR_PERF_PARAM_CPU_MIGRATIONS "cpu_migrations" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MIN +#define VIR_PERF_PARAM_PAGE_FAULTS_MIN "page_faults_min" +#endif + +#ifndef VIR_PERF_PARAM_PAGE_FAULTS_MAJ +#define VIR_PERF_PARAM_PAGE_FAULTS_MAJ "page_faults_maj" +#endif + +#ifndef VIR_PERF_PARAM_ALIGNMENT_FAULTS +#define VIR_PERF_PARAM__ALIGNMENT_FAULTS "alignment_faults" +#endif + +#ifndef VIR_PERF_PARAM_EMULATION_FAULTS +#define VIR_PERF_PARAM_EMULATION_FAULTS "emulation_faults" +#endif + #ifndef VIR_DOMAIN_EVENT_ID_METADATA_CHANGE #define VIR_DOMAIN_EVENT_ID_METADATA_CHANGE 23 #endif -- 1.9.3

1 1