- Devel - libvirt List Archives

[libvirt] libvirt 6.0.0 make check-TESTS fails "FAIL: test-ptsname_r"
by Satheesh Rajendran 14 Jan '20

14 Jan '20

Hi, libvirt 6.0.0 (commit:bfd5f69d6038daeac03d2684fcd98aeee4ef1e24), "make rpm" fails at make check-TESTS ... .. PASS: test-memchr PASS: test-send ../../../build-aux/test-driver: line 107: 453114 Aborted (core dumped) "$@" > $log_file 2>&1 FAIL: test-ptsname_r PASS: test-setsockopt PASS: test-sigaction PASS: test-signal-h ... ------- # cat /root/rpmbuild/BUILD/libvirt-6.0.0/ppc64le-redhat-linux-gnu/gnulib/tests/test-suite.log ================================================ libvirt 6.0.0: gnulib/tests/test-suite.log ================================================ # TOTAL: 149 # PASS: 148 # SKIP: 0 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 .. contents:: :depth: 2 FAIL: test-ptsname_r ==================== ../../../gnulib/tests/test-ptsname_r.c:89: assertion 'result == EINVAL' failed FAIL test-ptsname_r (exit status: 134) -------- Env: HW: Power8 ArcH: ppc64le OS: Fedora 31 GCC: 9.2.1 20190827 (Red Hat 9.2.1-1) Glibc: glibc-2.30-8.fc31.ppc64le Gdb output: # gdb /root/rpmbuild/BUILD/libvirt-6.0.0/ppc64le-redhat-linux-gnu/gnulib/tests/test-ptsname_r -c core.test-ptsname_r.0.1a9e4ce7d7ec4d7e81e295f7f67c7029.317503.1578922893000000000000 GNU gdb (GDB) Fedora 8.3.50.20190824-26.fc31 .. .. Reading symbols from /root/rpmbuild/BUILD/libvirt-6.0.0/ppc64le-redhat-linux-gnu/gnulib/tests/test-ptsname_r... [New LWP 317503] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `./test-ptsname_r '. Program terminated with signal SIGABRT, Aborted. #0 0x00007fffac447358 in __libc_signal_restore_set (set=0x7fffefdc3078) at ../sysdeps/unix/sysv/linux/internal-signals.h:84 84 return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, set, NULL, (gdb) start Temporary breakpoint 1 at 0x11d850c88: file ../../../gnulib/tests/test-ptsname_r.c, line 94. Starting program: /root/rpmbuild/BUILD/libvirt-6.0.0/ppc64le-redhat-linux-gnu/gnulib/tests/test-ptsname_r [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Temporary breakpoint 1, 0x0000000100000c88 in main () at ../../../gnulib/tests/test-ptsname_r.c:94 94 { (gdb) c Continuing. ../../../gnulib/tests/test-ptsname_r.c:89: assertion 'result == EINVAL' failed Program received signal SIGABRT, Aborted. 0x00007ffff7d57358 in __libc_signal_restore_set (set=0x7fffffffe438) at ../sysdeps/unix/sysv/linux/internal-signals.h:84 84 return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, set, NULL, (gdb) print result $1 = '\000' <repeats 113 times> (gdb) Any help would be appreciated, Thanks in advance. Regards, -Satheesh.

2 2

[libvirt] [PATCH] news: News for RDT-MBM feature
by Han Han 14 Jan '20

14 Jan '20

Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index acb63709da..822f89f420 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -106,6 +106,15 @@ hostname and the information stored in its TLS certificate. </description> </change> + <change> + <summary> + qemu: Support to report the stats of memory bandwidth usage + </summary> + <description> + Implement Intel RDT-MBM to libvirt. The stats can be got via + <code>virsh domstats --memory</code>. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.24.0.rc1

2 2

[libvirt] [PATCH 0/7] Adapt machine name generation to new facts
by Ján Tomko 14 Jan '20

14 Jan '20

Ján Tomko (7): virbuftest: remove extra G_GNUC_UNUSED markers virbuftest: use g_autofree virbuftest: remove unnecessary labels virbuftest: declare testBufAddStrData earlier virbuftest: use field names when initalizing test info util: add virBufferTrimChars conf: do not generate machine names ending with a dash src/conf/domain_conf.c | 3 + src/libvirt_private.syms | 1 + src/util/virbuffer.c | 26 +++++++++ src/util/virbuffer.h | 1 + tests/virbuftest.c | 123 ++++++++++++++++++++++----------------- tests/virsystemdtest.c | 4 ++ 6 files changed, 103 insertions(+), 55 deletions(-) -- 2.21.0

2 14

[libvirt] [PATCH for 6.0.0] news: Document <disk type='nvme'/>
by Michal Privoznik 14 Jan '20

14 Jan '20

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index acb63709da..e9863dacf3 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -106,6 +106,22 @@ hostname and the information stored in its TLS certificate. </description> </change> + <change> + <summary> + qemu: Allow accessing NVMe disks directly + </summary> + <description> + Before this release there were two ways to configure a NVMe disk for + a domain. The first was using <disk/> with the <source/> + pointing to the <code>/dev/nvmeXXXX</code>. The other was using PCI + assignment via <hostdev/> element. Both have their + disadvantages: the former adds latency of file system and block + layers of the host kernel, the latter prohibits domain migration. In + this release the third way of configuring NVMe disk is added which + combines the advantages and drops disadvantages of the previous two + ways. It's accessible via <disk type='nvme'/>. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.24.1

2 1

[libvirt] [PATCH] docs: Notes for geometry in formatdomain doc
by Han Han 14 Jan '20

14 Jan '20

Since commit b340c6c614 CHS geometry is not supported in usb and sd, CHS translation is only supported in ide. Add these notes to formatdomain doc. Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/formatdomain.html.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2af4960981..74bea528be 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3715,9 +3715,13 @@ <dt><code>secs</code></dt> <dd>The <code>secs</code> attribute is the number of sectors per track. </dd> + <dt>Note that <code>cyls</code>, <code>heads</code> and + <code>secs</code> are not supported in <code>usb</code> + or <code>sd</code> bus.</dt> <dt><code>trans</code></dt> <dd>The optional <code>trans</code> attribute is the - BIOS-Translation-Modus (none, lba or auto)</dd> + BIOS-Translation-Modus (none, lba or auto). Note that this + attribute is only supported in <code>ide</code> bus.</dd> </dl> </dd> <dt><code>blockio</code></dt> -- 2.24.0.rc1

1 0

[libvirt] [PATCH] domain_conf: Do not use USB by default for <input> devices on s390x
by Thomas Huth 14 Jan '20

14 Jan '20

When trying to specify an input device on s390x without bus like this: <input type='keyboard'/> ... then libvirt currently complains: error: unsupported configuration: USB is disabled for this domain, but USB devices are present in the domain XML This is somewhat confusing since the user did not specify an USB device here. Since USB is not available on s390x, we should default to the "virtio" bus here instead. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1790189 Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1290241923..c3761b0f45 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13428,6 +13428,8 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt, def->type == VIR_DOMAIN_INPUT_TYPE_KBD) && (ARCH_IS_X86(dom->os.arch) || dom->os.arch == VIR_ARCH_NONE)) { def->bus = VIR_DOMAIN_INPUT_BUS_PS2; + } else if (ARCH_IS_S390(dom->os.arch)) { + def->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO; } else { def->bus = VIR_DOMAIN_INPUT_BUS_USB; } -- 2.18.1

4 6

[libvirt] Entering freeze for 6.0.0
by Daniel Veillard 13 Jan '20

13 Jan '20

I just tagged it RC1 in git, and pushed signed tarball and source rpm to the usual place: https://libvirt.org/sources/ Looks fine in my very limited testing, ci seems mostly green (though I sometimes wonder how reliable that is) so looks we should be fine, but please give it some testing ! If everything goes smoothly, goal is to make rc2 on Monday and then push the release on the 15th , in the meantime, please give it a try ! thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH 0/4] qemu: Don't lose domain on failed restore
by Michal Privoznik 13 Jan '20

13 Jan '20

https://bugzilla.redhat.com/show_bug.cgi?id=1718707 When restoring a domain we might leave a qemu process behind. The problem is described in 4/4 in more detail, but the digest is: we start qemu process successfully but then fail to restore its vCPUs and leave qemu process running and forget about. I thought of two possible ways to fix this: 1) Kill qemu process and claim error. 2) Don't kill qemu process and don't remove it from our internal list and claim error. I lean towards 1) because I find it clearer. If I were a mgmt app and call 'virsh restore /path/to/domain.save' then I'd much rather see either success or an error without any need for cleanup (which would be implied if we went with number 2). Michal Prívozník (4): qemuDomainSaveImageStartVM: Use VIR_AUTOCLOSE for @intermediatefd qemuDomainSaveImageStartVM: Use g_autoptr() for virCommand qemu: Use g_autoptr() for qemuDomainSaveCookie qemu: Stop domain on failed restore src/qemu/qemu_domain.c | 28 ++++++++++------------------ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 37 +++++++++++++++++-------------------- 3 files changed, 28 insertions(+), 38 deletions(-) -- 2.24.1

2 5

[libvirt] [PATCH 0/3] news: Fix and update for libvirt 6.0.0
by Andrea Bolognani 13 Jan '20

13 Jan '20

<blurb/> Andrea Bolognani (3): news: Fix typo (Libivrt -> Libvirt) news: Rearrange a few entries news: Update for libvirt 6.0.0 docs/news.xml | 111 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 87 insertions(+), 24 deletions(-) -- 2.24.1

3 10

[libvirt] [PATCH for 6.0.0] vircgroupv2devices: free BPF map when replacing with new one
by Pavel Hrdina 13 Jan '20

13 Jan '20

This leaks the FD of BPF map which means it will not be freed. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/vircgroupv2devices.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c index 402ce3f86f..445f9c53fc 100644 --- a/src/util/vircgroupv2devices.c +++ b/src/util/vircgroupv2devices.c @@ -311,6 +311,11 @@ virCgroupV2DevicesAttachProg(virCgroupPtr group, VIR_FORCE_CLOSE(group->unified.devices.progfd); } + if (group->unified.devices.mapfd > 0) { + VIR_DEBUG("Closing existing map that was replaced by new one."); + VIR_FORCE_CLOSE(group->unified.devices.mapfd); + } + group->unified.devices.progfd = progfd; group->unified.devices.mapfd = mapfd; group->unified.devices.max = max; -- 2.24.1

2 1

[libvirt] [PATCH] qemu_capabilities: Do not report USB as subsystem type if it is not available
by Thomas Huth 13 Jan '20

13 Jan '20

libvirt currently always reports that USB is available as a bus subsystem type when running "virsh domcapabilities". However, this is not always true, for example the qemu-system-s390x binary normally never has support for USB. Thus we should only report that USB is available if there is also a USB host controller available where we can attach USB devices. Reported-by: Sebastian Mitterle <smitterl(a)redhat.com> Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1759849 Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- src/qemu/qemu_capabilities.c | 13 ++++++++++++- tests/domaincapsdata/qemu_2.10.0.s390x.xml | 1 - tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 - tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 - tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 - tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 - tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 - tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 - tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 - tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 - 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index da0c7a257f..261cca19a7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5674,10 +5674,21 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_STARTUP_POLICY_OPTIONAL); VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType, - VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX4_USB_UHCI) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_EHCI) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_USB_EHCI1) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VT82C686B_USB_UHCI) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) { + VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType, + VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB); + } + /* No virDomainHostdevCapsType for QEMU */ virDomainCapsEnumClear(&hostdev->capsType); diff --git a/tests/domaincapsdata/qemu_2.10.0.s390x.xml b/tests/domaincapsdata/qemu_2.10.0.s390x.xml index bf3f13887f..b41ca5158c 100644 --- a/tests/domaincapsdata/qemu_2.10.0.s390x.xml +++ b/tests/domaincapsdata/qemu_2.10.0.s390x.xml @@ -168,7 +168,6 @@ <value>optional</value> </enum> <enum name='subsysType'> - <value>usb</value> <value>pci</value> <value>scsi</value> </enum> diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml b/tests/domaincapsdata/qemu_2.11.0.s390x.xml index 9b3b18d320..ad4e6b0500 100644 --- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml +++ b/tests/domaincapsdata/qemu_2.11.0.s390x.xml @@ -167,7 +167,6 @@ <value>optional</value> </enum> <enum name='subsysType'> - <value>usb</value> <value>pci</value> <value>scsi</value> </enum> diff --git a/tests/domaincapsdata/qemu_2.12.0.s390x.xml b/tests/domaincapsdata/qemu_2.12.0.s390x.xml index af7a04fb01..9736d6a42d 100644 --- a/tests/domaincapsdata/qemu_2.12.0.s390x.xml +++ b/tests/domaincapsdata/qemu_2.12.0.s390x.xml @@ -166,7 +166,6 @@ <value>optional</value> </enum> <enum name='subsysType'> - <value>usb</value> <value>pci</value> <value>scsi</value> </enum> diff --git a/tests/domaincapsdata/qemu_2.7.0.s390x.xml b/tests/domaincapsdata/qemu_2.7.0.s390x.xml index 258000dbaf..b19a4c9fed 100644 --- a/tests/domaincapsdata/qemu_2.7.0.s390x.xml +++ b/tests/domaincapsdata/qemu_2.7.0.s390x.xml @@ -71,7 +71,6 @@ <value>optional</value> </enum> <enum name='subsysType'> - <value>usb</value> <value>pci</value> <value>scsi</value> </enum> diff --git a/tests/domaincapsdata/qemu_2.8.0.s390x.xml b/tests/domaincapsdata/qemu_2.8.0.s390x.xml index cc858f538c..30d2f7ff1f 100644 --- a/tests/domaincapsdata/qemu_2.8.0.s390x.xml +++ b/tests/domaincapsdata/qemu_2.8.0.s390x.xml @@ -152,7 +152,6 @@ <value>optional</value> </enum> <enum name='subsysType'> - <value>usb</value> <value>pci</value> <value>scsi</value> </enum> diff --git a/tests/domaincapsdata/qemu_2.9.0.s390x.xml b/tests/domaincapsdata/qemu_2.9.0.s390x.xml index fe2c023956..2476e95181 100644 --- a/tests/domaincapsdata/qemu_2.9.0.s390x.xml +++ b/tests/domaincapsdata/qemu_2.9.0.s390x.xml @@ -153,7 +153,6 @@ <value>optional</value> </enum> <enum name='subsysType'> - <value>usb</value> <value>pci</value> <value>scsi</value> </enum> diff --git a/tests/domaincapsdata/qemu_3.0.0.s390x.xml b/tests/domaincapsdata/qemu_3.0.0.s390x.xml index 68bcafd62f..a297bf9ef1 100644 --- a/tests/domaincapsdata/qemu_3.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_3.0.0.s390x.xml @@ -173,7 +173,6 @@ <value>optional</value> </enum> <enum name='subsysType'> - <value>usb</value> <value>pci</value> <value>scsi</value> </enum> diff --git a/tests/domaincapsdata/qemu_4.0.0.s390x.xml b/tests/domaincapsdata/qemu_4.0.0.s390x.xml index 4298b148fd..21ddd27cb9 100644 --- a/tests/domaincapsdata/qemu_4.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.0.0.s390x.xml @@ -178,7 +178,6 @@ <value>optional</value> </enum> <enum name='subsysType'> - <value>usb</value> <value>pci</value> <value>scsi</value> </enum> diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index c6d92542c3..101d9d028b 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -172,7 +172,6 @@ <value>optional</value> </enum> <enum name='subsysType'> - <value>usb</value> <value>pci</value> <value>scsi</value> </enum> -- 2.18.1

2 2

[libvirt] [jenkins-ci PATCH] lcitool: Mark Fedora kernel packages as user-installed
by Andrea Bolognani 13 Jan '20

13 Jan '20

>From time to time we hit https://bugzilla.redhat.com/show_bug.cgi?id=1741381 which result in 'dnf autoremove' failing. The suggested workaround is to manually mark kernel packages as user-installed, so let's do that every single time just in case. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/update/tasks/base.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/guests/playbooks/update/tasks/base.yml b/guests/playbooks/update/tasks/base.yml index f085f19..97f365e 100644 --- a/guests/playbooks/update/tasks/base.yml +++ b/guests/playbooks/update/tasks/base.yml @@ -100,6 +100,13 @@ when: - package_format == 'pkg' +- name: Clean up packages after update + command: '{{ package_manager }} mark install "kernel*"' + args: + warn: no + when: + - os_name == 'Fedora' + - name: Clean up packages after update shell: '{{ package_manager }} clean packages -y && {{ package_manager }} autoremove -y' args: -- 2.24.1

3 3

[libvirt] [PATCH for 6.0.0] qemuxml2*test: Fix hugepages-default-system-size tests
by Jiri Denemark 13 Jan '20

13 Jan '20

Commit v5.10.0-269-g62065a6cb5 moved NUMA validation code to domain definition time and appropriately adjusted affected test cases except for hugepages-default-system-size. And since we don't mock virGetSystemPageSizeKB in our tests, hugepages-default-system-size test would fail on architectures (ppc64le) with default page size other than 4KiB. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8af2ba38d3..560a012149 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -946,7 +946,7 @@ mymain(void) QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); DO_TEST("hugepages-default", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-default-system-size", NONE); + DO_TEST("hugepages-default-system-size", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_PARSE_ERROR("hugepages-default-1G-nodeset-2M", NONE); DO_TEST("hugepages-nodeset", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_PARSE_ERROR("hugepages-nodeset-nonexist", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 262fc835f5..f7b6022819 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -293,7 +293,7 @@ mymain(void) DO_TEST("pages-dimm-discard", NONE); DO_TEST("hugepages-default", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-default-system-size", NONE); + DO_TEST("hugepages-default-system-size", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-nodeset", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-numa-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-numa-default-dimm", QEMU_CAPS_OBJECT_MEMORY_FILE); -- 2.24.1

2 1

[libvirt] [PATCH 0/4] Fix formatting of encrypted disk secret info (for 6.0.0)
by Peter Krempa 13 Jan '20

13 Jan '20

See the last patch for explanation. Peter Krempa (4): tests: qemuxml2argv: Add disk image with encrypted backing file tests: qemuxml2argv: Run luks-disks-source-qcow2 case with latest caps tests: qemuxml2xml: Enable luks-disks-source-qcow2 case conf: Always format storage source auth and encryption under <source> for backing files src/conf/backup_conf.c | 2 +- src/conf/domain_conf.c | 13 ++- src/conf/domain_conf.h | 1 + src/conf/snapshot_conf.c | 2 +- src/qemu/qemu_domain.c | 4 +- tests/qemublocktest.c | 2 +- .../luks-disks-source-qcow2.args | 8 ++ ...luks-disks-source-qcow2.x86_64-latest.args | 110 ++++++++++++++++++ .../luks-disks-source-qcow2.xml | 18 +++ tests/qemuxml2argvtest.c | 1 + .../luks-disks-source-qcow2.x86_64-latest.xml | 106 +++++++++++++++++ tests/qemuxml2xmltest.c | 1 + tests/virstoragetest.c | 2 +- 13 files changed, 259 insertions(+), 11 deletions(-) create mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args create mode 100644 tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml -- 2.24.1

2 6

[libvirt] [PATCH] Fix typo (cetificate -> certificate)
by Andrea Bolognani 13 Jan '20

13 Jan '20

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/manpages/virsh.rst | 2 +- include/libvirt/libvirt-domain.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 6446a903ca..c637caa583 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -3182,7 +3182,7 @@ Providing *--tls* causes the migration to use the host configured TLS setup the migration of the domain. Usage requires proper TLS setup for both source and target. Normally the TLS certificate from the destination host must match +the host's name for TLS verification to succeed. When the certificate does not -+match the destination hostname and the expected cetificate's hostname is ++match the destination hostname and the expected certificate's hostname is +known, *--tls-destination* can be used to pass the expected *hostname* when +starting the migration. diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index c1b9a9d1d0..1d76cdcc34 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1059,7 +1059,7 @@ typedef enum { * * Normally the TLS certificate from the destination host must match the host's * name for TLS verification to succeed. When the certificate does not match - * the destination hostname and the expected cetificate's hostname is known, + * the destination hostname and the expected certificate's hostname is known, * this parameter can be used to pass this expected hostname when starting * the migration. */ -- 2.24.1

1 0

[libvirt] [jenkins-ci PATCH] mappings: Refactor python3-devel mapping
by Andrea Bolognani 13 Jan '20

13 Jan '20

All RPM-based distributions except for CentOS 7 use the same name. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/vars/mappings.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 14bf2ff..9833856 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -864,8 +864,7 @@ mappings: python3-devel: deb: python3-dev pkg: python3 - Fedora: python3-devel - OpenSUSE: python3-devel + rpm: python3-devel CentOS7: python36-devel cross-policy-deb: foreign -- 2.24.1

2 1

[libvirt] Question about parallel migration connections
by Jim Fehlig 10 Jan '20

10 Jan '20

Are they supported with tunneled migration? The feature seems limited to native migration, in which case I can send a patch prohibiting parallel migration connections with the tunnel. Regards, Jim

3 5

[libvirt] Question / Bug: "IO mon_iothread" not affected by "<iothreadsched scheduler=.."
by gima+libvir-list＠iki.fi 10 Jan '20

10 Jan '20

# Question / Bug For "<iothreads>1</iothreads>", QEMU creates two threads by name of "IO mon_iothread"and "IO iothread1" Both are affected by "<iothreadpin iothread='1' cpuset='5'/>" (pinned to specified CPU), but only "IO iothread1" is affected by "<iothreadsched iothread='1' cpuset='5'/>". I believe this is to be a bug, whereas both threads should be affected, and be set to be ruled by the specified iothread scheduler. Am I correct and is this a bug, or am I missing something? # What does this matter / How does this manifest a problem? This manifests in case there is 1 iothread, and both iothread and emulator are pinned to the same cpu and set to use fifo or rr as their scheduler. In this configuration, QEMU does not start correctly and "stalls" until I change the scheduler of "IO mon_iothread" to rr or fifo (respectively).

2 1

[libvirt] [jenkins-ci PATCH 0/2] Add all possible projects to OpenSUSE 15.1
by Fabiano Fidêncio 10 Jan '20

10 Jan '20

Now that OpenSUSE 15.1 is a thing on libvirt-jenkins-ci, let's add all possible projects to the OS, doing the needed mappings adjustments whenever needed. Fabiano Fidêncio (2): guests: Add projects to OpenSUSE 15.1 mappings: Adjust mappings for OpenSUSE 15.1 guests/host_vars/libvirt-opensuse-151/main.yml | 13 +++++++++++++ guests/playbooks/build/projects/virt-manager.yml | 2 ++ guests/vars/mappings.yml | 13 +++++++++++++ 3 files changed, 28 insertions(+) -- 2.24.1

2 4

[libvirt] [jenkins-ci PATCH] mappings: Reorder some entries
by Andrea Bolognani 10 Jan '20

10 Jan '20

We've always strived to keep entries sorted in a way that reflects the order in which they're actually processed, with entries that have the same priority being sorted alphabetically, however a few mistakes have managed to sneak into the file over time. Fix them. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/vars/mappings.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 1d8d1e0..14bf2ff 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -348,8 +348,8 @@ mappings: libgovirt: rpm: libgovirt-devel - CentOS8: Debian: libgovirt-dev + CentOS8: cross-policy-deb: foreign libiscsi: @@ -370,9 +370,9 @@ mappings: libnuma: deb: libnuma-dev rpm: numactl-devel + OpenSUSE: libnuma-devel armv6l-deb: armv7l-deb: - OpenSUSE: libnuma-devel cross-policy-deb: foreign libparted: @@ -468,9 +468,9 @@ mappings: locales: deb: locales rpm: glibc-langpack-en - CentOS7: glibc-common FreeBSD: OpenSUSE: glibc-locale + CentOS7: glibc-common lsof: default: lsof @@ -849,8 +849,8 @@ mappings: python3-docutils: default: python3-docutils - CentOS7: python36-docutils FreeBSD: py37-docutils + CentOS7: python36-docutils python3: default: python3 @@ -930,8 +930,8 @@ mappings: rpcgen: deb: libc-dev-bin rpm: rpcgen - CentOS7: glibc-common FreeBSD: + CentOS7: glibc-common rpmbuild: rpm: rpm-build @@ -975,8 +975,8 @@ mappings: tc: deb: iproute2 rpm: iproute-tc - CentOS7: iproute OpenSUSE: iproute2 + CentOS7: iproute unzip: default: unzip @@ -1005,9 +1005,9 @@ mappings: xen: rpm: xen-devel CentOS: - x86_64-deb: libxen-dev - armv7l-deb: libxen-dev aarch64-deb: libxen-dev + armv7l-deb: libxen-dev + x86_64-deb: libxen-dev cross-policy-deb: foreign xfsprogs: -- 2.24.1

1 0

[libvirt] Call for Google Summer of Code 2020 project ideas
by Michal Privoznik 10 Jan '20

10 Jan '20

Dear list, GSoC 2020 has been announced and I plan to apply again [1]. Please, update the list of ideas [2] for students to work on. If you have an idea but don't feel like mentoring, that is okay too, just put it onto the wiki and I will find a mentor myself. Thanks, Michal 1: https://summerofcode.withgoogle.com/ 2: https://wiki.libvirt.org/page/Google_Summer_of_Code_Ideas

1 0

[libvirt] [PATCH v2 0/5] introduce support for CPU dies in host/guest topology
by Daniel P. Berrangé 10 Jan '20

10 Jan '20

Latest generation CPUs (CascadeLake-AP) support a new topology level known as a 'die', sitting between a socket and a core. QEMU supports this with -smp arg since 4.1.0 Linux can report this via /sys/devices/system/cpu/cpuNNN/topology via 'die_id' and 'die_cpus' and 'die_cpus_list' files since 5.2 This series adds support for <topology> in guest XML to have a new 'dies' parameter, passed to QEMU, which defaults to '1' if omitted. It extends host capabilities so that NUMA topology reports a new 'die_id' attribute We can't expand 'virNodeInfoPtr' struct to have a die field, so this will remain forever reporting 'cores' as being 'dies * cores'. The <topology> in host capabilities XML is an interesting question. If we are strict with our API semantics we would *not* add a 'dies' parameter with any value other than '1' to <topology> in the host capabilities. If we reported a value other than 1, then any existing apps which multiple sockets*cores*threads will get the wrong total CPU count. We already know <topology> is broken by design for asymetric hardware, so we could simply document that it will forever be broken wrt to CPU dies too. In this case we might be better to not even report 'dies=1', just leave out the attr entirely. Interestingly though, <topology> is already more broken than it should be. For a VM with -smp 12,sockets=2,dies=3,cores=2,threads=1 it is reporting <topology sockets=1 dies=1 cores=12 threads=1>. It should at least do <topology sockets=2 dies=1 cores=6 threads=1>. I suspect the presence of dies is confusing the really incredibly horrible logic in virHostCPUGetInfoLinux. This will also impact virNodeInfoPtr data. So even if we don't report dies, I think we still have a bug that needs fixing here for the coarse node topology. I'm also confused about what I see with EPYC. IIUC, it was supposed to use the 'dies' concept, but in machines I've tested, Linux never reports die count other than 1. Perhaps only certain EPYC CPU models or generations use 'dies', or perhaps Linux isn't reporting correctly for EPYC, or perhaps I'm mislead into believeing it uses dies. Anyway, the upshot is I've not found any real hardware to test this series on. I've tested it only inside a QEMU guest with the suitable -smp arg to fake dies. Changed in v2: - Fixed docs for dies attribute - Improve error checking when parsing - Misc typos Daniel P. Berrangé (5): conf: add support for specifying CPU "dies" parameter conf: remove unused virCapabilitiesSetHostCPU method qemu: add support for specifying CPU "dies" topology parameter hostcpu: add support for reporting die_id in NUMA topology tests: add host CPU data files for validating die_id docs/formatcaps.html.in | 2 +- docs/formatdomain.html.in | 22 +- docs/schemas/capability.rng | 3 + docs/schemas/cputypes.rng | 5 + src/bhyve/bhyve_command.c | 5 + src/conf/capabilities.c | 26 +- src/conf/capabilities.h | 7 +- src/conf/cpu_conf.c | 23 +- src/conf/cpu_conf.h | 1 + src/conf/domain_conf.c | 3 +- src/cpu/cpu.c | 1 + src/libvirt_linux.syms | 1 + src/libvirt_private.syms | 1 - src/libxl/libxl_capabilities.c | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 12 +- src/util/virhostcpu.c | 16 + src/util/virhostcpu.h | 1 + src/vmx/vmx.c | 7 + .../x86_64-host+guest,model486-result.xml | 2 +- .../x86_64-host+guest,models-result.xml | 2 +- .../cputestdata/x86_64-host+guest-result.xml | 2 +- tests/cputestdata/x86_64-host+guest.xml | 2 +- .../x86_64-host+host-model-nofallback.xml | 2 +- ...t-Haswell-noTSX+Haswell,haswell-result.xml | 2 +- ...ell-noTSX+Haswell-noTSX,haswell-result.xml | 2 +- ...ost-Haswell-noTSX+Haswell-noTSX-result.xml | 2 +- .../x86_64-host-worse+guest-result.xml | 2 +- .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../ppc64-modern-bulk-result-conf.xml | 2 +- .../ppc64-modern-bulk-result-live.xml | 2 +- .../ppc64-modern-individual-result-conf.xml | 2 +- .../ppc64-modern-individual-result-live.xml | 2 +- .../x86-modern-bulk-result-conf.xml | 2 +- .../x86-modern-bulk-result-live.xml | 2 +- .../x86-modern-individual-add-result-conf.xml | 2 +- .../x86-modern-individual-add-result-live.xml | 2 +- .../x86-old-bulk-result-conf.xml | 2 +- .../x86-old-bulk-result-live.xml | 2 +- .../cpu-hotplug-granularity.xml | 2 +- .../qemuxml2argvdata/cpu-hotplug-startup.xml | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.xml | 2 +- .../qemuxml2argvdata/cpu-numa-disordered.xml | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.xml | 2 +- .../cpu-numa-no-memory-element.xml | 2 +- tests/qemuxml2argvdata/cpu-numa1.xml | 2 +- tests/qemuxml2argvdata/cpu-numa2.xml | 2 +- tests/qemuxml2argvdata/cpu-numa3.xml | 2 +- tests/qemuxml2argvdata/cpu-topology1.xml | 2 +- tests/qemuxml2argvdata/cpu-topology2.xml | 2 +- tests/qemuxml2argvdata/cpu-topology3.xml | 2 +- .../fd-memory-no-numa-topology.xml | 2 +- .../fd-memory-numa-topology.xml | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.xml | 2 +- .../graphics-spice-timeout.xml | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.xml | 2 +- ...memory-default-hugepage.x86_64-latest.args | 2 +- .../memfd-memory-default-hugepage.xml | 2 +- .../memfd-memory-numa.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +- tests/qemuxml2argvdata/memory-align-fail.xml | 2 +- .../memory-hotplug-dimm-addr.xml | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm.xml | 2 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-access.xml | 2 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-align.xml | 2 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-label.xml | 2 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-pmem.xml | 2 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-readonly.xml | 2 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm.xml | 2 +- tests/qemuxml2argvdata/memory-hotplug.xml | 2 +- .../numad-auto-memory-vcpu-cpuset.xml | 2 +- ...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +- .../numad-auto-vcpu-no-numatune.xml | 2 +- ...d-auto-vcpu-static-numatune-no-nodeset.xml | 2 +- .../numad-auto-vcpu-static-numatune.xml | 2 +- .../numad-static-memory-auto-vcpu.xml | 2 +- .../numad-static-vcpu-no-numatune.xml | 2 +- tests/qemuxml2argvdata/numad.xml | 2 +- .../numatune-auto-nodeset-invalid.xml | 2 +- .../numatune-memory-invalid-nodeset.xml | 2 +- tests/qemuxml2argvdata/numatune-memory.xml | 2 +- .../pci-expander-bus-bad-machine.xml | 2 +- tests/qemuxml2argvdata/pci-expander-bus.xml | 2 +- .../pcie-expander-bus-bad-bus.xml | 2 +- .../pcie-expander-bus-bad-machine.xml | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.xml | 2 +- .../pseries-default-phb-numa-node.xml | 2 +- .../pseries-phb-numa-node.xml | 2 +- tests/qemuxml2argvdata/smp-dies.args | 29 ++ tests/qemuxml2argvdata/smp-dies.xml | 33 ++ tests/qemuxml2argvdata/smp.xml | 2 +- tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmloutdata/cpu-numa-disjoint.xml | 2 +- .../cpu-numa-disordered.xml | 2 +- .../qemuxml2xmloutdata/cpu-numa-memshared.xml | 2 +- .../cpu-numa-no-memory-element.xml | 2 +- tests/qemuxml2xmloutdata/cpu-numa1.xml | 2 +- tests/qemuxml2xmloutdata/cpu-numa2.xml | 2 +- .../graphics-spice-timeout.xml | 2 +- .../memory-hotplug-dimm.xml | 2 +- tests/qemuxml2xmloutdata/memory-hotplug.xml | 2 +- .../numad-auto-memory-vcpu-cpuset.xml | 2 +- ...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +- .../numad-auto-vcpu-no-numatune.xml | 2 +- .../numad-static-vcpu-no-numatune.xml | 2 +- tests/qemuxml2xmloutdata/pci-expander-bus.xml | 2 +- .../qemuxml2xmloutdata/pcie-expander-bus.xml | 2 +- .../pseries-phb-numa-node.xml | 2 +- tests/qemuxml2xmloutdata/smp.xml | 2 +- .../linux-basic-dies/system/cpu | 1 + .../linux-basic-dies/system/node | 1 + .../vircaps2xmldata/vircaps-aarch64-basic.xml | 32 +- .../vircaps-x86_64-basic-dies.xml | 35 ++ .../vircaps2xmldata/vircaps-x86_64-basic.xml | 32 +- .../vircaps2xmldata/vircaps-x86_64-caches.xml | 16 +- .../vircaps-x86_64-resctrl-cdp.xml | 24 +- .../vircaps-x86_64-resctrl-cmt.xml | 24 +- .../vircaps-x86_64-resctrl-fake-feature.xml | 24 +- .../vircaps-x86_64-resctrl-skx-twocaches.xml | 2 +- .../vircaps-x86_64-resctrl-skx.xml | 2 +- .../vircaps-x86_64-resctrl.xml | 24 +- tests/vircaps2xmltest.c | 1 + .../cpu/cpu0/topology/core_cpus | 1 + .../cpu/cpu0/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/core_siblings | 1 + .../cpu/cpu0/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu0/topology/die_cpus | 1 + .../cpu/cpu0/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu0/topology/die_id | 1 + .../cpu/cpu0/topology/package_cpus | 1 + .../cpu/cpu0/topology/package_cpus_list | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu1/online | 1 + .../cpu/cpu1/topology/core_cpus | 1 + .../cpu/cpu1/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/core_siblings | 1 + .../cpu/cpu1/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu1/topology/die_cpus | 1 + .../cpu/cpu1/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu1/topology/die_id | 1 + .../cpu/cpu1/topology/package_cpus | 1 + .../cpu/cpu1/topology/package_cpus_list | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu10/online | 1 + .../cpu/cpu10/topology/core_cpus | 1 + .../cpu/cpu10/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu10/topology/core_id | 1 + .../cpu/cpu10/topology/core_siblings | 1 + .../cpu/cpu10/topology/core_siblings_list | 1 + .../cpu/cpu10/topology/die_cpus | 1 + .../cpu/cpu10/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu10/topology/die_id | 1 + .../cpu/cpu10/topology/package_cpus | 1 + .../cpu/cpu10/topology/package_cpus_list | 1 + .../cpu/cpu10/topology/physical_package_id | 1 + .../cpu/cpu10/topology/thread_siblings | 1 + .../cpu/cpu10/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu11/online | 1 + .../cpu/cpu11/topology/core_cpus | 1 + .../cpu/cpu11/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu11/topology/core_id | 1 + .../cpu/cpu11/topology/core_siblings | 1 + .../cpu/cpu11/topology/core_siblings_list | 1 + .../cpu/cpu11/topology/die_cpus | 1 + .../cpu/cpu11/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu11/topology/die_id | 1 + .../cpu/cpu11/topology/package_cpus | 1 + .../cpu/cpu11/topology/package_cpus_list | 1 + .../cpu/cpu11/topology/physical_package_id | 1 + .../cpu/cpu11/topology/thread_siblings | 1 + .../cpu/cpu11/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu2/online | 1 + .../cpu/cpu2/topology/core_cpus | 1 + .../cpu/cpu2/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/core_siblings | 1 + .../cpu/cpu2/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu2/topology/die_cpus | 1 + .../cpu/cpu2/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu2/topology/die_id | 1 + .../cpu/cpu2/topology/package_cpus | 1 + .../cpu/cpu2/topology/package_cpus_list | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu3/online | 1 + .../cpu/cpu3/topology/core_cpus | 1 + .../cpu/cpu3/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/core_siblings | 1 + .../cpu/cpu3/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu3/topology/die_cpus | 1 + .../cpu/cpu3/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu3/topology/die_id | 1 + .../cpu/cpu3/topology/package_cpus | 1 + .../cpu/cpu3/topology/package_cpus_list | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu4/online | 1 + .../cpu/cpu4/topology/core_cpus | 1 + .../cpu/cpu4/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/core_siblings | 1 + .../cpu/cpu4/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu4/topology/die_cpus | 1 + .../cpu/cpu4/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu4/topology/die_id | 1 + .../cpu/cpu4/topology/package_cpus | 1 + .../cpu/cpu4/topology/package_cpus_list | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../cpu/cpu4/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu5/online | 1 + .../cpu/cpu5/topology/core_cpus | 1 + .../cpu/cpu5/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/core_siblings | 1 + .../cpu/cpu5/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu5/topology/die_cpus | 1 + .../cpu/cpu5/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu5/topology/die_id | 1 + .../cpu/cpu5/topology/package_cpus | 1 + .../cpu/cpu5/topology/package_cpus_list | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings | 1 + .../cpu/cpu5/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu6/online | 1 + .../cpu/cpu6/topology/core_cpus | 1 + .../cpu/cpu6/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/core_siblings | 1 + .../cpu/cpu6/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu6/topology/die_cpus | 1 + .../cpu/cpu6/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu6/topology/die_id | 1 + .../cpu/cpu6/topology/package_cpus | 1 + .../cpu/cpu6/topology/package_cpus_list | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../cpu/cpu6/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu7/online | 1 + .../cpu/cpu7/topology/core_cpus | 1 + .../cpu/cpu7/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/core_siblings | 1 + .../cpu/cpu7/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu7/topology/die_cpus | 1 + .../cpu/cpu7/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu7/topology/die_id | 1 + .../cpu/cpu7/topology/package_cpus | 1 + .../cpu/cpu7/topology/package_cpus_list | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings | 1 + .../cpu/cpu7/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu8/online | 1 + .../cpu/cpu8/topology/core_cpus | 1 + .../cpu/cpu8/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu8/topology/core_id | 1 + .../cpu/cpu8/topology/core_siblings | 1 + .../cpu/cpu8/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu8/topology/die_cpus | 1 + .../cpu/cpu8/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu8/topology/die_id | 1 + .../cpu/cpu8/topology/package_cpus | 1 + .../cpu/cpu8/topology/package_cpus_list | 1 + .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu9/online | 1 + .../cpu/cpu9/topology/core_cpus | 1 + .../cpu/cpu9/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu9/topology/core_id | 1 + .../cpu/cpu9/topology/core_siblings | 1 + .../cpu/cpu9/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu9/topology/die_cpus | 1 + .../cpu/cpu9/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu9/topology/die_id | 1 + .../cpu/cpu9/topology/package_cpus | 1 + .../cpu/cpu9/topology/package_cpus_list | 1 + .../cpu/cpu9/topology/physical_package_id | 1 + .../cpu/cpu9/topology/thread_siblings | 1 + .../cpu/cpu9/topology/thread_siblings_list | 1 + .../virhostcpudata/linux-with-die/cpu/online | 1 + .../virhostcpudata/linux-with-die/cpu/present | 1 + .../linux-with-die/node/node0/cpu0 | 1 + .../linux-with-die/node/node0/cpu1 | 1 + .../linux-with-die/node/node0/cpu10 | 1 + .../linux-with-die/node/node0/cpu11 | 1 + .../linux-with-die/node/node0/cpu2 | 1 + .../linux-with-die/node/node0/cpu3 | 1 + .../linux-with-die/node/node0/cpu4 | 1 + .../linux-with-die/node/node0/cpu5 | 1 + .../linux-with-die/node/node0/cpu6 | 1 + .../linux-with-die/node/node0/cpu7 | 1 + .../linux-with-die/node/node0/cpu8 | 1 + .../linux-with-die/node/node0/cpu9 | 1 + .../linux-with-die/node/node0/cpulist | 1 + .../virhostcpudata/linux-with-die/node/online | 1 + .../linux-with-die/node/possible | 1 + .../linux-x86_64-with-die.cpuinfo | 323 ++++++++++++++++++ .../linux-x86_64-with-die.expected | 1 + tests/virhostcputest.c | 1 + .../vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 2 +- .../vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml | 2 +- 324 files changed, 896 insertions(+), 231 deletions(-) create mode 100644 tests/qemuxml2argvdata/smp-dies.args create mode 100644 tests/qemuxml2argvdata/smp-dies.xml create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/cpu create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/node create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/present create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu0 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu1 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu10 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu11 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu2 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu3 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu4 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu5 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu6 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu7 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu8 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu9 create mode 100644 tests/virhostcpudata/linux-with-die/node/node0/cpulist create mode 100644 tests/virhostcpudata/linux-with-die/node/online create mode 100644 tests/virhostcpudata/linux-with-die/node/possible create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.cpuinfo create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.expected -- 2.23.0

2 7

[libvirt] [dockerfiles PATCH] Refresh after dropping librbd from Debian sid on mipsel
by Andrea Bolognani 10 Jan '20

10 Jan '20

The corresponding libvirt-jenkins-ci commit is d08ad842e12d. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 1016 -> 1013 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/buildenv-libvirt-debian-sid-cross-mipsel.zip b/buildenv-libvirt-debian-sid-cross-mipsel.zip index 19594f2..815772b 100644 --- a/buildenv-libvirt-debian-sid-cross-mipsel.zip +++ b/buildenv-libvirt-debian-sid-cross-mipsel.zip @@ -89,7 +89,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libparted-dev:mipsel \ libpcap0.8-dev:mipsel \ libpciaccess-dev:mipsel \ - librbd-dev:mipsel \ libreadline-dev:mipsel \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ -- 2.24.1

1 0

[libvirt] [jenkins-ci PATCH 0/2] Fixes necessary for buildenv-libvirt-debian-sid-cross-mipsel
by Andrea Bolognani 10 Jan '20

10 Jan '20

The latest container build failed; this series addresses the underlying issue. Andrea Bolognani (2): mappings: Refactor librbd mapping mappings: Remove librbd from Debian on mipsel going forward guests/vars/mappings.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.24.1

2 6

[libvirt] [PATCH] docs: add pages to support Go module package resolution
by Daniel P. Berrangé 10 Jan '20

10 Jan '20

Currently the libvirt Go modules are accessed by applications using their github repository URLs. This is undesirable as we don't want applications to have a direct dependancy on a specific source repo location. We want to enable applications to use the Go packages via the libvirt.org namespace. When you do "go get libvirt.org/libvirt-go", the Go client will do an HTTPS request to that URL, and parse the HTML content to look for a <meta> tag which tells it where to the find the GIT repository. https://golang.org/cmd/go/#hdr-Remote_import_paths This adds two pages to support this Go module resolution. They are not linked from anywhere as we don't expect users to actually look at them. If someone does happen upon them, there's some boilerplate text to send them off to godoc.org for API documentation. Since the pages we're adding have a .html extension, we will also use a small apache config tweak on the server RewriteEngine on RewriteRule ^/libvirt-go$ /libvirt-go.html [L] RewriteRule ^/libvirt-go-xml$ /libvirt-go-xml.html [L] Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/libvirt-go-xml.rst | 10 ++++++++++ docs/libvirt-go.rst | 13 +++++++++++++ docs/page.xsl | 6 ++++++ 3 files changed, 29 insertions(+) create mode 100644 docs/libvirt-go-xml.rst create mode 100644 docs/libvirt-go.rst diff --git a/docs/libvirt-go-xml.rst b/docs/libvirt-go-xml.rst new file mode 100644 index 0000000000..ee3b878068 --- /dev/null +++ b/docs/libvirt-go-xml.rst @@ -0,0 +1,10 @@ +========================== +Libvirt Go XML parsing API +========================== + +The `Go <https://golang.org/>`__ package ``libvirt.org/libvirt-go-xml`` provides +annotated Go struct definitions for parsing (and formatting) XML documents used +with libvirt APIs. + +For details of Go specific behaviour consult the +`Go package documentation <https://godoc.org/libvirt.org/libvirt-go-xml>`__ diff --git a/docs/libvirt-go.rst b/docs/libvirt-go.rst new file mode 100644 index 0000000000..6ec5c0c123 --- /dev/null +++ b/docs/libvirt-go.rst @@ -0,0 +1,13 @@ +======================= +Libvirt Go Language API +======================= + +The `Go <https://golang.org/>`__ package ``libvirt.org/libvirt-go`` provides +`CGo <https://golang.org/cmd/cgo/>`__ binding from the OS native Libvirt API. + +In general the Go representation is a direct 1-1 mapping from native API +concepts to Go, so the native API documentation should serve as a reference +for most behaviour. + +For details of Go specific behaviour consult the +`Go package documentation <https://godoc.org/libvirt.org/libvirt-go>`__ diff --git a/docs/page.xsl b/docs/page.xsl index f8f7ff8cf9..ddae5ab508 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -99,6 +99,12 @@ <meta name="theme-color" content="#ffffff"/> <title>libvirt: <xsl:value-of select="html:html/html:body//html:h1"/></title> <meta name="description" content="libvirt, virtualization, virtualization API"/> + <xsl:if test="$pagename = 'libvirt-go.html'"> + <meta name="go-import" content="libvirt.org/libvirt-go git https://libvirt.org/git/libvirt-go.git"/> + </xsl:if> + <xsl:if test="$pagename = 'libvirt-go-xml.html'"> + <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://libvirt.org/git/libvirt-go-xml.git"/> + </xsl:if> <xsl:apply-templates select="/html:html/html:head/html:script" mode="content"/> <script type="text/javascript" src="{$href_base}js/main.js"> -- 2.23.0

2 3

[libvirt] [PATCH 0/2] Improve error message for missing backing image format
by Peter Krempa 10 Jan '20

10 Jan '20

Improve the error message and mention it in the news. Peter Krempa (2): util: storage: Link to knowledge base when reporting missing image backing format news: Mention problems with backing image format probing docs/news.xml | 13 +++++++++++++ src/util/virstoragefile.c | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) -- 2.24.1

2 4

[libvirt] [PATCH v3 0/5] introduce support for an embedded driver mode
by Daniel P. Berrangé 10 Jan '20

10 Jan '20

This is a followup to: https://www.redhat.com/archives/libvir-list/2019-May/msg00467.html https://www.redhat.com/archives/libvir-list/2019-December/msg00050.html This series implements support for an embedded driver mode for libvirt, with initial support in the QEMU and secrets drivers. In this mode of operation, the driver stores all its config and state under a private directory tree. See the individual patches for the illustrated directory hierarchy used. The intent of this embedded mode is to suit cases where the application is using virtualization as a building block for some functionality, as opposed to running traditional "full OS" builds. The long time posterchild example would be libguestfs, while a more recent example could be Kata containers. The general principal in enabling this embedded mode is that the functionality available should be identical to that seen when the driver is running inside libvirtd. This is achieved by loading the exact same driver .so module as libvirtd would load, and simply configuring it with a different directory layout. The result of this is that when running in embedded mode, the driver can still talk to other secondary drivers running inside libvirtd if desired. This is useful, for example, to connect a VM to the default virtual network. The secondary drivers can be made to operate in embedded mode as well, however, this will require some careful consideration for each driver to ensure they don't clash with each other. Thus in this series only the secret driver is enabled for embedded mode. This is required to enable use of VMs with encrypted disks, or authenticated network block storage. In this series we introduce a new command line tool 'virt-qemu-run' which is a really simple tool for launching a VM in embedded mode. I'm not entirely sure whether we should provide this as an official supported tool in this way, or merely put it into the 'examples' directory as demo-ware. With testing of the virt-qemu-run tool we can immediately see what the next important thing to tackle is: performance. We have not really cared too much about the startup performance of libvirtd as this is a one time cost when the mgmt application connects. We did none the less cache capabilities because probing caps for 30 QEMU binaries takes a long time. Even with this caching it takes an unacceptably long time to start a VM in embedded mode. About 100 ms to open the embedded QEMU driver, assuming pre-cached capabilies - ~2 seconds if not cached and all 30 QEMU targets are present. Then about 300 ms to actually start the QEMU guest. IOW, about 400 ms to get QEMU running. NB this is measuring time from launching the virt-run-qemu program, to the point at which the API call 'virDomainCreate' returns control. This has both libvirt & QEMU overhead in & I don't have clear figures to distinguish, but I can see a 40 ms delay between issuing the 'qmp_capabilities' call and getting a reply, which is QEMU startup overead. This is a i440fx based QEMU with a general purpose virtio-pci config (disk, net, etc) tyupical for running a full OS. I've not tried any kind of optimized QEMU config with microvm. I've already started on measuring & optimizing & identified several key areas that can be addressed, but it is all ultimately about not doing work before we need the answers from that work (which often means we will never do the work at all). For example, we shouldn't probe all 30 QEMU's upfront. If the app is only going to create an x86_64 KVM guest we should only care about that 1 QEMU. This is painful because parsing any guest XML requires a virCapsPtr which in turn causes probing of every QEMU binary. I've got in progress patches to eliminate virCapsPtr almost entirely and work directly with the virQEMUCapsPtr instead. It is possible we'll want to use a different file format for storing the cached QEMU capabilities, and the CPU feature/model info. Parsing this XML is a non-negligible time sink. A binary format is likely way quicker, especially if its designed to be just mmap'able for direct read. To be investigated... We shouldn't probe for whether host PM suspend is possible unless someone wants that info, or tries to issue that API call. After starting QEMU we spend 150-200 ms issuing a massive number of qom-get calls to check whether QEMU enabled each individual CPU feature flag. We only need this info if someone asks for the live XML or we intend to live migrate etc. So we shouldn't issue these qom-get calls in the "hot path" of QEMU startup. It can be done later in a non-time critical point. Also the QEMU API for this is horribly inefficient to require so many qom-get calls. There's more but I won't talk about it now. Suffice to say that I think we can get libvirt overhead down to less than 100 ms fairly easily and probably even down to less than 50 ms without much effort. The exact figure will depend on what libvirt features you want enabled, and how much work we want/need to put into optimization. We'll want to fix the really gross mistakes & slow downs, but we'll want guidance from likely users as to their VM startup targets to decide how much work needs investing. This optimization will ultimately help non-embedded QEMU mode too, making it faster to respond & start. Changed in v3: - Rebased to master - Merge some simple acked patches Changed in v2: - Use a simplified directory layout for embedded mode. Previously we just put a dir prefix onto the normal paths. This has the downside that the embedded drivers paths are needlessly different for privileged vs unprivileged user. It also results in very long paths which can be a problem for the UNIX socket name length limits. - Also ported the secret driver to support embedded mode - Check to validate that the event loop is registered. - Add virt-qemu-run tool for embedded usage. - Added docs for the qemu & secret driver explaining embedded mode Daniel P. Berrangé (5): libvirt: pass a directory path into drivers for embedded usage libvirt: support an "embed" URI path selector for opening drivers qemu: add support for running QEMU driver in embedded mode secrets: add support for running secret driver in embedded mode qemu: introduce a new "virt-qemu-run" program build-aux/syntax-check.mk | 2 +- docs/Makefile.am | 5 + docs/drivers.html.in | 1 + docs/drvqemu.html.in | 84 +++++++ docs/drvsecret.html.in | 82 ++++++ docs/manpages/index.rst | 1 + docs/manpages/virt-qemu-run.rst | 114 +++++++++ libvirt.spec.in | 2 + src/Makefile.am | 1 + src/driver-state.h | 2 + src/driver.h | 2 + src/interface/interface_backend_netcf.c | 7 + src/interface/interface_backend_udev.c | 7 + src/libvirt.c | 93 ++++++- src/libvirt_internal.h | 4 +- src/libxl/libxl_driver.c | 7 + src/lxc/lxc_driver.c | 8 + src/network/bridge_driver.c | 7 + src/node_device/node_device_hal.c | 7 + src/node_device/node_device_udev.c | 7 + src/nwfilter/nwfilter_driver.c | 7 + src/qemu/Makefile.inc.am | 13 + src/qemu/qemu_conf.c | 38 ++- src/qemu/qemu_conf.h | 6 +- src/qemu/qemu_driver.c | 21 +- src/qemu/qemu_process.c | 15 +- src/qemu/qemu_shim.c | 322 ++++++++++++++++++++++++ src/remote/remote_daemon.c | 1 + src/remote/remote_driver.c | 1 + src/secret/secret_driver.c | 41 ++- src/storage/storage_driver.c | 7 + src/vz/vz_driver.c | 7 + tests/domaincapstest.c | 2 +- tests/testutilsqemu.c | 3 +- 34 files changed, 901 insertions(+), 26 deletions(-) create mode 100644 docs/drvsecret.html.in create mode 100644 docs/manpages/virt-qemu-run.rst create mode 100644 src/qemu/qemu_shim.c -- 2.23.0

2 9

[libvirt] [PATCH v3 0/3] Mark and document restore with managed save as risky
by Michael Weiser 10 Jan '20

10 Jan '20

This series marks restore of an inactive qemu snapshot while there is managed saved state as risky due to the reasons explained in patch 1 and 3. Patch 2 is a simple reformatting of the documentation with no other changes in preparation of addition of more reasons why reverts might need to be forced. Changes from v2: - fix manpage typo exising -> existing - change manpage qemu hypervisor name case to QEMU Changes from v1: - reword error message to "error: revert requires force: snapshot without memory state, removal of existing managed saved state strongly recommended to avoid corruption" - add documentation of the new behaviour Michael Weiser (3): qemu: Warn of restore with managed save being risky docs: Reformat snapshot-revert force reasons docs: Add snapshot-revert qemu managedsave force docs/manpages/virsh.rst | 39 ++++++++++++++++++++++++--------------- src/qemu/qemu_driver.c | 9 +++++++++ 2 files changed, 33 insertions(+), 15 deletions(-) -- 2.24.1

3 6

[libvirt] [PATCH] tests: avoid re-execing test once for each mock
by Daniel P. Berrangé 10 Jan '20

10 Jan '20

When debugging tests under GDB there is a significant time delay each time an execve is done as GDB scans shared libraries once again. For tests which use many mock libraries, we have been invoking execve many times which makes the GDB experience horrible. This changes our framework to activate the full set of mock libraries in one single execve. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/qemucapsprobe.c | 8 +++++++- tests/testutils.c | 29 ++++++++++++++++++++++++----- tests/testutils.h | 10 +++------- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 6837f2a0f6..c7e8f3309d 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -46,8 +46,14 @@ main(int argc, char **argv) { virThread thread; virQEMUCapsPtr caps; + const char *mock = VIR_TEST_MOCK("qemucapsprobe"); - VIR_TEST_PRELOAD(VIR_TEST_MOCK("qemucapsprobe")); + if (!virFileIsExecutable(mock)) { + perror(mock); + return EXIT_FAILURE; + } + + VIR_TEST_PRELOAD(mock); if (argc != 2) { fprintf(stderr, "%s QEMU_binary\n", argv[0]); diff --git a/tests/testutils.c b/tests/testutils.c index 6f0ef2b2f1..b490609e36 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -856,15 +856,34 @@ int virTestMain(int argc, virLogOutputPtr *outputs = NULL; g_autofree char *baseprogname = NULL; const char *progname; - - if (getenv("VIR_TEST_FILE_ACCESS")) - VIR_TEST_PRELOAD(VIR_TEST_MOCK("virtest")); + g_autofree const char **preloads = NULL; + size_t npreloads = 0; + g_autofree char *mock = NULL; + + if (getenv("VIR_TEST_FILE_ACCESS")) { + preloads = g_renew(const char *, preloads, npreloads + 2); + preloads[npreloads++] = VIR_TEST_MOCK("virtest"); + preloads[npreloads] = NULL; + } va_start(ap, func); - while ((lib = va_arg(ap, const char *))) - VIR_TEST_PRELOAD(lib); + while ((lib = va_arg(ap, const char *))) { + if (!virFileIsExecutable(lib)) { + perror(lib); + return EXIT_FAILURE; + } + + preloads = g_renew(const char *, preloads, npreloads + 2); + preloads[npreloads++] = lib; + preloads[npreloads] = NULL; + } va_end(ap); + if (preloads) { + mock = g_strjoinv(":", (char **)preloads); + VIR_TEST_PRELOAD(mock); + } + progname = baseprogname = g_path_get_basename(argv[0]); if (STRPREFIX(progname, "lt-")) progname += 3; diff --git a/tests/testutils.h b/tests/testutils.h index 8a7ea38f43..2944c25e8b 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -127,19 +127,15 @@ int virTestMain(int argc, # define MOCK_EXT ".so" #endif -#define VIR_TEST_PRELOAD(lib) \ +#define VIR_TEST_PRELOAD(libs) \ do { \ const char *preload = getenv(PRELOAD_VAR); \ if (preload == NULL || strstr(preload, lib) == NULL) { \ char *newenv; \ - if (!virFileIsExecutable(lib)) { \ - perror(lib); \ - return EXIT_FAILURE; \ - } \ if (!preload) { \ - newenv = (char *) lib; \ + newenv = (char *) libs; \ } else { \ - newenv = g_strdup_printf("%s:%s", lib, preload); \ + newenv = g_strdup_printf("%s:%s", libs, preload); \ } \ g_setenv(PRELOAD_VAR, newenv, TRUE); \ FORCE_FLAT_NAMESPACE \ -- 2.24.1

2 1

[libvirt] [PATCH 00/19] qemu: Add support for backups in combination with snapshots
by Peter Krempa 10 Jan '20

10 Jan '20

IMPORTANT: This does NOT add support for merging the bitmaps during block jobs, so manual deletion of snapshots will corrupt the incremental metadata!. Allow combining snapshots and backups. During a snapshot we create a bitmap for any active persistent bitmap to continue tracking the bitmaps properly (as qemu doesn't support creating a dirty bitmap from the allocation map). This also means that it works only for an active VM since there also isn't a way to do it via qemu-img. Thus a workaround is to start a VM as paused if this is required for offline VMs. We also now can merge bitmaps accross the backing chains. You can fetch the changes at: git fetch https://gitlab.com/pipo.sk/libvirt.git backup-snapshots Peter Krempa (19): virsh: Add QMP command wrapping for 'qemu-monitor-command' virsh: Allow extracting 'return' section of QMP command in 'qemu-monitor-command' qemu: monitor: Extract data about dirty-bimaps in qemuMonitorBlockGetNamedNodeData qemu: monitor: Extract internals of qemuMonitorJSONBlockGetNamedNodeData tests: qemublock: Add test for bitmap detection tests: qemublocktest: Add a syntetic test case for bitmap detection qemu: Check for explicit failure of qemuBlockSnapshotAddBlockdev qemu: snapshot: Fold formatting of snapshot transaction into prepare func qemu: monitor: Add 'granularity' parameter for block-dirty-bitmap-add qemu: snapshot: Propagate active bitmaps through external snapshots tests: qemublock: Add test case for detecting bitmaps as we create snapshots qemu: backup: Return 'def' instead of 'obj' from qemuBackupBeginCollectIncrementalCheckpoints qemu: backup: Extract calculations of bitmaps to merge for incremental backup qemu: backup: Propagate bitmap metadata into qemuBackupDiskPrepareOneBitmapsChain qemu: backup: Export qemuBackupDiskPrepareOneBitmapsChain for tests tests: qemublock: Add testing of bitmap merging for incremental backups qemu: block: Introduce qemuBlockNamedNodeDataGetBitmapByName qemu: backup: Merge bitmaps accross the backing chain tests: qemublock: Add tests for cross-snapshot incremental backups docs/manpages/virsh.rst | 27 +- src/qemu/qemu_backup.c | 145 ++- src/qemu/qemu_backup.h | 7 + src/qemu/qemu_block.c | 32 + src/qemu/qemu_block.h | 5 + src/qemu/qemu_checkpoint.c | 2 +- src/qemu/qemu_driver.c | 84 +- src/qemu/qemu_monitor.c | 6 +- src/qemu/qemu_monitor.h | 18 +- src/qemu/qemu_monitor_json.c | 96 +- src/qemu/qemu_monitor_json.h | 6 +- tests/qemublocktest.c | 241 +++++ .../backupmerge/basic-deep-out.json | 22 + .../backupmerge/basic-flat-out.json | 6 + .../backupmerge/basic-intermediate-out.json | 10 + .../backupmerge/snapshot-deep-out.json | 38 + .../backupmerge/snapshot-flat-out.json | 6 + .../snapshot-intermediate-out.json | 14 + tests/qemublocktestdata/bitmap/basic.json | 117 +++ tests/qemublocktestdata/bitmap/basic.out | 6 + tests/qemublocktestdata/bitmap/snapshots.json | 836 ++++++++++++++++++ tests/qemublocktestdata/bitmap/snapshots.out | 14 + tests/qemublocktestdata/bitmap/synthetic.json | 118 +++ tests/qemublocktestdata/bitmap/synthetic.out | 6 + tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 76 +- 26 files changed, 1845 insertions(+), 95 deletions(-) create mode 100644 tests/qemublocktestdata/backupmerge/basic-deep-out.json create mode 100644 tests/qemublocktestdata/backupmerge/basic-flat-out.json create mode 100644 tests/qemublocktestdata/backupmerge/basic-intermediate-out.json create mode 100644 tests/qemublocktestdata/backupmerge/snapshot-deep-out.json create mode 100644 tests/qemublocktestdata/backupmerge/snapshot-flat-out.json create mode 100644 tests/qemublocktestdata/backupmerge/snapshot-intermediate-out.json create mode 100644 tests/qemublocktestdata/bitmap/basic.json create mode 100644 tests/qemublocktestdata/bitmap/basic.out create mode 100644 tests/qemublocktestdata/bitmap/snapshots.json create mode 100644 tests/qemublocktestdata/bitmap/snapshots.out create mode 100644 tests/qemublocktestdata/bitmap/synthetic.json create mode 100644 tests/qemublocktestdata/bitmap/synthetic.out -- 2.23.0

4 46

[libvirt] [PATCH v2] docs: Harmonize hypervisor names for QEMU and LXC
by Michael Weiser 10 Jan '20

10 Jan '20

Trivially replace usages of qemu and lxc in the virsh manpage with their more heavily used and (according to Wikipedia) correct upper-case spellings QEMU and LXC. Signed-off-by: Michael Weiser <michael.weiser(a)gmx.de> Suggested-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/manpages/virsh.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index fea0527caf..26f08b7701 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -577,7 +577,7 @@ from the domain's XML <os/> element and <type/> subelement or one from a list of machines from the ``virsh capabilities`` output for a specific architecture and domain type. -For the qemu hypervisor, a *virttype* of either 'qemu' or 'kvm' must be +For the QEMU hypervisor, a *virttype* of either 'qemu' or 'kvm' must be supplied along with either the *emulatorbin* or *arch* in order to generate output for the default *machine*. Supplying a *machine* value will generate output for the specific machine. @@ -1072,7 +1072,7 @@ read I/O operations limit. write I/O operations limit. *--size-iops-sec* specifies size I/O operations limit per second. *--group-name* specifies group name to share I/O quota between multiple drives. -For a qemu domain, if no name is provided, then the default is to have a single +For a QEMU domain, if no name is provided, then the default is to have a single group for each *device*. Older versions of virsh only accepted these options with underscore @@ -1084,7 +1084,7 @@ An explicit 0 also clears any limit. A non-zero value for a given total cannot be mixed with non-zero values for read or write. It is up to the hypervisor to determine how to handle the length values. -For the qemu hypervisor, if an I/O limit value or maximum value is set, +For the QEMU hypervisor, if an I/O limit value or maximum value is set, then the default value of 1 second will be displayed. Supplying a 0 will reset the value back to the default. @@ -1211,7 +1211,7 @@ to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to *domain* (see also ``domblklist`` for listing these names). *bandwidth* specifies copying bandwidth limit in MiB/s, although for -qemu, it may be non-zero only for an online domain. For further information +QEMU, it may be non-zero only for an online domain. For further information on the *bandwidth* argument see the corresponding section for the ``blockjob`` command. @@ -1642,7 +1642,7 @@ domblkstat Get device block stats for a running domain. A *block-device* corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to *domain* (see -also ``domblklist`` for listing these names). On a lxc or qemu domain, +also ``domblklist`` for listing these names). On a LXC or QEMU domain, omitting the *block-device* yields device block stats summarily for the entire domain. @@ -3247,7 +3247,7 @@ destination). Some hypervisors do not support this feature and will return an error if this parameter is used. Optional *disks-port* sets the port that hypervisor on destination side should -bind to for incoming disks traffic. Currently it is supported only by qemu. +bind to for incoming disks traffic. Currently it is supported only by QEMU. migrate-compcache @@ -7438,7 +7438,7 @@ qemu-monitor-command qemu-monitor-command domain { [--hmp] | [--pretty] } command... Send an arbitrary monitor command *command* to domain *domain* through the -qemu monitor. The results of the command will be printed on stdout. If +QEMU monitor. The results of the command will be printed on stdout. If *--hmp* is passed, the command is considered to be a human monitor command and libvirt will automatically convert it into QMP if needed. In that case the result will also be converted back from QMP. If *--pretty* is given, @@ -7457,7 +7457,7 @@ qemu-agent-command qemu-agent-command domain [--timeout seconds | --async | --block] command... Send an arbitrary guest agent command *command* to domain *domain* through -qemu agent. +QEMU agent. *--timeout*, *--async* and *--block* options are exclusive. *--timeout* requires timeout seconds *seconds* and it must be positive. When *--aysnc* is given, the command waits for timeout whether success or -- 2.24.1

3 2

[libvirt] [PATCH] tests: avoid probing host CPU from bhyve test
by Daniel P. Berrangé 09 Jan '20

09 Jan '20

bhyveargv2xmlmock calls virBhyveCapsBuild which in turn calls virCPUProbeHost, probing the real host CPU. This causes a test failure if the host CPU happens to contain the 'arch-capabilities' feature as it triggers a call to virHostCPUGetMSR() which fails on FreeBSD. Fortunately we already have convenient code for mocking the host CPU probing. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/bhyveargv2xmlmock.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/bhyveargv2xmlmock.c b/tests/bhyveargv2xmlmock.c index 1f08bebb7b..8120be29c1 100644 --- a/tests/bhyveargv2xmlmock.c +++ b/tests/bhyveargv2xmlmock.c @@ -2,7 +2,9 @@ #include "virnetdev.h" #include "internal.h" +#include "testutilshostcpus.h" #include "util/viruuid.h" +#include "cpu/cpu.h" #define VIR_FROM_THIS VIR_FROM_BHYVE @@ -25,3 +27,9 @@ virUUIDGenerate(unsigned char *uuid) return -1; return 0; } + +virCPUDefPtr +virCPUProbeHost(virArch arch) +{ + return testUtilsHostCpusGetDefForArch(arch); +} -- 2.24.1

2 1

[libvirt] [PATCH] qemu: Don't use NULL path from qemuDomainGetHostdevPath
by Jiri Denemark 09 Jan '20

09 Jan '20

Commit v5.10.0-290-g3a4787a301 refactored qemuDomainGetHostdevPath to return a single path rather than an array of paths. When the function is called on a missing device, it will now return NULL in @path rather than a NULL array with zero items and the callers need to be adapted properly. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_cgroup.c | 32 ++++++++++++++++++-------------- src/qemu/qemu_domain.c | 9 +++++---- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 2bcc0527f6..45701b4c6e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -426,13 +426,15 @@ qemuSetupHostdevCgroup(virDomainObjPtr vm, if (qemuDomainGetHostdevPath(dev, &path, &perms) < 0) return -1; - VIR_DEBUG("Cgroup allow %s perms=%d", path, perms); - rv = virCgroupAllowDevicePath(priv->cgroup, path, perms, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", path, - virCgroupGetDevicePermsString(perms), - rv); - if (rv < 0) - return -1; + if (path) { + VIR_DEBUG("Cgroup allow %s perms=%d", path, perms); + rv = virCgroupAllowDevicePath(priv->cgroup, path, perms, false); + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", path, + virCgroupGetDevicePermsString(perms), + rv); + if (rv < 0) + return -1; + } if (qemuHostdevNeedsVFIO(dev)) { VIR_DEBUG("Cgroup allow %s perms=%d", QEMU_DEV_VFIO, VIR_CGROUP_DEVICE_RW); @@ -473,13 +475,15 @@ qemuTeardownHostdevCgroup(virDomainObjPtr vm, if (qemuDomainGetHostdevPath(dev, &path, NULL) < 0) return -1; - VIR_DEBUG("Cgroup deny %s", path); - rv = virCgroupDenyDevicePath(priv->cgroup, path, - VIR_CGROUP_DEVICE_RWM, false); - virDomainAuditCgroupPath(vm, priv->cgroup, - "deny", path, "rwm", rv); - if (rv < 0) - return -1; + if (path) { + VIR_DEBUG("Cgroup deny %s", path); + rv = virCgroupDenyDevicePath(priv->cgroup, path, + VIR_CGROUP_DEVICE_RWM, false); + virDomainAuditCgroupPath(vm, priv->cgroup, + "deny", path, "rwm", rv); + if (rv < 0) + return -1; + } if (qemuHostdevNeedsVFIO(dev) && !qemuDomainNeedsVFIO(vm->def)) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 24e84a5966..1f358544ab 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -14001,7 +14001,8 @@ qemuDomainNeedsVFIO(const virDomainDef *def) * * For given device @dev fetch its host path and store it at * @path. Optionally, caller can get @perms on the path (e.g. - * rw/ro). + * rw/ro). When called on a missing device, the function will return success + * and store NULL at @path. * * The caller is responsible for freeing the @path when no longer * needed. @@ -14625,7 +14626,7 @@ qemuDomainSetupHostdev(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, if (qemuDomainGetHostdevPath(dev, &path, NULL) < 0) return -1; - if (qemuDomainCreateDevice(path, data, false) < 0) + if (path && qemuDomainCreateDevice(path, data, false) < 0) return -1; if (qemuHostdevNeedsVFIO(dev) && @@ -15688,7 +15689,7 @@ qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm, if (qemuDomainGetHostdevPath(hostdev, &path, NULL) < 0) return -1; - if (qemuDomainNamespaceMknodPath(vm, path) < 0) + if (path && qemuDomainNamespaceMknodPath(vm, path) < 0) return -1; if (qemuHostdevNeedsVFIO(hostdev) && @@ -15720,7 +15721,7 @@ qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm, if (qemuDomainGetHostdevPath(hostdev, &path, NULL) < 0) return -1; - if (qemuDomainNamespaceUnlinkPath(vm, path) < 0) + if (path && qemuDomainNamespaceUnlinkPath(vm, path) < 0) return -1; if (qemuHostdevNeedsVFIO(hostdev) && -- 2.24.1

2 1

[libvirt] backing file chains, -blockdev, and storage file autodetection
by Martin Wilck 09 Jan '20

09 Jan '20

The recent change in libvirt to pass storage arguments to qemu via "-blockdev", explicity passing backing file chain information rather than relying on qemu to figure it out, has bitten me quite painfully. I've had the habit for years to use qcow2 with backing chains without specifying the backing file format explicitly, as information like the following was enough both for me and for qemu to figure out that the backing file was in qcow2 format: # qemu-img info sles15-gm-cc.qcow2 image: sles15-gm-cc.qcow2 file format: qcow2 virtual size: 20 GiB (21474836480 bytes) disk size: 407 MiB cluster_size: 65536 backing file: /mnt/vms/sles15-gm-base.qcow2 But if libvirt encounters a qemu-img file like this, it passes the backing file to qemu with "driver";"raw": -blockdev '{"driver":"file","filename":"/mnt/vms/sles15-gm-base.qcow2","node-name":"libvirt-4-storage","auto-read-only":true,"discard": "unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw","file":"libvirt-4-storage"}' \ The effect was that some of my VMs would refuse to start with a "no bootable disk" error message from the VM's BIOS. Others did boot (I believe this was because the boot sector had been modified in the top image in the backing file chain), and I'm quite grateful I did not attempt to boot them fully, because god knows what might have happened if the OS had later encountered garbage data from the backing file at some random point. It took me half a day to figure out that this effect had been caused by the recent libvirt update. I'm aware that documentation about this has been added recently (https://libvirt.org/kbase/backing_chains.html (*)). Also I believe that current libvirt master (unlike 5.10.0) would refuse to start such images in the first place ( https://bugzilla.redhat.com/show_bug.cgi?id=1588373) perhaps providing users with a better clue than before what was going wrong. Meanwhile I've fixed my VM images by adding the backing file format tag, as suggested in the documentation. However I still think that this was quite a disruptive change and highly unexpected for users. IMO the default behavior shouldn't have been switched like this without appropriate warnings. The rationale given for not autodetecting the file format is "a malicious guest could rewrite the header of the disk leading to access of host files". I suppose a guest would need to manipulate a raw image to look like qcow2, qed or similar for this to happen (and set the backing file to "/etc/shadow", maybe?). Still the malicious guest would need to find a way to manipulate the data *on the backing store*, because the format of the topmost image is explicit anyway. Modifying the backing store could be difficult for the guest, because it's normally read-only and changes go only to the top layer. Or am I missing something? The opposite (manipulating qcow2 to look like raw) shouldn't be possible, IMO. While I can't deny that an attack like this might be feasible, I am still wondering why this hasn't been an issue in past years (with qemu auto-detecting the backing file format). More importantly, perhaps the disruption caused by this change could be mitigated by allowing autodetection in certain cases (e.g. if the file name of the backing file indicates it's qcow2, as in the example above), or by providing a configuration option to enable it in environments (like mine, developer test environment) where evil guests are very unlikely. Best regards, Martin (*) This page is quite hard to find, googling for "libvirt backing chain" does not pick it up prominently just yet. Actually I only found this information by running "git grep" on the libvirt git repo. -- Dr. Martin Wilck <mwilck(a)suse.com>, Tel. +49 (0)911 74053 2107 SUSE Software Solutions Germany GmbH HRB 36809, AG Nürnberg GF: Felix Imendörffer

3 10

[libvirt] [dockerfiles PATCH 0/2] openSUSE updates
by Andrea Bolognani 09 Jan '20

09 Jan '20

Pushed under the Dockerfile update rule. Andrea Bolognani (2): Update openSUSE Leap 15.1 to install Meson from pip Add openSUSE Leap 15.1 Dockerfile for libosinfo buildenv-libosinfo-opensuse-151.zip | Bin 0 -> 570 bytes buildenv-libvirt-opensuse-151.zip | Bin 761 -> 785 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 buildenv-libosinfo-opensuse-151.zip -- 2.24.1

1 2

[libvirt] [PATCH v3] driver: Include source as a flag to virDomainGetHostname
by Julio Faracco 09 Jan '20

09 Jan '20

There is a lots of possibilities to retrieve hostname information from domain. Libvirt could use lease information from dnsmasq to get current hostname too. QEMU supports QEMU-agent but it can use lease source. See 'domifaddr' as an example. This commit still adds lease options for QEMU. It will get the first hostname available from domain networks. This case, QEMU driver has a default section inside switch to keep compatibility. So, if someone call 'domhostname' without specifying source, it will get the default option. Some other drivers like LXC and OpenVZ supports only one type, virCheckFlags will handle this case. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- v1-v2: Moving sources into flags. v2-v3: Applying Michal's suggestions. --- docs/manpages/virsh.rst | 7 ++- include/libvirt/libvirt-domain.h | 5 ++ src/lxc/lxc_driver.c | 78 ++++++++++++++++++++++++++++++++ src/qemu/qemu_driver.c | 76 +++++++++++++++++++++++++++---- tools/virsh-completer-domain.c | 17 +++++++ tools/virsh-completer-domain.h | 4 ++ tools/virsh-domain.c | 26 ++++++++++- 7 files changed, 201 insertions(+), 12 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index fea0527caf..ba483d4d00 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -1797,10 +1797,15 @@ domhostname .. code-block:: - domhostname domain + domhostname domain [--source lease|agent] Returns the hostname of a domain, if the hypervisor makes it available. +The *--source* argument specifies what data source to use for the +hostnames, currently 'lease' to read DHCP leases or 'agent' to query +the guest OS via an agent. If unspecified, driver returns the default +method available (some drivers support only one type of source). + domid ----- diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index e60003978a..666c1875cc 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4833,6 +4833,11 @@ typedef struct _virTypedParameter virMemoryParameter; */ typedef virMemoryParameter *virMemoryParameterPtr; +typedef enum { + VIR_DOMAIN_GET_HOSTNAME_LEASE = (1 << 0), /* Parse DHCP lease file */ + VIR_DOMAIN_GET_HOSTNAME_AGENT = (1 << 1), /* Query qemu guest agent */ +} virDomainGetHostnameFlags; + typedef enum { VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE = 0, /* Parse DHCP lease file */ VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT = 1, /* Query qemu guest agent */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 780c6ed4a2..2dac730e70 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5291,6 +5291,83 @@ lxcDomainGetCPUStats(virDomainPtr dom, } +static char * +lxcDomainGetHostname(virDomainPtr dom, + unsigned int flags) +{ + virLXCDriverPtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + char macaddr[VIR_MAC_STRING_BUFLEN]; + g_autoptr(virConnect) conn = NULL; + virNetworkDHCPLeasePtr *leases = NULL; + int n_leases; + size_t i, j; + char *hostname = NULL; + + virCheckFlags(VIR_DOMAIN_GET_HOSTNAME_LEASE, NULL); + + if (!(vm = lxcDomObjFromDomain(dom))) + return NULL; + + if (virDomainGetHostnameEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_QUERY) < 0) + goto cleanup; + + if (virDomainObjCheckActive(vm) < 0) + goto endjob; + + if (!(conn = virGetConnectNetwork())) + goto endjob; + + for (i = 0; i < vm->def->nnets; i++) { + g_autoptr(virNetwork) network = NULL; + + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + network = virNetworkLookupByName(conn, + vm->def->nets[i]->data.network.name); + + if (!network) + goto endjob; + + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, + &leases, 0)) < 0) + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("There is no available hostname %d"), + flags); + + for (j = 0; j < n_leases; j++) { + virNetworkDHCPLeasePtr lease = leases[j]; + if (lease->hostname) { + hostname = g_strdup(lease->hostname); + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + + goto endjob; + } + + virNetworkDHCPLeaseFree(lease); + } + + VIR_FREE(leases); + } + + endjob: + virLXCDomainObjEndJob(driver, vm); + + cleanup: + virDomainObjEndAPI(&vm); + return hostname; +} + + static int lxcNodeGetFreePages(virConnectPtr conn, unsigned int npages, @@ -5436,6 +5513,7 @@ static virHypervisorDriver lxcHypervisorDriver = { .domainSetMetadata = lxcDomainSetMetadata, /* 1.1.3 */ .domainGetMetadata = lxcDomainGetMetadata, /* 1.1.3 */ .domainGetCPUStats = lxcDomainGetCPUStats, /* 1.2.2 */ + .domainGetHostname = lxcDomainGetHostname, /* 6.0.0 */ .nodeGetMemoryParameters = lxcNodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = lxcNodeSetMemoryParameters, /* 0.10.2 */ .domainSendProcessSignal = lxcDomainSendProcessSignal, /* 1.0.1 */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ec8faf384c..d8ed859f70 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20280,9 +20280,19 @@ qemuDomainGetHostname(virDomainPtr dom, virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; qemuAgentPtr agent; + char macaddr[VIR_MAC_STRING_BUFLEN]; + g_autoptr(virConnect) conn = NULL; + virNetworkDHCPLeasePtr *leases = NULL; + int n_leases; + size_t i, j; char *hostname = NULL; - virCheckFlags(0, NULL); + virCheckFlags(VIR_DOMAIN_GET_HOSTNAME_LEASE | + VIR_DOMAIN_GET_HOSTNAME_AGENT, NULL); + + VIR_EXCLUSIVE_FLAGS_RET(VIR_DOMAIN_GET_HOSTNAME_LEASE, + VIR_DOMAIN_GET_HOSTNAME_AGENT, + NULL); if (!(vm = qemuDomainObjFromDomain(dom))) return NULL; @@ -20290,18 +20300,66 @@ qemuDomainGetHostname(virDomainPtr dom, if (virDomainGetHostnameEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0) - goto cleanup; - if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (!qemuDomainAgentAvailable(vm, true)) - goto endjob; + switch (flags) { + default: + case VIR_DOMAIN_GET_HOSTNAME_AGENT: + if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0) + goto cleanup; - agent = qemuDomainObjEnterAgent(vm); - ignore_value(qemuAgentGetHostname(agent, &hostname)); - qemuDomainObjExitAgent(vm, agent); + if (!qemuDomainAgentAvailable(vm, true)) + goto endjob; + + agent = qemuDomainObjEnterAgent(vm); + ignore_value(qemuAgentGetHostname(agent, &hostname)); + qemuDomainObjExitAgent(vm, agent); + + break; + case VIR_DOMAIN_GET_HOSTNAME_LEASE: + if (!(conn = virGetConnectNetwork())) + goto endjob; + + for (i = 0; i < vm->def->nnets; i++) { + g_autoptr(virNetwork) network = NULL; + + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + network = virNetworkLookupByName(conn, + vm->def->nets[i]->data.network.name); + + if (!network) + goto endjob; + + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, + &leases, 0)) < 0) + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("There is no available hostname %d"), + flags); + + for (j = 0; j < n_leases; j++) { + virNetworkDHCPLeasePtr lease = leases[j]; + if (lease->hostname) { + hostname = g_strdup(lease->hostname); + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + + goto endjob; + } + + virNetworkDHCPLeaseFree(lease); + } + + VIR_FREE(leases); + } + break; + } endjob: qemuDomainObjEndAgentJob(vm); diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 0311ee50d0..67e67d485a 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -296,3 +296,20 @@ virshDomainShutdownModeCompleter(vshControl *ctl, return virshCommaStringListComplete(mode, modes); } + + +char ** +virshDomainGetHosnameSourcesCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags) +{ + const char *sources[] = {"lease", "agent", NULL}; + const char *source = NULL; + + virCheckFlags(0, NULL); + + if (vshCommandOptStringQuiet(ctl, cmd, "source", &source) < 0) + return NULL; + + return virshCommaStringListComplete(source, sources); +} diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h index 083ab327cc..ad1b37a255 100644 --- a/tools/virsh-completer-domain.h +++ b/tools/virsh-completer-domain.h @@ -53,3 +53,7 @@ char ** virshDomainDeviceAliasCompleter(vshControl *ctl, char ** virshDomainShutdownModeCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + +char ** virshDomainGetHosnameSourcesCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 9d4cdd26dd..73e6780116 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11743,6 +11743,11 @@ static const vshCmdInfo info_domhostname[] = { static const vshCmdOptDef opts_domhostname[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), + {.name = "source", + .type = VSH_OT_STRING, + .flags = VSH_OFLAG_NONE, + .completer = virshDomainGetHosnameSourcesCompleter, + .help = N_("address source: 'lease' or 'agent'")}, {.name = NULL} }; @@ -11752,21 +11757,38 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) char *hostname; virDomainPtr dom; bool ret = false; + const char *sourcestr = NULL; + int flags = 0; /* Use default value. Drivers can have its own default. */ if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - hostname = virDomainGetHostname(dom, 0); + if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0) + goto error; + + if (sourcestr) { + if (STREQ(sourcestr, "lease")) { + flags |= VIR_DOMAIN_GET_HOSTNAME_LEASE; + } else if (STREQ(sourcestr, "agent")) { + flags |= VIR_DOMAIN_GET_HOSTNAME_AGENT; + } else { + vshError(ctl, _("Unknown data source '%s'"), sourcestr); + goto error; + } + } + + hostname = virDomainGetHostname(dom, flags); if (hostname == NULL) { vshError(ctl, "%s", _("failed to get hostname")); goto error; } vshPrint(ctl, "%s\n", hostname); + + VIR_FREE(hostname); ret = true; error: - VIR_FREE(hostname); virshDomainFree(dom); return ret; } -- 2.20.1

2 1

[libvirt] [jenkins-ci PATCH v3 0/3] Add all possible projects to openSUSE 15.1
by Fabiano Fidêncio 09 Jan '20

09 Jan '20

Now that openSUSE 15.1 is a thing on libvirt-jenkins-ci, let's add all possible projects to the OS, doing the needed mappings adjustments whenever needed. Changes since v2: https://www.redhat.com/archives/libvir-list/2020-January/msg00333.html - Split meson change into its specific patch; - Re-ordered the commits based on Andrea's request; - (Possibly) Fixed all the issues pointed by Andrea; Changes since v1: https://www.redhat.com/archives/libvir-list/2020-January/msg00321.html - Added libvirt-perl and updated the mappings accordingly. Fabiano Fidêncio (3): mappings: Use meson from pip on openSUSE 15.1 mappings: Adjust mappings for openSUSE 15.1 guests: Add projects to openSUSE 15.1 guests/host_vars/libvirt-opensuse-151/main.yml | 14 ++++++++++++++ guests/playbooks/build/projects/libvirt-dbus.yml | 1 + .../playbooks/build/projects/libvirt-sandbox.yml | 1 + guests/playbooks/build/projects/virt-manager.yml | 2 ++ guests/vars/mappings.yml | 16 ++++++++++++++++ 5 files changed, 34 insertions(+) -- 2.24.1

2 4

[libvirt] [PATCH 00/16] include result of bootstrap in git
by Pavel Hrdina 09 Jan '20

09 Jan '20

This patch series is motivated by the effort to adopt Meson as our build system but all of it improves the current build system on its own. It moves the burden to run bootstrap/autoreconf to developers which means it will save some time for others when there is any change to the build system. Since one of the patches is slightly bigger here is link to git: <https://gitlab.com/phrdina/libvirt/commits/configure> Pavel Hrdina (16): secret: move virSecretGetSecretString into virsecret configure.ac: add check for getegid function bootstrap.conf: drop gnulib tests from libvirt bootstrap.conf: add pthread-h module bootstrap.conf: always copy files bootstrap.conf: declare bootstrap sync in configuration file bootstrap.conf: disable VC ignore files bootstrap.conf: stop creating AUTHORS file syntax-check: remove deleted daemon directory from space_indent_check autogen.sh: fix autoreconf step autogen.sh: move --system option to configure as --with-system gnulib: store result of bootstrap in git replace any autogen.sh reference with configure autogen.sh: remove configure related code autogen.sh: remove --dry-run option autogen.sh: remove --no-git and --gnulib-srcdir options .git-module-status | 2 + .gitignore | 18 - .gitlab-ci.yml | 2 +- .travis.yml | 4 +- INSTALL | 368 + Makefile.am | 2 +- Makefile.in | 2323 + README-hacking | 5 +- aclocal.m4 | 1719 + autogen.sh | 150 +- bootstrap.conf | 29 +- build-aux/compile | 348 + build-aux/config.guess | 1667 + build-aux/config.sub | 1793 + build-aux/depcomp | 791 + build-aux/install-sh | 529 + build-aux/ltmain.sh | 11149 ++++ build-aux/missing | 215 + build-aux/syntax-check.mk | 23 +- build-aux/test-driver | 148 + ci/build.sh | 1 - config.h.in | 2303 + configure | 56615 +++++++++++++++++++ configure.ac | 16 +- docs/Makefile.in | 2614 + docs/compiling.html.in | 21 +- examples/Makefile.in | 2494 + gnulib/lib/Makefile.in | 3997 ++ gnulib/lib/_Noreturn.h | 40 + gnulib/lib/accept.c | 52 + gnulib/lib/alloca.c | 478 + gnulib/lib/alloca.in.h | 71 + gnulib/lib/arg-nonnull.h | 26 + gnulib/lib/arpa_inet.in.h | 150 + gnulib/lib/asnprintf.c | 34 + gnulib/lib/assure.h | 37 + gnulib/lib/binary-io.c | 39 + gnulib/lib/binary-io.h | 77 + gnulib/lib/bind.c | 49 + gnulib/lib/c++defs.h | 316 + gnulib/lib/chown.c | 151 + gnulib/lib/cloexec.c | 83 + gnulib/lib/cloexec.h | 38 + gnulib/lib/close.c | 71 + gnulib/lib/connect.c | 56 + gnulib/lib/dup2.c | 235 + gnulib/lib/errno.in.h | 279 + gnulib/lib/fchown-stub.c | 16 + gnulib/lib/fcntl.c | 627 + gnulib/lib/fcntl.in.h | 392 + gnulib/lib/fd-hook.c | 116 + gnulib/lib/fd-hook.h | 119 + gnulib/lib/filename.h | 54 + gnulib/lib/float+.h | 147 + gnulib/lib/float.c | 33 + gnulib/lib/float.in.h | 188 + gnulib/lib/fseek.c | 30 + gnulib/lib/fseeko.c | 164 + gnulib/lib/fstat.c | 94 + gnulib/lib/gai_strerror.c | 92 + gnulib/lib/getaddrinfo.c | 473 + gnulib/lib/getdelim.c | 147 + gnulib/lib/getdtablesize.c | 124 + gnulib/lib/getgroups.c | 131 + gnulib/lib/gethostname.c | 104 + gnulib/lib/getline.c | 27 + gnulib/lib/getpass.c | 231 + gnulib/lib/getpass.h | 4 + gnulib/lib/getpeername.c | 49 + gnulib/lib/getsockname.c | 49 + gnulib/lib/gettext.h | 301 + gnulib/lib/getugroups.c | 128 + gnulib/lib/getugroups.h | 19 + gnulib/lib/glthread/threadlib.c | 73 + gnulib/lib/gnulib.mk | 2806 + gnulib/lib/inet_ntop.c | 260 + gnulib/lib/intprops.h | 584 + gnulib/lib/ioctl.c | 92 + gnulib/lib/itold.c | 28 + gnulib/lib/limits.in.h | 104 + gnulib/lib/listen.c | 49 + gnulib/lib/localcharset.c | 1159 + gnulib/lib/localcharset.h | 137 + gnulib/lib/locale.in.h | 305 + gnulib/lib/localeconv.c | 103 + gnulib/lib/lseek.c | 71 + gnulib/lib/malloc.c | 56 + gnulib/lib/malloca.c | 105 + gnulib/lib/malloca.h | 123 + gnulib/lib/memchr.c | 172 + gnulib/lib/memchr.valgrind | 30 + gnulib/lib/mgetgroups.c | 201 + gnulib/lib/mgetgroups.h | 22 + gnulib/lib/msvc-inval.c | 129 + gnulib/lib/msvc-inval.h | 222 + gnulib/lib/msvc-nothrow.c | 51 + gnulib/lib/msvc-nothrow.h | 43 + gnulib/lib/net_if.in.h | 53 + gnulib/lib/netdb.in.h | 293 + gnulib/lib/netinet_in.in.h | 47 + gnulib/lib/nonblocking.c | 159 + gnulib/lib/nonblocking.h | 62 + gnulib/lib/open.c | 203 + gnulib/lib/openpty.c | 136 + gnulib/lib/passfd.c | 205 + gnulib/lib/passfd.h | 32 + gnulib/lib/pathmax.h | 83 + gnulib/lib/physmem.c | 330 + gnulib/lib/physmem.h | 26 + gnulib/lib/pipe.c | 50 + gnulib/lib/pipe2.c | 167 + gnulib/lib/poll.c | 621 + gnulib/lib/poll.in.h | 125 + gnulib/lib/posix_openpt.c | 108 + gnulib/lib/printf-args.c | 183 + gnulib/lib/printf-args.h | 150 + gnulib/lib/printf-parse.c | 632 + gnulib/lib/printf-parse.h | 193 + gnulib/lib/pthread.in.h | 1831 + gnulib/lib/pthread_sigmask.c | 92 + gnulib/lib/pty.in.h | 131 + gnulib/lib/raise.c | 83 + gnulib/lib/rawmemchr.c | 136 + gnulib/lib/rawmemchr.valgrind | 28 + gnulib/lib/realloc.c | 79 + gnulib/lib/recv.c | 49 + gnulib/lib/sched.in.h | 97 + gnulib/lib/select.c | 583 + gnulib/lib/send.c | 49 + gnulib/lib/setsockopt.c | 65 + gnulib/lib/sig-handler.c | 3 + gnulib/lib/sig-handler.h | 51 + gnulib/lib/sigaction.c | 204 + gnulib/lib/signal.in.h | 475 + gnulib/lib/sigprocmask.c | 349 + gnulib/lib/size_max.h | 30 + gnulib/lib/snprintf.c | 71 + gnulib/lib/socket.c | 49 + gnulib/lib/sockets.c | 161 + gnulib/lib/sockets.h | 66 + gnulib/lib/stat-time.c | 3 + gnulib/lib/stat-time.h | 252 + gnulib/lib/stat-w32.c | 425 + gnulib/lib/stat-w32.h | 37 + gnulib/lib/stat.c | 433 + gnulib/lib/stdalign.in.h | 121 + gnulib/lib/stdbool.in.h | 132 + gnulib/lib/stddef.in.h | 121 + gnulib/lib/stdint.in.h | 746 + gnulib/lib/stdio-impl.h | 212 + gnulib/lib/stdio-read.c | 164 + gnulib/lib/stdio-write.c | 202 + gnulib/lib/stdio.in.h | 1444 + gnulib/lib/stdlib.in.h | 1112 + gnulib/lib/strchrnul.c | 142 + gnulib/lib/strchrnul.valgrind | 28 + gnulib/lib/strdup.c | 54 + gnulib/lib/streq.h | 176 + gnulib/lib/string.in.h | 1067 + gnulib/lib/strtok_r.c | 76 + gnulib/lib/sys_ioctl.in.h | 79 + gnulib/lib/sys_select.in.h | 319 + gnulib/lib/sys_socket.c | 4 + gnulib/lib/sys_socket.in.h | 721 + gnulib/lib/sys_stat.in.h | 823 + gnulib/lib/sys_time.in.h | 224 + gnulib/lib/sys_types.in.h | 106 + gnulib/lib/sys_uio.in.h | 63 + gnulib/lib/sys_utsname.in.h | 108 + gnulib/lib/sys_wait.in.h | 131 + gnulib/lib/termios.in.h | 73 + gnulib/lib/time.in.h | 364 + gnulib/lib/time_r.c | 44 + gnulib/lib/ttyname_r.c | 114 + gnulib/lib/uname.c | 268 + gnulib/lib/unistd.c | 4 + gnulib/lib/unistd.in.h | 1719 + gnulib/lib/unitypes.in.h | 46 + gnulib/lib/uniwidth.in.h | 72 + gnulib/lib/uniwidth/cjk.h | 37 + gnulib/lib/uniwidth/width.c | 468 + gnulib/lib/vasnprintf.c | 5615 ++ gnulib/lib/vasnprintf.h | 79 + gnulib/lib/verify.h | 301 + gnulib/lib/w32sock.h | 140 + gnulib/lib/waitpid.c | 30 + gnulib/lib/warn-on-use.h | 131 + gnulib/lib/wchar.in.h | 1144 + gnulib/lib/wctype-h.c | 4 + gnulib/lib/wctype.in.h | 679 + gnulib/lib/wcwidth.c | 73 + gnulib/lib/xalloc-oversized.h | 60 + gnulib/lib/xsize.c | 3 + gnulib/lib/xsize.h | 117 + gnulib/tests/Makefile.am | 32 - include/libvirt/Makefile.in | 1908 + m4/00gnulib.m4 | 46 + m4/absolute-header.m4 | 102 + m4/alloca.m4 | 128 + m4/arpa_inet_h.m4 | 59 + m4/asm-underscore.m4 | 72 + m4/chown.m4 | 216 + m4/close.m4 | 35 + m4/codeset.m4 | 24 + m4/configmake.m4 | 27 + m4/dup2.m4 | 117 + m4/eealloc.m4 | 31 + m4/environ.m4 | 45 + m4/errno_h.m4 | 133 + m4/exponentd.m4 | 116 + m4/extensions.m4 | 189 + m4/extern-inline.m4 | 114 + m4/fcntl-o.m4 | 139 + m4/fcntl.m4 | 126 + m4/fcntl_h.m4 | 52 + m4/float_h.m4 | 108 + m4/fseek.m4 | 15 + m4/fseeko.m4 | 77 + m4/fstat.m4 | 39 + m4/getaddrinfo.m4 | 239 + m4/getdelim.m4 | 98 + m4/getdtablesize.m4 | 60 + m4/getgroups.m4 | 109 + m4/gethostname.m4 | 107 + m4/getline.m4 | 109 + m4/getpass.m4 | 106 + m4/getugroups.m4 | 11 + m4/gnulib-cache.m4 | 164 + m4/gnulib-common.m4 | 459 + m4/gnulib-comp.m4 | 1079 + m4/gnulib-tool.m4 | 57 + m4/hostent.m4 | 49 + m4/include_next.m4 | 224 + m4/inet_ntop.m4 | 70 + m4/intmax_t.m4 | 59 + m4/inttypes_h.m4 | 29 + m4/ioctl.m4 | 44 + m4/largefile.m4 | 177 + m4/libtool.m4 | 8372 +++ m4/libunistring-base.m4 | 141 + m4/limits-h.m4 | 43 + m4/localcharset.m4 | 11 + m4/locale_h.m4 | 158 + m4/localeconv.m4 | 22 + m4/lseek.m4 | 71 + m4/ltoptions.m4 | 437 + m4/ltsugar.m4 | 124 + m4/ltversion.m4 | 23 + m4/lt~obsolete.m4 | 99 + m4/malloc.m4 | 104 + m4/malloca.m4 | 14 + m4/manywarnings-c++.m4 | 245 + m4/manywarnings.m4 | 339 + m4/math_h.m4 | 369 + m4/memchr.m4 | 112 + m4/mgetgroups.m4 | 10 + m4/mmap-anon.m4 | 55 + m4/mode_t.m4 | 26 + m4/msvc-inval.m4 | 19 + m4/msvc-nothrow.m4 | 10 + m4/multiarch.m4 | 62 + m4/net_if_h.m4 | 32 + m4/netdb_h.m4 | 44 + m4/netinet_in_h.m4 | 31 + m4/nonblocking.m4 | 29 + m4/off_t.m4 | 18 + m4/open-cloexec.m4 | 21 + m4/open-slash.m4 | 59 + m4/open.m4 | 56 + m4/passfd.m4 | 23 + m4/pathmax.m4 | 42 + m4/physmem.m4 | 46 + m4/pipe.m4 | 15 + m4/pipe2.m4 | 18 + m4/poll.m4 | 107 + m4/poll_h.m4 | 49 + m4/posix-shell.m4 | 63 + m4/posix_openpt.m4 | 19 + m4/printf.m4 | 1692 + m4/pthread_h.m4 | 268 + m4/pthread_sigmask.m4 | 273 + m4/pty.m4 | 160 + m4/pty_h.m4 | 73 + m4/raise.m4 | 36 + m4/rawmemchr.m4 | 20 + m4/realloc.m4 | 82 + m4/sched_h.m4 | 91 + m4/select.m4 | 116 + m4/servent.m4 | 51 + m4/sigaction.m4 | 40 + m4/signal_h.m4 | 83 + m4/signalblocking.m4 | 25 + m4/sigpipe.m4 | 29 + m4/size_max.m4 | 75 + m4/snprintf.m4 | 62 + m4/socketlib.m4 | 90 + m4/sockets.m4 | 17 + m4/socklen.m4 | 76 + m4/sockpfaf.m4 | 84 + m4/ssize_t.m4 | 23 + m4/stat-time.m4 | 83 + m4/stat.m4 | 74 + m4/stdalign.m4 | 57 + m4/stdbool.m4 | 122 + m4/stddef_h.m4 | 72 + m4/stdint.m4 | 535 + m4/stdint_h.m4 | 27 + m4/stdio_h.m4 | 225 + m4/stdlib_h.m4 | 136 + m4/strchrnul.m4 | 50 + m4/strdup.m4 | 36 + m4/string_h.m4 | 122 + m4/strtok_r.m4 | 73 + m4/sys_ioctl_h.m4 | 64 + m4/sys_select_h.m4 | 95 + m4/sys_socket_h.m4 | 188 + m4/sys_stat_h.m4 | 100 + m4/sys_time_h.m4 | 110 + m4/sys_types_h.m4 | 60 + m4/sys_uio_h.m4 | 31 + m4/sys_utsname_h.m4 | 54 + m4/sys_wait_h.m4 | 36 + m4/termios_h.m4 | 43 + m4/threadlib.m4 | 586 + m4/time_h.m4 | 144 + m4/time_r.m4 | 99 + m4/ttyname_r.m4 | 133 + m4/uname.m4 | 19 + m4/unistd_h.m4 | 201 + m4/vasnprintf.m4 | 288 + m4/waitpid.m4 | 14 + m4/warn-on-use.m4 | 51 + m4/warnings.m4 | 115 + m4/wchar_h.m4 | 241 + m4/wchar_t.m4 | 24 + m4/wctype_h.m4 | 216 + m4/wcwidth.m4 | 131 + m4/wint_t.m4 | 74 + m4/xsize.m4 | 12 + po/Makefile.in | 1880 + po/POTFILES.in | 1 - src/Makefile.in | 15853 ++++++ src/libvirt_private.syms | 5 +- src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_tpm.c | 2 +- src/secret/Makefile.inc.am | 11 - src/secret/secret_util.c | 102 - src/secret/secret_util.h | 33 - src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_iscsi_direct.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- src/storage/storage_util.c | 2 +- src/util/virsecret.c | 69 + src/util/virsecret.h | 8 + tests/Makefile.in | 7562 +++ tools/Makefile.in | 3727 ++ 358 files changed, 187869 insertions(+), 405 deletions(-) create mode 100644 .git-module-status create mode 100644 INSTALL create mode 100644 Makefile.in create mode 100644 aclocal.m4 create mode 100755 build-aux/compile create mode 100755 build-aux/config.guess create mode 100755 build-aux/config.sub create mode 100755 build-aux/depcomp create mode 100755 build-aux/install-sh create mode 100644 build-aux/ltmain.sh create mode 100755 build-aux/missing create mode 100755 build-aux/test-driver create mode 100644 config.h.in create mode 100755 configure create mode 100644 docs/Makefile.in create mode 100644 examples/Makefile.in create mode 100644 gnulib/lib/Makefile.in create mode 100644 gnulib/lib/_Noreturn.h create mode 100644 gnulib/lib/accept.c create mode 100644 gnulib/lib/alloca.c create mode 100644 gnulib/lib/alloca.in.h create mode 100644 gnulib/lib/arg-nonnull.h create mode 100644 gnulib/lib/arpa_inet.in.h create mode 100644 gnulib/lib/asnprintf.c create mode 100644 gnulib/lib/assure.h create mode 100644 gnulib/lib/binary-io.c create mode 100644 gnulib/lib/binary-io.h create mode 100644 gnulib/lib/bind.c create mode 100644 gnulib/lib/c++defs.h create mode 100644 gnulib/lib/chown.c create mode 100644 gnulib/lib/cloexec.c create mode 100644 gnulib/lib/cloexec.h create mode 100644 gnulib/lib/close.c create mode 100644 gnulib/lib/connect.c create mode 100644 gnulib/lib/dup2.c create mode 100644 gnulib/lib/errno.in.h create mode 100644 gnulib/lib/fchown-stub.c create mode 100644 gnulib/lib/fcntl.c create mode 100644 gnulib/lib/fcntl.in.h create mode 100644 gnulib/lib/fd-hook.c create mode 100644 gnulib/lib/fd-hook.h create mode 100644 gnulib/lib/filename.h create mode 100644 gnulib/lib/float+.h create mode 100644 gnulib/lib/float.c create mode 100644 gnulib/lib/float.in.h create mode 100644 gnulib/lib/fseek.c create mode 100644 gnulib/lib/fseeko.c create mode 100644 gnulib/lib/fstat.c create mode 100644 gnulib/lib/gai_strerror.c create mode 100644 gnulib/lib/getaddrinfo.c create mode 100644 gnulib/lib/getdelim.c create mode 100644 gnulib/lib/getdtablesize.c create mode 100644 gnulib/lib/getgroups.c create mode 100644 gnulib/lib/gethostname.c create mode 100644 gnulib/lib/getline.c create mode 100644 gnulib/lib/getpass.c create mode 100644 gnulib/lib/getpass.h create mode 100644 gnulib/lib/getpeername.c create mode 100644 gnulib/lib/getsockname.c create mode 100644 gnulib/lib/gettext.h create mode 100644 gnulib/lib/getugroups.c create mode 100644 gnulib/lib/getugroups.h create mode 100644 gnulib/lib/glthread/threadlib.c create mode 100644 gnulib/lib/gnulib.mk create mode 100644 gnulib/lib/inet_ntop.c create mode 100644 gnulib/lib/intprops.h create mode 100644 gnulib/lib/ioctl.c create mode 100644 gnulib/lib/itold.c create mode 100644 gnulib/lib/limits.in.h create mode 100644 gnulib/lib/listen.c create mode 100644 gnulib/lib/localcharset.c create mode 100644 gnulib/lib/localcharset.h create mode 100644 gnulib/lib/locale.in.h create mode 100644 gnulib/lib/localeconv.c create mode 100644 gnulib/lib/lseek.c create mode 100644 gnulib/lib/malloc.c create mode 100644 gnulib/lib/malloca.c create mode 100644 gnulib/lib/malloca.h create mode 100644 gnulib/lib/memchr.c create mode 100644 gnulib/lib/memchr.valgrind create mode 100644 gnulib/lib/mgetgroups.c create mode 100644 gnulib/lib/mgetgroups.h create mode 100644 gnulib/lib/msvc-inval.c create mode 100644 gnulib/lib/msvc-inval.h create mode 100644 gnulib/lib/msvc-nothrow.c create mode 100644 gnulib/lib/msvc-nothrow.h create mode 100644 gnulib/lib/net_if.in.h create mode 100644 gnulib/lib/netdb.in.h create mode 100644 gnulib/lib/netinet_in.in.h create mode 100644 gnulib/lib/nonblocking.c create mode 100644 gnulib/lib/nonblocking.h create mode 100644 gnulib/lib/open.c create mode 100644 gnulib/lib/openpty.c create mode 100644 gnulib/lib/passfd.c create mode 100644 gnulib/lib/passfd.h create mode 100644 gnulib/lib/pathmax.h create mode 100644 gnulib/lib/physmem.c create mode 100644 gnulib/lib/physmem.h create mode 100644 gnulib/lib/pipe.c create mode 100644 gnulib/lib/pipe2.c create mode 100644 gnulib/lib/poll.c create mode 100644 gnulib/lib/poll.in.h create mode 100644 gnulib/lib/posix_openpt.c create mode 100644 gnulib/lib/printf-args.c create mode 100644 gnulib/lib/printf-args.h create mode 100644 gnulib/lib/printf-parse.c create mode 100644 gnulib/lib/printf-parse.h create mode 100644 gnulib/lib/pthread.in.h create mode 100644 gnulib/lib/pthread_sigmask.c create mode 100644 gnulib/lib/pty.in.h create mode 100644 gnulib/lib/raise.c create mode 100644 gnulib/lib/rawmemchr.c create mode 100644 gnulib/lib/rawmemchr.valgrind create mode 100644 gnulib/lib/realloc.c create mode 100644 gnulib/lib/recv.c create mode 100644 gnulib/lib/sched.in.h create mode 100644 gnulib/lib/select.c create mode 100644 gnulib/lib/send.c create mode 100644 gnulib/lib/setsockopt.c create mode 100644 gnulib/lib/sig-handler.c create mode 100644 gnulib/lib/sig-handler.h create mode 100644 gnulib/lib/sigaction.c create mode 100644 gnulib/lib/signal.in.h create mode 100644 gnulib/lib/sigprocmask.c create mode 100644 gnulib/lib/size_max.h create mode 100644 gnulib/lib/snprintf.c create mode 100644 gnulib/lib/socket.c create mode 100644 gnulib/lib/sockets.c create mode 100644 gnulib/lib/sockets.h create mode 100644 gnulib/lib/stat-time.c create mode 100644 gnulib/lib/stat-time.h create mode 100644 gnulib/lib/stat-w32.c create mode 100644 gnulib/lib/stat-w32.h create mode 100644 gnulib/lib/stat.c create mode 100644 gnulib/lib/stdalign.in.h create mode 100644 gnulib/lib/stdbool.in.h create mode 100644 gnulib/lib/stddef.in.h create mode 100644 gnulib/lib/stdint.in.h create mode 100644 gnulib/lib/stdio-impl.h create mode 100644 gnulib/lib/stdio-read.c create mode 100644 gnulib/lib/stdio-write.c create mode 100644 gnulib/lib/stdio.in.h create mode 100644 gnulib/lib/stdlib.in.h create mode 100644 gnulib/lib/strchrnul.c create mode 100644 gnulib/lib/strchrnul.valgrind create mode 100644 gnulib/lib/strdup.c create mode 100644 gnulib/lib/streq.h create mode 100644 gnulib/lib/string.in.h create mode 100644 gnulib/lib/strtok_r.c create mode 100644 gnulib/lib/sys_ioctl.in.h create mode 100644 gnulib/lib/sys_select.in.h create mode 100644 gnulib/lib/sys_socket.c create mode 100644 gnulib/lib/sys_socket.in.h create mode 100644 gnulib/lib/sys_stat.in.h create mode 100644 gnulib/lib/sys_time.in.h create mode 100644 gnulib/lib/sys_types.in.h create mode 100644 gnulib/lib/sys_uio.in.h create mode 100644 gnulib/lib/sys_utsname.in.h create mode 100644 gnulib/lib/sys_wait.in.h create mode 100644 gnulib/lib/termios.in.h create mode 100644 gnulib/lib/time.in.h create mode 100644 gnulib/lib/time_r.c create mode 100644 gnulib/lib/ttyname_r.c create mode 100644 gnulib/lib/uname.c create mode 100644 gnulib/lib/unistd.c create mode 100644 gnulib/lib/unistd.in.h create mode 100644 gnulib/lib/unitypes.in.h create mode 100644 gnulib/lib/uniwidth.in.h create mode 100644 gnulib/lib/uniwidth/cjk.h create mode 100644 gnulib/lib/uniwidth/width.c create mode 100644 gnulib/lib/vasnprintf.c create mode 100644 gnulib/lib/vasnprintf.h create mode 100644 gnulib/lib/verify.h create mode 100644 gnulib/lib/w32sock.h create mode 100644 gnulib/lib/waitpid.c create mode 100644 gnulib/lib/warn-on-use.h create mode 100644 gnulib/lib/wchar.in.h create mode 100644 gnulib/lib/wctype-h.c create mode 100644 gnulib/lib/wctype.in.h create mode 100644 gnulib/lib/wcwidth.c create mode 100644 gnulib/lib/xalloc-oversized.h create mode 100644 gnulib/lib/xsize.c create mode 100644 gnulib/lib/xsize.h delete mode 100644 gnulib/tests/Makefile.am create mode 100644 include/libvirt/Makefile.in create mode 100644 m4/00gnulib.m4 create mode 100644 m4/absolute-header.m4 create mode 100644 m4/alloca.m4 create mode 100644 m4/arpa_inet_h.m4 create mode 100644 m4/asm-underscore.m4 create mode 100644 m4/chown.m4 create mode 100644 m4/close.m4 create mode 100644 m4/codeset.m4 create mode 100644 m4/configmake.m4 create mode 100644 m4/dup2.m4 create mode 100644 m4/eealloc.m4 create mode 100644 m4/environ.m4 create mode 100644 m4/errno_h.m4 create mode 100644 m4/exponentd.m4 create mode 100644 m4/extensions.m4 create mode 100644 m4/extern-inline.m4 create mode 100644 m4/fcntl-o.m4 create mode 100644 m4/fcntl.m4 create mode 100644 m4/fcntl_h.m4 create mode 100644 m4/float_h.m4 create mode 100644 m4/fseek.m4 create mode 100644 m4/fseeko.m4 create mode 100644 m4/fstat.m4 create mode 100644 m4/getaddrinfo.m4 create mode 100644 m4/getdelim.m4 create mode 100644 m4/getdtablesize.m4 create mode 100644 m4/getgroups.m4 create mode 100644 m4/gethostname.m4 create mode 100644 m4/getline.m4 create mode 100644 m4/getpass.m4 create mode 100644 m4/getugroups.m4 create mode 100644 m4/gnulib-cache.m4 create mode 100644 m4/gnulib-common.m4 create mode 100644 m4/gnulib-comp.m4 create mode 100644 m4/gnulib-tool.m4 create mode 100644 m4/hostent.m4 create mode 100644 m4/include_next.m4 create mode 100644 m4/inet_ntop.m4 create mode 100644 m4/intmax_t.m4 create mode 100644 m4/inttypes_h.m4 create mode 100644 m4/ioctl.m4 create mode 100644 m4/largefile.m4 create mode 100644 m4/libtool.m4 create mode 100644 m4/libunistring-base.m4 create mode 100644 m4/limits-h.m4 create mode 100644 m4/localcharset.m4 create mode 100644 m4/locale_h.m4 create mode 100644 m4/localeconv.m4 create mode 100644 m4/lseek.m4 create mode 100644 m4/ltoptions.m4 create mode 100644 m4/ltsugar.m4 create mode 100644 m4/ltversion.m4 create mode 100644 m4/lt~obsolete.m4 create mode 100644 m4/malloc.m4 create mode 100644 m4/malloca.m4 create mode 100644 m4/manywarnings-c++.m4 create mode 100644 m4/manywarnings.m4 create mode 100644 m4/math_h.m4 create mode 100644 m4/memchr.m4 create mode 100644 m4/mgetgroups.m4 create mode 100644 m4/mmap-anon.m4 create mode 100644 m4/mode_t.m4 create mode 100644 m4/msvc-inval.m4 create mode 100644 m4/msvc-nothrow.m4 create mode 100644 m4/multiarch.m4 create mode 100644 m4/net_if_h.m4 create mode 100644 m4/netdb_h.m4 create mode 100644 m4/netinet_in_h.m4 create mode 100644 m4/nonblocking.m4 create mode 100644 m4/off_t.m4 create mode 100644 m4/open-cloexec.m4 create mode 100644 m4/open-slash.m4 create mode 100644 m4/open.m4 create mode 100644 m4/passfd.m4 create mode 100644 m4/pathmax.m4 create mode 100644 m4/physmem.m4 create mode 100644 m4/pipe.m4 create mode 100644 m4/pipe2.m4 create mode 100644 m4/poll.m4 create mode 100644 m4/poll_h.m4 create mode 100644 m4/posix-shell.m4 create mode 100644 m4/posix_openpt.m4 create mode 100644 m4/printf.m4 create mode 100644 m4/pthread_h.m4 create mode 100644 m4/pthread_sigmask.m4 create mode 100644 m4/pty.m4 create mode 100644 m4/pty_h.m4 create mode 100644 m4/raise.m4 create mode 100644 m4/rawmemchr.m4 create mode 100644 m4/realloc.m4 create mode 100644 m4/sched_h.m4 create mode 100644 m4/select.m4 create mode 100644 m4/servent.m4 create mode 100644 m4/sigaction.m4 create mode 100644 m4/signal_h.m4 create mode 100644 m4/signalblocking.m4 create mode 100644 m4/sigpipe.m4 create mode 100644 m4/size_max.m4 create mode 100644 m4/snprintf.m4 create mode 100644 m4/socketlib.m4 create mode 100644 m4/sockets.m4 create mode 100644 m4/socklen.m4 create mode 100644 m4/sockpfaf.m4 create mode 100644 m4/ssize_t.m4 create mode 100644 m4/stat-time.m4 create mode 100644 m4/stat.m4 create mode 100644 m4/stdalign.m4 create mode 100644 m4/stdbool.m4 create mode 100644 m4/stddef_h.m4 create mode 100644 m4/stdint.m4 create mode 100644 m4/stdint_h.m4 create mode 100644 m4/stdio_h.m4 create mode 100644 m4/stdlib_h.m4 create mode 100644 m4/strchrnul.m4 create mode 100644 m4/strdup.m4 create mode 100644 m4/string_h.m4 create mode 100644 m4/strtok_r.m4 create mode 100644 m4/sys_ioctl_h.m4 create mode 100644 m4/sys_select_h.m4 create mode 100644 m4/sys_socket_h.m4 create mode 100644 m4/sys_stat_h.m4 create mode 100644 m4/sys_time_h.m4 create mode 100644 m4/sys_types_h.m4 create mode 100644 m4/sys_uio_h.m4 create mode 100644 m4/sys_utsname_h.m4 create mode 100644 m4/sys_wait_h.m4 create mode 100644 m4/termios_h.m4 create mode 100644 m4/threadlib.m4 create mode 100644 m4/time_h.m4 create mode 100644 m4/time_r.m4 create mode 100644 m4/ttyname_r.m4 create mode 100644 m4/uname.m4 create mode 100644 m4/unistd_h.m4 create mode 100644 m4/vasnprintf.m4 create mode 100644 m4/waitpid.m4 create mode 100644 m4/warn-on-use.m4 create mode 100644 m4/warnings.m4 create mode 100644 m4/wchar_h.m4 create mode 100644 m4/wchar_t.m4 create mode 100644 m4/wctype_h.m4 create mode 100644 m4/wcwidth.m4 create mode 100644 m4/wint_t.m4 create mode 100644 m4/xsize.m4 create mode 100644 po/Makefile.in create mode 100644 src/Makefile.in delete mode 100644 src/secret/secret_util.c delete mode 100644 src/secret/secret_util.h create mode 100644 tests/Makefile.in create mode 100644 tools/Makefile.in -- 2.24.1

2 21

[libvirt] Plans for next release
by Daniel Veillard 09 Jan '20

09 Jan '20

The next release 6.0.0 should land around 15 January (and 6.1.0 back at the end of Feb), this means we should enter freeze soon, I suggest tomorrow Friday, with the goal of an RC2 on Monday for a release on Wednesday assuming everything is fine. thanks Dan for the reminder :-) hope this works for everyone ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [jenkins-ci PATCH] guests: Fix indentation in README
by Andrea Bolognani 08 Jan '20

08 Jan '20

Text that we want to show up as monospace needs to be indented by at least four spaces. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/README.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guests/README.markdown b/guests/README.markdown index d10727c..f225da7 100644 --- a/guests/README.markdown +++ b/guests/README.markdown @@ -159,14 +159,14 @@ the official qcow2 images can be used to quickly bring up such guests. The default qcow2 images are sized too small to be usable. To enlarge them do - $ virsh blockresize libvirt-freebsd-$MAJOR \ - /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 15G + $ virsh blockresize libvirt-freebsd-$MAJOR \ + /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 15G Then inside the guest, as root, enlarge the 3rd partition & filesystem to consume all new space: - # gpart resize -i 3 vtbd0 - # service growfs onestart + # gpart resize -i 3 vtbd0 + # service growfs onestart Some manual tweaking will be needed, in particular: -- 2.24.1

1 0

[libvirt] [jenkins-ci PATCH v2 0/2] Add all possible projects to OpenSUSE 15.1
by Fabiano Fidêncio 08 Jan '20

08 Jan '20

Now that OpenSUSE 15.1 is a thing on libvirt-jenkins-ci, let's add all possible projects to the OS, doing the needed mappings adjustments whenever needed. Changes since v1: https://www.redhat.com/archives/libvir-list/2020-January/msg00321.html - Added libvirt-perl and updated the mappings accordingly. Fabiano Fidêncio (2): guests: Add projects to OpenSUSE 15.1 mappings: Adjust mappings for OpenSUSE 15.1 guests/host_vars/libvirt-opensuse-151/main.yml | 14 ++++++++++++++ guests/playbooks/build/projects/virt-manager.yml | 2 ++ guests/vars/mappings.yml | 15 +++++++++++++++ 3 files changed, 31 insertions(+) -- 2.24.1

2 5

[libvirt] [PATCH 0/5] introduce support for CPU dies in host/guest topology
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Latest generation CPUs (CascadeLake-AP) support a new topology level known as a 'die', sitting between a socket and a core. QEMU supports this with -smp arg since 4.1.0 Linux can report this via /sys/devices/system/cpu/cpuNNN/topology via 'die_id' and 'die_cpus' and 'die_cpus_list' files since 5.2 This series adds support for <topology> in guest XML to have a new 'dies' parameter, passed to QEMU, which defaults to '1' if omitted. It extends host capabilities so that NUMA topology reports a new 'die_id' attribute We can't expand 'virNodeInfoPtr' struct to have a die field, so this will remain forever reporting 'cores' as being 'dies * cores'. The <topology> in host capabilities XML is an interesting question. If we are strict with our API semantics we would *not* add a 'dies' parameter with any value other than '1' to <topology> in the host capabilities. If we reported a value other than 1, then any existing apps which multiple sockets*cores*threads will get the wrong total CPU count. We already know <topology> is broken by design for asymetric hardware, so we could simply document that it will forever be broken wrt to CPU dies too. In this case we might be better to not even report 'dies=1', just leave out the attr entirely. Interestingly though, <topology> is already more broken than it should be. For a VM with -smp 12,sockets=2,dies=3,cores=2,threads=1 it is reporting <topology sockets=1 dies=1 cores=12 threads=1>. It should at least do <topology sockets=2 dies=1 cores=6 threads=1>. I suspect the presence of dies is confusing the really incredibly horrible logic in virHostCPUGetInfoLinux. This will also impact virNodeInfoPtr data. So even if we don't report dies, I think we still have a bug that needs fixing here for the coarse node topology. I'm also confused about what I see with EPYC. IIUC, it was supposed to use the 'dies' concept, but in machines I've tested, Linux never reports die count other than 1. Perhaps only certain EPYC CPU models or generations use 'dies', or perhaps Linux isn't reporting correctly for EPYC, or perhaps I'm mislead into believeing it uses dies. Anyway, the upshot is I've not found any real hardware to test this series on. I've tested it only inside a QEMU guest with the suitable -smp arg to fake dies. Daniel P. Berrangé (5): conf: add support for specifying CPU "dies" parameter conf: remove unused virCapabilitiesSetHostCPU method qemu: add support for specifying CPU "dies" topology parameter hostcpu: add support for reporting die_id in NUMA topology tests: add host CPU data files for validating die_id docs/formatcaps.html.in | 2 +- docs/formatdomain.html.in | 14 +- docs/schemas/capability.rng | 3 + docs/schemas/cputypes.rng | 5 + src/bhyve/bhyve_command.c | 5 + src/conf/capabilities.c | 26 +- src/conf/capabilities.h | 7 +- src/conf/cpu_conf.c | 18 +- src/conf/cpu_conf.h | 1 + src/conf/domain_conf.c | 3 +- src/cpu/cpu.c | 1 + src/libvirt_linux.syms | 1 + src/libvirt_private.syms | 1 - src/libxl/libxl_capabilities.c | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 12 +- src/util/virhostcpu.c | 16 + src/util/virhostcpu.h | 1 + src/vmx/vmx.c | 7 + .../x86_64-host+guest,model486-result.xml | 2 +- .../x86_64-host+guest,models-result.xml | 2 +- .../cputestdata/x86_64-host+guest-result.xml | 2 +- tests/cputestdata/x86_64-host+guest.xml | 2 +- .../x86_64-host+host-model-nofallback.xml | 2 +- ...t-Haswell-noTSX+Haswell,haswell-result.xml | 2 +- ...ell-noTSX+Haswell-noTSX,haswell-result.xml | 2 +- ...ost-Haswell-noTSX+Haswell-noTSX-result.xml | 2 +- .../x86_64-host-worse+guest-result.xml | 2 +- .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../ppc64-modern-bulk-result-conf.xml | 2 +- .../ppc64-modern-bulk-result-live.xml | 2 +- .../ppc64-modern-individual-result-conf.xml | 2 +- .../ppc64-modern-individual-result-live.xml | 2 +- .../x86-modern-bulk-result-conf.xml | 2 +- .../x86-modern-bulk-result-live.xml | 2 +- .../x86-modern-individual-add-result-conf.xml | 2 +- .../x86-modern-individual-add-result-live.xml | 2 +- .../x86-old-bulk-result-conf.xml | 2 +- .../x86-old-bulk-result-live.xml | 2 +- .../cpu-hotplug-granularity.xml | 2 +- .../qemuxml2argvdata/cpu-hotplug-startup.xml | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.xml | 2 +- .../qemuxml2argvdata/cpu-numa-disordered.xml | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.xml | 2 +- .../cpu-numa-no-memory-element.xml | 2 +- tests/qemuxml2argvdata/cpu-numa1.xml | 2 +- tests/qemuxml2argvdata/cpu-numa2.xml | 2 +- tests/qemuxml2argvdata/cpu-numa3.xml | 2 +- tests/qemuxml2argvdata/cpu-topology1.xml | 2 +- tests/qemuxml2argvdata/cpu-topology2.xml | 2 +- tests/qemuxml2argvdata/cpu-topology3.xml | 2 +- .../fd-memory-no-numa-topology.xml | 2 +- .../fd-memory-numa-topology.xml | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.xml | 2 +- .../graphics-spice-timeout.xml | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.xml | 2 +- ...memory-default-hugepage.x86_64-latest.args | 2 +- .../memfd-memory-default-hugepage.xml | 2 +- .../memfd-memory-numa.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +- tests/qemuxml2argvdata/memory-align-fail.xml | 2 +- .../memory-hotplug-dimm-addr.xml | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm.xml | 2 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-access.xml | 2 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-align.xml | 2 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-label.xml | 2 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-pmem.xml | 2 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-readonly.xml | 2 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm.xml | 2 +- tests/qemuxml2argvdata/memory-hotplug.xml | 2 +- .../numad-auto-memory-vcpu-cpuset.xml | 2 +- ...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +- .../numad-auto-vcpu-no-numatune.xml | 2 +- ...d-auto-vcpu-static-numatune-no-nodeset.xml | 2 +- .../numad-auto-vcpu-static-numatune.xml | 2 +- .../numad-static-memory-auto-vcpu.xml | 2 +- .../numad-static-vcpu-no-numatune.xml | 2 +- tests/qemuxml2argvdata/numad.xml | 2 +- .../numatune-auto-nodeset-invalid.xml | 2 +- .../numatune-memory-invalid-nodeset.xml | 2 +- tests/qemuxml2argvdata/numatune-memory.xml | 2 +- .../pci-expander-bus-bad-machine.xml | 2 +- tests/qemuxml2argvdata/pci-expander-bus.xml | 2 +- .../pcie-expander-bus-bad-bus.xml | 2 +- .../pcie-expander-bus-bad-machine.xml | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.xml | 2 +- .../pseries-default-phb-numa-node.xml | 2 +- .../pseries-phb-numa-node.xml | 2 +- tests/qemuxml2argvdata/smp-dies.args | 29 ++ tests/qemuxml2argvdata/smp-dies.xml | 33 ++ tests/qemuxml2argvdata/smp.xml | 2 +- tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmloutdata/cpu-numa-disjoint.xml | 2 +- .../cpu-numa-disordered.xml | 2 +- .../qemuxml2xmloutdata/cpu-numa-memshared.xml | 2 +- .../cpu-numa-no-memory-element.xml | 2 +- tests/qemuxml2xmloutdata/cpu-numa1.xml | 2 +- tests/qemuxml2xmloutdata/cpu-numa2.xml | 2 +- .../graphics-spice-timeout.xml | 2 +- .../memory-hotplug-dimm.xml | 2 +- tests/qemuxml2xmloutdata/memory-hotplug.xml | 2 +- .../numad-auto-memory-vcpu-cpuset.xml | 2 +- ...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +- .../numad-auto-vcpu-no-numatune.xml | 2 +- .../numad-static-vcpu-no-numatune.xml | 2 +- tests/qemuxml2xmloutdata/pci-expander-bus.xml | 2 +- .../qemuxml2xmloutdata/pcie-expander-bus.xml | 2 +- .../pseries-phb-numa-node.xml | 2 +- tests/qemuxml2xmloutdata/smp.xml | 2 +- .../linux-basic-dies/system/cpu | 1 + .../linux-basic-dies/system/node | 1 + .../vircaps2xmldata/vircaps-aarch64-basic.xml | 32 +- .../vircaps-x86_64-basic-dies.xml | 35 ++ .../vircaps2xmldata/vircaps-x86_64-basic.xml | 32 +- .../vircaps2xmldata/vircaps-x86_64-caches.xml | 16 +- .../vircaps-x86_64-resctrl-cdp.xml | 24 +- .../vircaps-x86_64-resctrl-cmt.xml | 24 +- .../vircaps-x86_64-resctrl-fake-feature.xml | 24 +- .../vircaps-x86_64-resctrl-skx-twocaches.xml | 2 +- .../vircaps-x86_64-resctrl-skx.xml | 2 +- .../vircaps-x86_64-resctrl.xml | 24 +- tests/vircaps2xmltest.c | 1 + .../cpu/cpu0/topology/core_cpus | 1 + .../cpu/cpu0/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/core_siblings | 1 + .../cpu/cpu0/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu0/topology/die_cpus | 1 + .../cpu/cpu0/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu0/topology/die_id | 1 + .../cpu/cpu0/topology/package_cpus | 1 + .../cpu/cpu0/topology/package_cpus_list | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu1/online | 1 + .../cpu/cpu1/topology/core_cpus | 1 + .../cpu/cpu1/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/core_siblings | 1 + .../cpu/cpu1/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu1/topology/die_cpus | 1 + .../cpu/cpu1/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu1/topology/die_id | 1 + .../cpu/cpu1/topology/package_cpus | 1 + .../cpu/cpu1/topology/package_cpus_list | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu10/online | 1 + .../cpu/cpu10/topology/core_cpus | 1 + .../cpu/cpu10/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu10/topology/core_id | 1 + .../cpu/cpu10/topology/core_siblings | 1 + .../cpu/cpu10/topology/core_siblings_list | 1 + .../cpu/cpu10/topology/die_cpus | 1 + .../cpu/cpu10/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu10/topology/die_id | 1 + .../cpu/cpu10/topology/package_cpus | 1 + .../cpu/cpu10/topology/package_cpus_list | 1 + .../cpu/cpu10/topology/physical_package_id | 1 + .../cpu/cpu10/topology/thread_siblings | 1 + .../cpu/cpu10/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu11/online | 1 + .../cpu/cpu11/topology/core_cpus | 1 + .../cpu/cpu11/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu11/topology/core_id | 1 + .../cpu/cpu11/topology/core_siblings | 1 + .../cpu/cpu11/topology/core_siblings_list | 1 + .../cpu/cpu11/topology/die_cpus | 1 + .../cpu/cpu11/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu11/topology/die_id | 1 + .../cpu/cpu11/topology/package_cpus | 1 + .../cpu/cpu11/topology/package_cpus_list | 1 + .../cpu/cpu11/topology/physical_package_id | 1 + .../cpu/cpu11/topology/thread_siblings | 1 + .../cpu/cpu11/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu2/online | 1 + .../cpu/cpu2/topology/core_cpus | 1 + .../cpu/cpu2/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/core_siblings | 1 + .../cpu/cpu2/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu2/topology/die_cpus | 1 + .../cpu/cpu2/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu2/topology/die_id | 1 + .../cpu/cpu2/topology/package_cpus | 1 + .../cpu/cpu2/topology/package_cpus_list | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu3/online | 1 + .../cpu/cpu3/topology/core_cpus | 1 + .../cpu/cpu3/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/core_siblings | 1 + .../cpu/cpu3/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu3/topology/die_cpus | 1 + .../cpu/cpu3/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu3/topology/die_id | 1 + .../cpu/cpu3/topology/package_cpus | 1 + .../cpu/cpu3/topology/package_cpus_list | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu4/online | 1 + .../cpu/cpu4/topology/core_cpus | 1 + .../cpu/cpu4/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/core_siblings | 1 + .../cpu/cpu4/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu4/topology/die_cpus | 1 + .../cpu/cpu4/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu4/topology/die_id | 1 + .../cpu/cpu4/topology/package_cpus | 1 + .../cpu/cpu4/topology/package_cpus_list | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../cpu/cpu4/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu5/online | 1 + .../cpu/cpu5/topology/core_cpus | 1 + .../cpu/cpu5/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/core_siblings | 1 + .../cpu/cpu5/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu5/topology/die_cpus | 1 + .../cpu/cpu5/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu5/topology/die_id | 1 + .../cpu/cpu5/topology/package_cpus | 1 + .../cpu/cpu5/topology/package_cpus_list | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings | 1 + .../cpu/cpu5/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu6/online | 1 + .../cpu/cpu6/topology/core_cpus | 1 + .../cpu/cpu6/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/core_siblings | 1 + .../cpu/cpu6/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu6/topology/die_cpus | 1 + .../cpu/cpu6/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu6/topology/die_id | 1 + .../cpu/cpu6/topology/package_cpus | 1 + .../cpu/cpu6/topology/package_cpus_list | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../cpu/cpu6/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu7/online | 1 + .../cpu/cpu7/topology/core_cpus | 1 + .../cpu/cpu7/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/core_siblings | 1 + .../cpu/cpu7/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu7/topology/die_cpus | 1 + .../cpu/cpu7/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu7/topology/die_id | 1 + .../cpu/cpu7/topology/package_cpus | 1 + .../cpu/cpu7/topology/package_cpus_list | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings | 1 + .../cpu/cpu7/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu8/online | 1 + .../cpu/cpu8/topology/core_cpus | 1 + .../cpu/cpu8/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu8/topology/core_id | 1 + .../cpu/cpu8/topology/core_siblings | 1 + .../cpu/cpu8/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu8/topology/die_cpus | 1 + .../cpu/cpu8/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu8/topology/die_id | 1 + .../cpu/cpu8/topology/package_cpus | 1 + .../cpu/cpu8/topology/package_cpus_list | 1 + .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + .../linux-with-die/cpu/cpu9/online | 1 + .../cpu/cpu9/topology/core_cpus | 1 + .../cpu/cpu9/topology/core_cpus_list | 1 + .../linux-with-die/cpu/cpu9/topology/core_id | 1 + .../cpu/cpu9/topology/core_siblings | 1 + .../cpu/cpu9/topology/core_siblings_list | 1 + .../linux-with-die/cpu/cpu9/topology/die_cpus | 1 + .../cpu/cpu9/topology/die_cpus_list | 1 + .../linux-with-die/cpu/cpu9/topology/die_id | 1 + .../cpu/cpu9/topology/package_cpus | 1 + .../cpu/cpu9/topology/package_cpus_list | 1 + .../cpu/cpu9/topology/physical_package_id | 1 + .../cpu/cpu9/topology/thread_siblings | 1 + .../cpu/cpu9/topology/thread_siblings_list | 1 + .../virhostcpudata/linux-with-die/cpu/online | 1 + .../virhostcpudata/linux-with-die/cpu/present | 1 + .../linux-with-die/node/node0/cpu0 | 1 + .../linux-with-die/node/node0/cpu1 | 1 + .../linux-with-die/node/node0/cpu10 | 1 + .../linux-with-die/node/node0/cpu11 | 1 + .../linux-with-die/node/node0/cpu2 | 1 + .../linux-with-die/node/node0/cpu3 | 1 + .../linux-with-die/node/node0/cpu4 | 1 + .../linux-with-die/node/node0/cpu5 | 1 + .../linux-with-die/node/node0/cpu6 | 1 + .../linux-with-die/node/node0/cpu7 | 1 + .../linux-with-die/node/node0/cpu8 | 1 + .../linux-with-die/node/node0/cpu9 | 1 + .../linux-with-die/node/node0/cpulist | 1 + .../virhostcpudata/linux-with-die/node/online | 1 + .../linux-with-die/node/possible | 1 + .../linux-x86_64-with-die.cpuinfo | 324 ++++++++++++++++++ .../linux-x86_64-with-die.expected | 1 + tests/virhostcputest.c | 1 + .../vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 2 +- .../vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml | 2 +- 324 files changed, 887 insertions(+), 228 deletions(-) create mode 100644 tests/qemuxml2argvdata/smp-dies.args create mode 100644 tests/qemuxml2argvdata/smp-dies.xml create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/cpu create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/node create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-with-die/cpu/online create mode 100644 tests/virhostcpudata/linux-with-die/cpu/present create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu0 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu1 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu10 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu11 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu2 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu3 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu4 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu5 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu6 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu7 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu8 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu9 create mode 100644 tests/virhostcpudata/linux-with-die/node/node0/cpulist create mode 100644 tests/virhostcpudata/linux-with-die/node/online create mode 100644 tests/virhostcpudata/linux-with-die/node/possible create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.cpuinfo create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.expected -- 2.23.0

3 16

[libvirt] [jenkins-ci PATCH v3 0/7] Add support for gtk-vnc builds
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Support gtk-vnc and make virt-viewer depend on it I sent this months ago & forgot to push it. Re-sending just in case something has invalidated any patches. I've at least added the newer distros This time with gdk-pixbuf added and previous suggested fixes Daniel P. Berrangé (7): mappings: add libgcrypt mappings: add PulseAudio mappings: add gdk-pixbuf guests: pull in deps for gtk-vnc project projects: add gtk-vnc project projects: make virt-viewer depend on gtk-vnc jobs mappings: remove gtk-vnc2 guests/host_vars/libvirt-centos-7/main.yml | 1 + guests/host_vars/libvirt-centos-8/main.yml | 1 + guests/host_vars/libvirt-debian-10/main.yml | 1 + guests/host_vars/libvirt-debian-9/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 1 + guests/host_vars/libvirt-fedora-30/main.yml | 3 ++ guests/host_vars/libvirt-fedora-31/main.yml | 1 + .../host_vars/libvirt-fedora-rawhide/main.yml | 1 + guests/host_vars/libvirt-freebsd-11/main.yml | 1 + guests/host_vars/libvirt-freebsd-12/main.yml | 1 + .../libvirt-freebsd-current/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1604/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1804/main.yml | 1 + guests/playbooks/build/jobs/defaults.yml | 3 ++ .../build/projects/gtk-vnc+mingw32.yml | 12 ++++++ .../build/projects/gtk-vnc+mingw64.yml | 12 ++++++ guests/playbooks/build/projects/gtk-vnc.yml | 19 +++++++++ guests/vars/mappings.yml | 42 +++++++++++++------ guests/vars/projects/gtk-vnc+mingw32.yml | 7 ++++ guests/vars/projects/gtk-vnc+mingw64.yml | 7 ++++ guests/vars/projects/gtk-vnc.yml | 12 ++++++ guests/vars/projects/virt-viewer+mingw32.yml | 1 - guests/vars/projects/virt-viewer+mingw64.yml | 1 - guests/vars/projects/virt-viewer.yml | 1 - jenkins/jobs/defaults.yaml | 3 ++ jenkins/projects/gtk-vnc+mingw32.yaml | 12 ++++++ jenkins/projects/gtk-vnc+mingw64.yaml | 12 ++++++ jenkins/projects/gtk-vnc.yaml | 15 +++++++ jenkins/projects/virt-viewer+mingw32.yaml | 4 +- jenkins/projects/virt-viewer+mingw64.yaml | 4 +- jenkins/projects/virt-viewer.yaml | 4 +- 31 files changed, 167 insertions(+), 19 deletions(-) create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw32.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw64.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw32.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw64.yml create mode 100644 guests/vars/projects/gtk-vnc.yml create mode 100644 jenkins/projects/gtk-vnc+mingw32.yaml create mode 100644 jenkins/projects/gtk-vnc+mingw64.yaml create mode 100644 jenkins/projects/gtk-vnc.yaml -- 2.23.0

2 13

[libvirt] [PATCH] schema: Allow iSCSI source to have interleaved children
by Michal Privoznik 08 Jan '20

08 Jan '20

There is no need to require users to produce iSCSI disk source following our ordering of children elements. In fact, we don't even accept our own order in the schema :(. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/schemas/domaincommon.rng | 24 ++++++++++--------- .../disk-network-iscsi-modern.args | 9 ++++++- .../disk-network-iscsi-modern.xml | 13 ++++++++++ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9b555d6acb..76d94b156f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1772,17 +1772,19 @@ <value>iscsi</value> </attribute> <attribute name="name"/> - <ref name="diskSourceCommon"/> - <ref name="diskSourceNetworkHost"/> - <optional> - <ref name="diskAuth"/> - </optional> - <optional> - <ref name="encryption"/> - </optional> - <optional> - <ref name="initiatorinfo"/> - </optional> + <interleave> + <ref name="diskSourceCommon"/> + <ref name="diskSourceNetworkHost"/> + <optional> + <ref name="diskAuth"/> + </optional> + <optional> + <ref name="encryption"/> + </optional> + <optional> + <ref name="initiatorinfo"/> + </optional> + </interleave> </element> </define> diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args index 762dc0e04a..57eaeb40ee 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args @@ -58,4 +58,11 @@ file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,\ file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,\ id=drive-scsi0-0-0-1 \ -device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,\ -drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 +drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \ +-drive file.driver=iscsi,file.portal=example.org:3260,\ +file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,\ +file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,\ +file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,\ +id=drive-scsi0-0-0-2 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=2,\ +drive=drive-scsi0-0-0-2,id=scsi0-0-0-2 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml index 759d5e217f..07bb457bfa 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml @@ -65,6 +65,19 @@ </source> <target dev='sdb' bus='scsi'/> </disk> + <disk type='network' device='lun'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example:server/0'> + <host name='example.org' port='3260'/> + <initiator> + <iqn name='iqn.1992-01.com.example:client'/> + </initiator> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + </source> + <target dev='sdc' bus='scsi'/> + </disk> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <controller type='scsi' index='0' model='virtio-scsi'/> -- 2.24.1

2 1

[libvirt] [jenkins-ci PATCH v2] guests: add more detailed docs on deploying FreeBSD
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Provide instructions on how to download & deploy a working FreeBSD install that's suitable for CI, as there are several gotchas not mentioned in the current docs. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/README.markdown | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/guests/README.markdown b/guests/README.markdown index 7e63540..d450b4a 100644 --- a/guests/README.markdown +++ b/guests/README.markdown @@ -137,6 +137,37 @@ FreeBSD Installation of FreeBSD guests must be performed manually; alternatively, the official qcow2 images can be used to quickly bring up such guests. + $ MAJOR=12 + $ MINOR=1 + $ VER=$MAJOR.$MINOR-RELEASE + $ sudo wget -O /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2.xz \ + https://download.freebsd.org/ftp/releases/VM-IMAGES/$VER/amd64/Latest/FreeB… + $ sudo unxz /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2.xz + $ sudo virt-install \ + --import \ + --name libvirt-freebsd-$MAJOR \ + --vcpus 2 \ + --graphics vnc \ + --noautoconsole \ + --console pty \ + --sound none \ + --rng device=/dev/urandom,model=virtio \ + --memory 2048 \ + --os-variant freebsd$MAJOR.0 \ + --disk /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 + +The default qcow2 images are sized too small to be usable. To enlarge +them do + + $ sudo virsh blockresize libvirt-freebsd-$MAJOR \ + /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 20G + +Then inside the guest, as root, enlarge the 3rd partition & filesystem +to consume all new space: + + # gpart resize -i 3 vtbd0 + # service growfs onestart + Some manual tweaking will be needed, in particular: * `/etc/ssh/sshd_config` must contain the `PermitRootLogin yes` directive; -- 2.23.0

2 1

[libvirt] [PATCH] jenkins: skip gtk-vnc RPM build on centos 8
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

We don't have a centos 8 host deployed in CI at this time Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- jenkins/projects/gtk-vnc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/jenkins/projects/gtk-vnc.yaml b/jenkins/projects/gtk-vnc.yaml index 95ff14b..4887000 100644 --- a/jenkins/projects/gtk-vnc.yaml +++ b/jenkins/projects/gtk-vnc.yaml @@ -15,7 +15,6 @@ # RPM build is still not possible on CentOS7 as it does not # have the needed RPM macros for meson. machines: - - libvirt-centos-8 - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide -- 2.24.1

2 1

[libvirt] [jenkins-ci PATCH] jenkins: recursively update submodules on checkout
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

The ansible playback runs 'git submodule update --init', so we should have jenkins do the equivalent to ensure consistent build environment setup. In particular this works arounda bug with Meson when using GIT on CentOS 7, causing it to fail to automatically update the submodules. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- jenkins/jobs/autotools.yaml | 2 ++ jenkins/jobs/generic.yaml | 2 ++ jenkins/jobs/go.yaml | 2 ++ jenkins/jobs/meson.yaml | 2 ++ jenkins/jobs/perl-modulebuild.yaml | 2 ++ jenkins/jobs/python-distutils.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/jenkins/jobs/autotools.yaml b/jenkins/jobs/autotools.yaml index 413af73..6b4d3f8 100644 --- a/jenkins/jobs/autotools.yaml +++ b/jenkins/jobs/autotools.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/generic.yaml b/jenkins/jobs/generic.yaml index ca69513..46425ec 100644 --- a/jenkins/jobs/generic.yaml +++ b/jenkins/jobs/generic.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/go.yaml b/jenkins/jobs/go.yaml index 1bdcb5f..3d25493 100644 --- a/jenkins/jobs/go.yaml +++ b/jenkins/jobs/go.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/meson.yaml b/jenkins/jobs/meson.yaml index 4d84978..bf7e8ef 100644 --- a/jenkins/jobs/meson.yaml +++ b/jenkins/jobs/meson.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/perl-modulebuild.yaml b/jenkins/jobs/perl-modulebuild.yaml index 7173493..cea0597 100644 --- a/jenkins/jobs/perl-modulebuild.yaml +++ b/jenkins/jobs/perl-modulebuild.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/python-distutils.yaml b/jenkins/jobs/python-distutils.yaml index f56794c..4921aa7 100644 --- a/jenkins/jobs/python-distutils.yaml +++ b/jenkins/jobs/python-distutils.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' -- 2.23.0

2 1

Re: [libvirt] [Libvirt-ci] Build failed in Jenkins: libosinfo-build » libvirt-debian-9 #307
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

On Tue, Jan 07, 2020 at 07:01:53PM +0000, ci(a)centos.org wrote: > See <https://ci.centos.org/job/libosinfo-build/systems=libvirt-debian-9/307/disp…> > <https://ci.centos.org/job/libosinfo-build/systems=libvirt-debian-9/ws/build…>: /home/jenkins/build/libvirt/lib/x86_64-linux-gnu/libosinfo-1.0.so.0: version `LIBOSINFO_1.8.0' not found (required by <https://ci.centos.org/job/libosinfo-build/systems=libvirt-debian-9/ws/build…)> This problem is a bug in g-ir-scanner on Debian 9. It is mistakenly linking against the libosinfo.so installed by the prevuous build in $HOME/build/libvirt, instead of the one it just built locally. https://bugzilla.gnome.org/show_bug.cgi?id=781525 I fixed by # ssh jenkins@libvirt-debian-9 $ cd build $ find | grep libosinfo-1.0.so | xargs rm and then re-triggered the jobs. It will potentially re-occurr any time we add a new public API to libosinfo Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 2

[libvirt] [perl PATCH] make Time::HiRes optional in test suite
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- t/800-events.t | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/t/800-events.t b/t/800-events.t index dfbba8f..b7e767f 100644 --- a/t/800-events.t +++ b/t/800-events.t @@ -3,20 +3,24 @@ use strict; use warnings; -use Test::More tests => 23; +use Test::More; my $URI = "test:///default"; my $DOM = "test"; BEGIN { - use_ok('Sys::Virt'); + eval 'use Time::HiRes qw(gettimeofday)'; + if ($@) { + plan skip_all => "Time::HiRes is not available"; + return; + } + plan tests => 23; + use_ok('Sys::Virt'); } package Sys::Virt::Event::Simple; -use Time::HiRes qw(gettimeofday); - use base qw(Sys::Virt::Event); sub new { @@ -38,7 +42,7 @@ sub new { sub _now { my $self; - my @now = gettimeofday; + my @now = &Time::HiRes::gettimeofday(); return $now[0] * 1000 + (($now[1] - ($now[1] % 1000)) / 1000); } -- 2.23.0

2 1

[libvirt] [jenkins-ci PATCH] jobs: Fix autotools-check-job
by Andrea Bolognani 08 Jan '20

08 Jan '20

find expects {} to be used as placeholder for filenames, but that confuses Jenkins Job Builder which uses {foo} for variables. Use xargs in a pipe instead. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the build breaker rule. guests/playbooks/build/jobs/autotools-check-job.yml | 2 +- jenkins/jobs/autotools.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guests/playbooks/build/jobs/autotools-check-job.yml b/guests/playbooks/build/jobs/autotools-check-job.yml index a306902..7aa2a04 100644 --- a/guests/playbooks/build/jobs/autotools-check-job.yml +++ b/guests/playbooks/build/jobs/autotools-check-job.yml @@ -9,7 +9,7 @@ cd build if ! $MAKE check then - find -name test-suite.log -exec cat {} \; + find -name test-suite.log | xargs cat exit 1 fi when: diff --git a/jenkins/jobs/autotools.yaml b/jenkins/jobs/autotools.yaml index 72dd72e..413af73 100644 --- a/jenkins/jobs/autotools.yaml +++ b/jenkins/jobs/autotools.yaml @@ -126,7 +126,7 @@ cd build if ! $MAKE check then - find -name test-suite.log -exec cat {} \; + find -name test-suite.log | xargs cat exit 1 fi publishers: -- 2.24.1

1 0

[libvirt] [jenkins-ci PATCH] guests: optionally wait for installation completion
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

The install command is hardcoded to put the virt-install command into the background. It is useful to be able to wait for completion, so you know when you can go onto the package update step of setup, without having to check back to see if the guest has finished installing. Using --noautoconsole is preferred syntax for virt-install, avoiding a warning about use of "--wait 0". Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/lcitool | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index d24ac0d..8a681e4 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -394,11 +394,20 @@ class Application: help="target architecture for cross compiler", ) + def add_wait_arg(parser): + parser.add_argument( + "-w", "--wait", + help="wait for installation to complete", + default=False, + action="store_true", + ) + installparser = subparsers.add_parser( "install", help="perform unattended host installation") installparser.set_defaults(func=self._action_install) add_hosts_arg(installparser) + add_wait_arg(installparser) updateparser = subparsers.add_parser( "update", help="prepare hosts and keep them updated") @@ -597,9 +606,11 @@ class Application: "--rng", "device=/dev/urandom,model=virtio", "--initrd-inject", initrd_inject, "--extra-args", extra_arg, - "--wait", "0", ] + if not args.wait: + cmd.append("--noautoconsole") + # Only configure autostart for the guest for the jenkins flavor if flavor == "jenkins": cmd += ["--autostart"] -- 2.23.0

2 2

[libvirt] [jenkins-ci PATCH v4 0/7] Add support for gtk-vnc builds
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Support gtk-vnc and make virt-viewer depend on it v3: https://www.redhat.com/archives/libvir-list/2019-December/msg00957.html Daniel P. Berrangé (7): mappings: add libgcrypt mappings: add PulseAudio mappings: add gdk-pixbuf guests: pull in deps for gtk-vnc project projects: add gtk-vnc project projects: make virt-viewer depend on gtk-vnc jobs mappings: remove gtk-vnc2 guests/host_vars/libvirt-centos-7/main.yml | 1 + guests/host_vars/libvirt-centos-8/main.yml | 1 + guests/host_vars/libvirt-debian-10/main.yml | 1 + guests/host_vars/libvirt-debian-9/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 1 + guests/host_vars/libvirt-fedora-30/main.yml | 3 ++ guests/host_vars/libvirt-fedora-31/main.yml | 1 + .../host_vars/libvirt-fedora-rawhide/main.yml | 1 + guests/host_vars/libvirt-freebsd-11/main.yml | 1 + guests/host_vars/libvirt-freebsd-12/main.yml | 1 + .../libvirt-freebsd-current/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1604/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1804/main.yml | 1 + guests/playbooks/build/jobs/defaults.yml | 3 ++ .../build/projects/gtk-vnc+mingw32.yml | 12 ++++++ .../build/projects/gtk-vnc+mingw64.yml | 12 ++++++ guests/playbooks/build/projects/gtk-vnc.yml | 19 +++++++++ guests/vars/mappings.yml | 42 +++++++++++++------ guests/vars/projects/gtk-vnc+mingw32.yml | 7 ++++ guests/vars/projects/gtk-vnc+mingw64.yml | 7 ++++ guests/vars/projects/gtk-vnc.yml | 12 ++++++ guests/vars/projects/virt-viewer+mingw32.yml | 1 - guests/vars/projects/virt-viewer+mingw64.yml | 1 - guests/vars/projects/virt-viewer.yml | 1 - jenkins/jobs/defaults.yaml | 3 ++ jenkins/projects/gtk-vnc+mingw32.yaml | 12 ++++++ jenkins/projects/gtk-vnc+mingw64.yaml | 12 ++++++ jenkins/projects/gtk-vnc.yaml | 22 ++++++++++ jenkins/projects/virt-viewer+mingw32.yaml | 4 +- jenkins/projects/virt-viewer+mingw64.yaml | 4 +- jenkins/projects/virt-viewer.yaml | 4 +- 31 files changed, 174 insertions(+), 19 deletions(-) create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw32.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw64.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw32.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw64.yml create mode 100644 guests/vars/projects/gtk-vnc.yml create mode 100644 jenkins/projects/gtk-vnc+mingw32.yaml create mode 100644 jenkins/projects/gtk-vnc+mingw64.yaml create mode 100644 jenkins/projects/gtk-vnc.yaml -- 2.23.0

2 10

[libvirt] [PATCH v3 00/11] esx: various improvements
by Pino Toscano 08 Jan '20

08 Jan '20

- fix a bug in the esx VI generator - implement connectListAllStoragePools, so virConnectListAllStoragePools() works - implement connectListAllNetworks, so virConnectListAllNetworks() works - implement storagePoolListAllVolumes, so virStoragePoolListAllVolumes() works - implement domainGetHostname, so virDomainGetHostname() works - implement domainInterfaceAddresses only for VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT, so virDomainInterfaceAddresses() partially works - improve virErrorNumber for some virReportError() calls TODO: - handle the comments in v2 about esxStoragePoolListAllVolumes() Changes from v2: - pushed patches reviewed with no changes required - integrated the Reviewed-By in patches that required very minor changes, will push them on request - fixed bool/size_t error/count handling - bumped API version numbers to 6.0.0 - fixed a bug in the esx VI generator - implemented domainGetHostname - implemented domainInterfaceAddresses Pino Toscano (11): esx: implement connectListAllStoragePools esx: implement connectListAllNetworks esx: split datastorePathToStorageVol helper esx: split scsilunToStorageVol helper esx: implement storagePoolListAllVolumes esx: improve some of the virErrorNumber used esx: implement domainGetHostname esx: generator: fix free of elements in lists esx: generator: add GuestNicInfo object esx: implement domainInterfaceAddresses docs: document implemented APIs in esx docs/drvesx.html.in | 7 + docs/news.xml | 14 ++ scripts/esx_vi_generator.py | 27 +++- src/esx/esx_driver.c | 220 ++++++++++++++++++++++++++++ src/esx/esx_network_driver.c | 68 ++++++++- src/esx/esx_storage_backend_iscsi.c | 202 +++++++++++++++++++++---- src/esx/esx_storage_backend_vmfs.c | 220 ++++++++++++++++++++++++++-- src/esx/esx_storage_driver.c | 84 +++++++++++ src/esx/esx_util.c | 4 +- src/esx/esx_vi.c | 36 ++--- src/esx/esx_vi_generator.input | 54 +++++++ 11 files changed, 862 insertions(+), 74 deletions(-) -- 2.24.1

2 13

[libvirt] [PATCH 0/2] Fix freebsd build
by Michal Privoznik 08 Jan '20

08 Jan '20

Pushed under trivial and build breaker rules. Michal Prívozník (2): bhyve_parse_command.c: Don't jump onto non-existent label in CONSUME_ARG() bhyve_parse_command: Undefine CONSUME_ARG macro when no longer needed src/bhyve/bhyve_parse_command.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.24.1

1 2

Re: [libvirt] discuss about pvpanic
by Paolo Bonzini 08 Jan '20

08 Jan '20

On 08/01/20 09:25, zhenwei pi wrote: > Hey, Paolo > > Currently, pvpapic only supports bit 0(PVPANIC_PANICKED). > We usually expect that guest writes ioport (typical 0x505) in panic_notifier_list callback > during handling panic, then we can handle pvpapic event PVPANIC_PANICKED in QEMU. > > On the other hand, guest wants to handle the crash by kdump-tools, and reboots without any > panic_notifier_list callback. So QEMU only knows that guest has rebooted (because guest > write 0xcf9 ioport for RCR request), but QEMU can't identify why guest resets. > > In production environment, we hit about 100+ guest reboot event everyday, sadly we > can't separate the abnormal reboot from normal operation. > > We want to add a new bit for pvpanic event(maybe PVPANIC_CRASHLOADED) to represent the guest has crashed, > and the panic is handled by the guest kernel. (here is the previous patch https://lkml.org/lkml/2019/12/14/265) > > What do you think about this solution? Or do you have any other suggestions? Hi Zhenwei, the kernel-side patch certainly makes sense. I assume that you want the event to propagate up from QEMU to Libvirt and so on? The QEMU patch would need to declare a new event (qapi/misc.json) and send it in handle_event (hw/misc/pvpanic.c). For Libvirt I'm not familiar, so I'm adding the respective list. Another possibility is to simply not write to pvpanic if kexec_crash_loaded() returns true; this would match what xen_panic_event does for example. The kexec kernel would then log the panic normally, without the need for MMIO at all. However, I have no problem with adding a new bit to the pvpanic I/O port so once you post the QEMU patch I will certainly ack the kernel side. Thanks, Paolo

3 4

[libvirt] [jenkins-ci PATCH] guests: add more detailed docs on deploying FreeBSD
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Provide instructions on how to download & deploy a working FreeBSD install that's suitable for CI, as there are several gotchas not mentioned in the current docs. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/README.markdown | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/guests/README.markdown b/guests/README.markdown index 7e63540..d76beb1 100644 --- a/guests/README.markdown +++ b/guests/README.markdown @@ -137,6 +137,26 @@ FreeBSD Installation of FreeBSD guests must be performed manually; alternatively, the official qcow2 images can be used to quickly bring up such guests. + $ MAJOR=11 + $ MINOR=3 + $ VER=$MAJOR.$MINOR-RELEASE + $ cd /var/lib/libvirt/images + $ wget -O libvirt-freebsd-$MAJOR.qcow2.xz \ + https://download.freebsd.org/ftp/releases/VM-IMAGES/$VER/amd64/Latest/FreeB… + $ unxz libvirt-freebsd-$MAJOR.qcow2.xz + $ virt-install \ + --import \ + --name libvirt-freebsd-$MAJOR \ + --vcpus 2 \ + --graphics vnc \ + --noautoconsole \ + --console pty \ + --sound none \ + --rng device=/dev/urandom,model=virtio \ + --memory 2000 \ + --os-variant freebsd$MAJOR.$MINOR \ + --file /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 + Some manual tweaking will be needed, in particular: * `/etc/ssh/sshd_config` must contain the `PermitRootLogin yes` directive; @@ -145,6 +165,17 @@ Some manual tweaking will be needed, in particular: * the root password must be manually set to "root" (without quotes). +The default qcow2 images are only 4GB in size which will be too small +to be useful. To enlarge them do + + $ virsh blockresize libvirt-freebsd-$MAJOR \ + /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 20G + +Then inside the guest, as root, enlarge the partition & filesystem + + # gpart resize -i 3 -a 4k -s 39845761 vtbd0 + # service growfs onestart + Once these steps have been performed, FreeBSD guests can be managed just like all other guests. -- 2.23.0

2 1

[libvirt] [PATCH] Remove phyp driver
by Cole Robinson 08 Jan '20

08 Jan '20

The phyp driver was added in 2009 and does not appear to have had any real feature change since 2011. There's virtually no evidence online of users actually using it. IMO it's time to kill it. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- I raised this in 3.5 years ago: https://www.redhat.com/archives/libvir-list/2016-April/msg01060.html Not much on phyp/ side has changed since then, except dozens of dev patches transitioning the code forward. That mail also mentions xenapi and hyperv. hyperv saw signs of life afterwards and is still around. xenapi has been removed, along with uml. Considering the amount of code transitions we are currently undergoing (gnulib, glib, memory auto cleanup, etc), phyp/ will probably have an uptick of dev energy in the medium term. Let's bite the bullet and remove it! docs/aclpolkit.html.in | 4 - docs/api.html.in | 2 +- docs/drivers.html.in | 1 - docs/drvphyp.html.in | 50 - docs/schemas/capability.rng | 3 +- docs/schemas/domaincommon.rng | 2 +- libvirt.spec.in | 11 +- m4/virt-driver-phyp.m4 | 48 - mingw-libvirt.spec.in | 7 - po/POTFILES.in | 1 - src/Makefile.am | 1 - src/README | 1 - src/libvirt.c | 10 - src/phyp/Makefile.inc.am | 21 - src/phyp/phyp_driver.c | 3739 --------------------------------- src/phyp/phyp_driver.h | 24 - 16 files changed, 4 insertions(+), 3921 deletions(-) delete mode 100644 docs/drvphyp.html.in delete mode 100644 m4/virt-driver-phyp.m4 delete mode 100644 src/phyp/Makefile.inc.am delete mode 100644 src/phyp/phyp_driver.c delete mode 100644 src/phyp/phyp_driver.h diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in index 4a8877d5e7..04cb39006a 100644 --- a/docs/aclpolkit.html.in +++ b/docs/aclpolkit.html.in @@ -365,10 +365,6 @@ <td>openvz</td> <td>OPENVZ</td> </tr> - <tr> - <td>phyp</td> - <td>PHYP</td> - </tr> <tr> <td>qemu</td> <td>QEMU</td> diff --git a/docs/api.html.in b/docs/api.html.in index 288b9ecf88..85b196417a 100644 --- a/docs/api.html.in +++ b/docs/api.html.in @@ -330,7 +330,7 @@ daemon through the <a href="remote.html">remote</a> driver via an <a href="internals/rpc.html">RPC</a>. Some hypervisors do support client-side connections and responses, such as Test, OpenVZ, VMware, - Power VM (phyp), VirtualBox (vbox), ESX, Hyper-V, Xen, and Virtuozzo. + VirtualBox (vbox), ESX, Hyper-V, Xen, and Virtuozzo. The libvirtd daemon service is started on the host at system boot time and can also be restarted at any time by a properly privileged user, such as root. The libvirtd daemon uses the same libvirt API diff --git a/docs/drivers.html.in b/docs/drivers.html.in index 4539eedbcd..8743301ebd 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -34,7 +34,6 @@ <li><strong><a href="drvvmware.html">VMware Workstation/Player</a></strong></li> <li><strong><a href="drvxen.html">Xen</a></strong></li> <li><strong><a href="drvhyperv.html">Microsoft Hyper-V</a></strong></li> - <li><strong><a href="drvphyp.html">IBM PowerVM (phyp)</a></strong></li> <li><strong><a href="drvvirtuozzo.html">Virtuozzo</a></strong></li> <li><strong><a href="drvbhyve.html">Bhyve</a></strong> - The BSD Hypervisor</li> </ul> diff --git a/docs/drvphyp.html.in b/docs/drvphyp.html.in deleted file mode 100644 index 8e0b43c869..0000000000 --- a/docs/drvphyp.html.in +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml"> - <body> - <h1>IBM PowerVM hypervisor driver (phyp)</h1> - <ul id="toc"></ul> - <p> - The IBM PowerVM driver can manage both HMC and IVM PowerVM - guests. VIOS connections are tunneled through HMC. - </p> - - - <h2><a id="project">Project Links</a></h2> - <ul> - <li> - The <a href="http://www-03.ibm.com/systems/power/software/virtualization/index.html">IBM - PowerVM</a> hypervisor - </li> - </ul> - - - <h2><a id="uri">Connections to the PowerVM driver</a></h2> - <p> - Some example remote connection URIs for the driver are: - </p> -<pre> -phyp://user@hmc/system (HMC connection) -phyp://user@ivm/system (IVM connection) -</pre> - <p> - <strong>Note</strong>: In contrast to other drivers, the - PowerVM (or phyp) driver is a client-side-only driver, - internally using ssh to connect to the specified hmc or ivm - server. Therefore, the <a href="remote.html">remote transport - mechanism</a> provided by the remote driver and libvirtd will - not work, and you cannot use URIs like - <code>phyp+ssh://example.com</code>. - </p> - - - <h3><a id="uriformat">URI Format</a></h3> - <p> - URIs have this general form (<code>[...]</code> marks an - optional part, <code>{...|...}</code> marks a mandatory choice). - </p> -<pre> -phyp://[username@]{hmc|ivm}/managed_system -</pre> - -</body></html> diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 26d313d652..91ee523116 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -408,8 +408,7 @@ <element name='os_type'> <choice> <value>xen</value>  - <value>linux</value>  + <value>linux</value>  <value>hvm</value>  <value>exe</value>  <value>uml</value>  diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e964773f5e..7238d19268 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -216,7 +216,7 @@ <value>vmware</value> <value>hyperv</value> <value>vbox</value> - <value>phyp</value> + <value>phyp</value>  <value>vz</value> <value>bhyve</value> </choice> diff --git a/libvirt.spec.in b/libvirt.spec.in index 249a4b5425..5055750d2d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -54,7 +54,6 @@ # Then the hypervisor drivers that run outside libvirtd, in libvirt.so %define with_openvz 0%{!?_without_openvz:1} %define with_vmware 0%{!?_without_vmware:1} -%define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1} %define with_hyperv 0%{!?_without_hyperv:1} @@ -136,7 +135,6 @@ %if 0%{?rhel} %define with_openvz 0 %define with_vbox 0 - %define with_phyp 0 %define with_vmware 0 %define with_libxl 0 %define with_hyperv 0 @@ -366,7 +364,7 @@ BuildRequires: libcap-ng-devel >= 0.5.0 %if %{with_fuse} BuildRequires: fuse-devel >= 2.8.6 %endif -%if %{with_phyp} || %{with_libssh2} +%if %{with_libssh2} BuildRequires: libssh2-devel >= 1.3.0 %endif @@ -1036,12 +1034,6 @@ exit 1 %define arg_libxl --without-libxl %endif -%if %{with_phyp} - %define arg_phyp --with-phyp -%else - %define arg_phyp --without-phyp -%endif - %if %{with_esx} %define arg_esx --with-esx %else @@ -1164,7 +1156,6 @@ cd %{_vpath_builddir} --with-sasl \ --with-polkit \ --with-libvirtd \ - %{?arg_phyp} \ %{?arg_esx} \ %{?arg_hyperv} \ %{?arg_vmware} \ diff --git a/m4/virt-driver-phyp.m4 b/m4/virt-driver-phyp.m4 deleted file mode 100644 index 7861bf24e1..0000000000 --- a/m4/virt-driver-phyp.m4 +++ /dev/null @@ -1,48 +0,0 @@ -dnl The Phyp driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl <http://www.gnu.org/licenses/>. -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_PHYP], [ - LIBVIRT_ARG_WITH_FEATURE([PHYP], [PHYP], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_PHYP], [ - AC_REQUIRE([LIBVIRT_CHECK_SSH2]) - - if test "$with_phyp" != "no"; then - if test "$with_ssh2" = "no" ; then - if test "$with_phyp" = "check"; then - with_phyp=no - else - AC_MSG_ERROR([libssh2 is required for Phyp driver]) - fi - else - with_phyp=yes - fi - fi - - if test "$with_phyp" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_PHYP], 1, [whether IBM HMC / IVM driver is enabled]) - fi - - AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_PHYP], [ - LIBVIRT_RESULT([PHYP], [$with_phyp]) -]) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index f6da67ab52..94d88e2edc 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -19,7 +19,6 @@ # The mingw build is client only. Set up defaults for hypervisor drivers # that talk via a native remote protocol, and for which prereq mingw # libraries exist. -%define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1} # missing libwsman, so can't build hyper-v %define with_hyperv 0%{!?_without_hyperv:0} @@ -28,7 +27,6 @@ # RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi) %if 0%{?rhel} - %define with_phyp 0 %define with_xenapi 0 %define with_hyperv 0 %endif @@ -140,10 +138,6 @@ echo "This RPM requires Fedora >= %{min_fedora}" exit 1 %endif -%if ! %{with_phyp} - %define _without_phyp --without-phyp -%endif - %if ! %{with_esx} %define _without_esx --without-esx %endif @@ -176,7 +170,6 @@ autoreconf -if --without-sasl \ --without-polkit \ --without-libvirtd \ - %{?_without_phyp} \ %{?_without_esx} \ %{?_without_hyperv} \ --without-vmware \ diff --git a/po/POTFILES.in b/po/POTFILES.in index c26ac9497d..faf173584e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -137,7 +137,6 @@ @SRCDIR@/src/openvz/openvz_conf.c @SRCDIR@/src/openvz/openvz_driver.c @SRCDIR@/src/openvz/openvz_util.c -@SRCDIR@/src/phyp/phyp_driver.c @SRCDIR@/src/qemu/qemu_agent.c @SRCDIR@/src/qemu/qemu_alias.c @SRCDIR@/src/qemu/qemu_backup.c diff --git a/src/Makefile.am b/src/Makefile.am index cd01796d67..f3d4c28c6d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,7 +109,6 @@ include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am include rpc/Makefile.inc.am -include phyp/Makefile.inc.am include test/Makefile.inc.am include esx/Makefile.inc.am include hyperv/Makefile.inc.am diff --git a/src/README b/src/README index a2260fda68..0c4d3b58c7 100644 --- a/src/README +++ b/src/README @@ -30,7 +30,6 @@ Then there are the hypervisor implementations: * hyperv/ - Microsoft Hyper-V support using WinRM * lxc/ - Linux Native Containers * openvz/ - OpenVZ containers using cli tools - * phyp/ - IBM Power Hypervisor using CLI tools over SSH * qemu/ - QEMU / KVM using qemu CLI/monitor * remote/ - Generic libvirt native RPC client * test/ - A "mock" driver for testing diff --git a/src/libvirt.c b/src/libvirt.c index 9d783761e6..c741ebe311 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -72,9 +72,6 @@ #ifdef WITH_VMWARE # include "vmware/vmware_driver.h" #endif -#ifdef WITH_PHYP -# include "phyp/phyp_driver.h" -#endif #ifdef WITH_ESX # include "esx/esx_driver.h" #endif @@ -290,10 +287,6 @@ virGlobalInit(void) if (vmwareRegister() == -1) goto error; #endif -#ifdef WITH_PHYP - if (phypRegister() == -1) - goto error; -#endif #ifdef WITH_ESX if (esxRegister() == -1) goto error; @@ -959,9 +952,6 @@ virConnectOpenInternal(const char *name, if (STREQ(virConnectDriverTab[i]->hypervisorDriver->name, "remote") && ret->uri != NULL && ( -#ifndef WITH_PHYP - STRCASEEQ(ret->uri->scheme, "phyp") || -#endif #ifndef WITH_ESX STRCASEEQ(ret->uri->scheme, "vpx") || STRCASEEQ(ret->uri->scheme, "esx") || diff --git a/src/phyp/Makefile.inc.am b/src/phyp/Makefile.inc.am deleted file mode 100644 index af556e8589..0000000000 --- a/src/phyp/Makefile.inc.am +++ /dev/null @@ -1,21 +0,0 @@ -# vim: filetype=automake - -PHYP_DRIVER_SOURCES = \ - phyp/phyp_driver.c \ - phyp/phyp_driver.h \ - $(NULL) - -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(PHYP_DRIVER_SOURCES)) -EXTRA_DIST += $(PHYP_DRIVER_SOURCES) - -if WITH_PHYP -noinst_LTLIBRARIES += libvirt_driver_phyp.la -libvirt_la_BUILT_LIBADD += libvirt_driver_phyp.la -libvirt_driver_phyp_la_LIBADD = $(SSH2_LIBS) -libvirt_driver_phyp_la_CFLAGS = \ - $(SSH2_CFLAGS) \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES) -endif WITH_PHYP diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c deleted file mode 100644 index 6bd37a6925..0000000000 --- a/src/phyp/phyp_driver.c +++ /dev/null @@ -1,3739 +0,0 @@ -/* - * Copyright (C) 2010-2015 Red Hat, Inc. - * Copyright IBM Corp. 2009 - * - * phyp_driver.c: ssh layer to access Power Hypervisors - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include <config.h> - -#include <sys/types.h> -#include <sys/stat.h> -#include <stdarg.h> -#include <unistd.h> -#include <libssh2.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <sys/socket.h> -#include <netdb.h> -#include <fcntl.h> -#include <domain_event.h> -#include <poll.h> - -#include "internal.h" -#include "virauth.h" -#include "datatypes.h" -#include "virbuffer.h" -#include "viralloc.h" -#include "virlog.h" -#include "driver.h" -#include "virerror.h" -#include "viruuid.h" -#include "domain_conf.h" -#include "storage_conf.h" -#include "virfile.h" -#include "interface_conf.h" -#include "phyp_driver.h" -#include "virstring.h" - -#define VIR_FROM_THIS VIR_FROM_PHYP - -VIR_LOG_INIT("phyp.phyp_driver"); - -#define LPAR_EXEC_ERR (-1) -#define SSH_CONN_ERR (-2) /* error while trying to connect to remote host */ -#define SSH_CMD_ERR (-3) /* error while trying to execute the remote cmd */ - -/* This is the lpar (domain) struct that relates - * the ID with UUID generated by the API - * */ -typedef struct _lpar lpar_t; -typedef lpar_t *lparPtr; -struct _lpar { - unsigned char uuid[VIR_UUID_BUFLEN]; - int id; -}; - -/* Struct that holds how many lpars (domains) we're - * handling and a pointer to an array of lpar structs - * */ -typedef struct _uuid_table uuid_table_t; -typedef uuid_table_t *uuid_tablePtr; -struct _uuid_table { - size_t nlpars; - lparPtr *lpars; -}; - -/* This is the main structure of the driver - * */ -typedef struct _phyp_driver phyp_driver_t; -typedef phyp_driver_t *phyp_driverPtr; -struct _phyp_driver { - LIBSSH2_SESSION *session; - int sock; - - uuid_tablePtr uuid_table; - virCapsPtr caps; - virDomainXMLOptionPtr xmlopt; - int vios_id; - - /* system_type: - * 0 = hmc - * 127 = ivm - * */ - int system_type; - char *managed_system; -}; - -/* - * URI: phyp://user@[hmc|ivm]/managed_system - * */ - -enum { - HMC = 0, - PHYP_IFACENAME_SIZE = 24, - PHYP_MAC_SIZE = 12, -}; - -static int -waitsocket(int socket_fd, LIBSSH2_SESSION * session) -{ - struct pollfd fds[1]; - int dir; - - memset(fds, 0, sizeof(fds)); - fds[0].fd = socket_fd; - - /* now make sure we wait in the correct direction */ - dir = libssh2_session_block_directions(session); - - if (dir & LIBSSH2_SESSION_BLOCK_INBOUND) - fds[0].events |= POLLIN; - - if (dir & LIBSSH2_SESSION_BLOCK_OUTBOUND) - fds[0].events |= POLLOUT; - - return poll(fds, G_N_ELEMENTS(fds), -1); -} - -/* this function is the layer that manipulates the ssh channel itself - * and executes the commands on the remote machine */ -static char *phypExec(LIBSSH2_SESSION *, const char *, int *, virConnectPtr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4); -static char * -phypExec(LIBSSH2_SESSION *session, const char *cmd, int *exit_status, - virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_CHANNEL *channel; - virBuffer tex_ret = VIR_BUFFER_INITIALIZER; - char *buffer = NULL; - size_t buffer_size = 16384; - int exitcode; - int bytecount = 0; - int sock = phyp_driver->sock; - int rc = 0; - - if (VIR_ALLOC_N(buffer, buffer_size) < 0) - return NULL; - - /* Exec non-blocking on the remove host */ - while ((channel = libssh2_channel_open_session(session)) == NULL && - libssh2_session_last_error(session, NULL, NULL, 0) == - LIBSSH2_ERROR_EAGAIN) { - if (waitsocket(sock, session) < 0 && errno != EINTR) { - virReportSystemError(errno, "%s", - _("unable to wait on libssh2 socket")); - goto err; - } - } - - if (channel == NULL) - goto err; - - while ((rc = libssh2_channel_exec(channel, cmd)) == - LIBSSH2_ERROR_EAGAIN) { - if (waitsocket(sock, session) < 0 && errno != EINTR) { - virReportSystemError(errno, "%s", - _("unable to wait on libssh2 socket")); - goto err; - } - } - - if (rc != 0) - goto err; - - for (;;) { - /* loop until we block */ - do { - rc = libssh2_channel_read(channel, buffer, buffer_size); - if (rc > 0) { - bytecount += rc; - virBufferAdd(&tex_ret, buffer, -1); - } - } - while (rc > 0); - - /* this is due to blocking that would occur otherwise so we loop on - * this condition */ - if (rc == LIBSSH2_ERROR_EAGAIN) { - if (waitsocket(sock, session) < 0 && errno != EINTR) { - virReportSystemError(errno, "%s", - _("unable to wait on libssh2 socket")); - goto err; - } - } else { - break; - } - } - - exitcode = 127; - - while ((rc = libssh2_channel_close(channel)) == LIBSSH2_ERROR_EAGAIN) { - if (waitsocket(sock, session) < 0 && errno != EINTR) { - virReportSystemError(errno, "%s", - _("unable to wait on libssh2 socket")); - goto err; - } - } - - if (rc == 0) - exitcode = libssh2_channel_get_exit_status(channel); - - (*exit_status) = exitcode; - libssh2_channel_free(channel); - channel = NULL; - VIR_FREE(buffer); - - return virBufferContentAndReset(&tex_ret); - - err: - (*exit_status) = SSH_CMD_ERR; - virBufferFreeAndReset(&tex_ret); - VIR_FREE(buffer); - return NULL; -} - -/* Convenience wrapper function */ -static char *phypExecBuffer(LIBSSH2_SESSION *, virBufferPtr buf, int *, - virConnectPtr, bool) ATTRIBUTE_NONNULL(1) - ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -static char * -phypExecBuffer(LIBSSH2_SESSION *session, virBufferPtr buf, int *exit_status, - virConnectPtr conn, bool strip_newline) -{ - char *cmd; - char *ret; - - cmd = virBufferContentAndReset(buf); - ret = phypExec(session, cmd, exit_status, conn); - VIR_FREE(cmd); - if (ret && *exit_status == 0 && strip_newline) { - char *nl = strchr(ret, '\n'); - if (nl) - *nl = '\0'; - } - return ret; -} - -/* Convenience wrapper function */ -static int phypExecInt(LIBSSH2_SESSION *, virBufferPtr, virConnectPtr, int *) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -static int -phypExecInt(LIBSSH2_SESSION *session, virBufferPtr buf, virConnectPtr conn, - int *result) -{ - char *str; - int ret; - char *char_ptr; - - str = phypExecBuffer(session, buf, &ret, conn, true); - if (!str || ret) { - VIR_FREE(str); - return -1; - } - ret = virStrToLong_i(str, &char_ptr, 10, result); - if (ret == 0 && *char_ptr) - VIR_WARN("ignoring suffix during integer parsing of '%s'", str); - VIR_FREE(str); - return ret; -} - -static int -phypGetSystemType(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *ret = NULL; - int exit_status = 0; - - ret = phypExec(session, "lshmc -V", &exit_status, conn); - - VIR_FREE(ret); - return exit_status; -} - -static int -phypGetVIOSPartitionID(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - int id = -1; - char *managed_system = phyp_driver->managed_system; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "lssyscfg"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAddLit(&buf, " -r lpar -F lpar_id,lpar_env" - "|sed -n '/vioserver/ {\n s/,.*$//\n p\n}'"); - phypExecInt(session, &buf, conn, &id); - return id; -} - - -static virCapsPtr -phypCapsInit(void) -{ - virCapsPtr caps; - virCapsGuestPtr guest; - - if ((caps = virCapabilitiesNew(virArchFromHost(), - false, false)) == NULL) - goto no_memory; - - /* Some machines have problematic NUMA topology causing - * unexpected failures. We don't want to break the QEMU - * driver in this scenario, so log errors & carry on - */ - if (!(caps->host.numa = virCapabilitiesHostNUMANewHost())) - goto no_memory; - - if (virCapabilitiesInitCaches(caps) < 0) - VIR_WARN("Failed to get host CPU cache info"); - - if ((guest = virCapabilitiesAddGuest(caps, - VIR_DOMAIN_OSTYPE_LINUX, - caps->host.arch, - NULL, NULL, 0, NULL)) == NULL) - goto no_memory; - - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_PHYP, - NULL, NULL, 0, NULL) == NULL) - goto no_memory; - - return caps; - - no_memory: - virObjectUnref(caps); - return NULL; -} - -/* This is a generic function that won't be used directly by - * libvirt api. The function returns the number of domains - * in different states: Running, Not Activated and all: - * - * type: 0 - Running - * 1 - Not Activated - * * - All - * */ -static int -phypConnectNumOfDomainsGeneric(virConnectPtr conn, unsigned int type) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - int ndom = -1; - char *managed_system = phyp_driver->managed_system; - const char *state; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (type == 0) { - state = "|grep Running"; - } else if (type == 1) { - if (system_type == HMC) { - state = "|grep \"Not Activated\""; - } else { - state = "|grep \"Open Firmware\""; - } - } else { - state = " "; - } - - virBufferAddLit(&buf, "lssyscfg -r lpar"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -F lpar_id,state %s |grep -c '^[0-9][0-9]*'", - state); - phypExecInt(session, &buf, conn, &ndom); - return ndom; -} - -/* This is a generic function that won't be used directly by - * libvirt api. The function returns the ids of domains - * in different states: Running, and all: - * - * type: 0 - Running - * 1 - all - * */ -static int -phypConnectListDomainsGeneric(virConnectPtr conn, int *ids, int nids, - unsigned int type) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - int exit_status = 0; - int got = -1; - char *ret = NULL; - char *line, *next_line; - const char *state; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (type == 0) - state = "|grep Running"; - else - state = " "; - - virBufferAddLit(&buf, "lssyscfg -r lpar"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -F lpar_id,state %s | sed -e 's/,.*$//'", - state); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - /* I need to parse the textual return in order to get the ids */ - line = ret; - got = 0; - while (*line && got < nids) { - if (virStrToLong_i(line, &next_line, 10, &ids[got]) == -1) { - VIR_ERROR(_("Cannot parse number from '%s'"), line); - got = -1; - goto cleanup; - } - got++; - line = next_line; - while (*line == '\n') - line++; /* skip \n */ - } - - cleanup: - VIR_FREE(ret); - return got; -} - -static int -phypUUIDTable_WriteFile(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - uuid_tablePtr uuid_table = phyp_driver->uuid_table; - size_t i = 0; - int fd = -1; - char local_file[] = "./uuid_table"; - - if ((fd = creat(local_file, 0755)) == -1) - goto err; - - for (i = 0; i < uuid_table->nlpars; i++) { - if (safewrite(fd, &uuid_table->lpars[i]->id, - sizeof(uuid_table->lpars[i]->id)) != - sizeof(uuid_table->lpars[i]->id)) { - VIR_ERROR(_("Unable to write information to local file.")); - goto err; - } - - if (safewrite(fd, uuid_table->lpars[i]->uuid, VIR_UUID_BUFLEN) != - VIR_UUID_BUFLEN) { - VIR_ERROR(_("Unable to write information to local file.")); - goto err; - } - } - - if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, _("Could not close %s"), - local_file); - goto err; - } - return 0; - - err: - VIR_FORCE_CLOSE(fd); - return -1; -} - -static int -phypUUIDTable_Push(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - LIBSSH2_CHANNEL *channel = NULL; - struct stat local_fileinfo; - char buffer[1024]; - int rc = 0; - FILE *f = NULL; - size_t nread, sent; - char *ptr; - char local_file[] = "./uuid_table"; - char *remote_file = NULL; - int ret = -1; - - remote_file = g_strdup_printf("/home/%s/libvirt_uuid_table", - NULLSTR(conn->uri->user)); - - if (stat(local_file, &local_fileinfo) == -1) { - VIR_WARN("Unable to stat local file."); - goto cleanup; - } - - if (!(f = fopen(local_file, "rb"))) { - VIR_WARN("Unable to open local file."); - goto cleanup; - } - - do { - channel = - libssh2_scp_send(session, remote_file, - 0x1FF & local_fileinfo.st_mode, - (unsigned long)local_fileinfo.st_size); - - if ((!channel) && (libssh2_session_last_errno(session) != - LIBSSH2_ERROR_EAGAIN)) - goto cleanup; - } while (!channel); - - do { - nread = fread(buffer, 1, sizeof(buffer), f); - if (nread <= 0) { - if (feof(f)) { - /* end of file */ - break; - } else { - VIR_ERROR(_("Failed to read from %s"), local_file); - goto cleanup; - } - } - ptr = buffer; - sent = 0; - - do { - /* write the same data over and over, until error or completion */ - rc = libssh2_channel_write(channel, ptr, nread); - if (LIBSSH2_ERROR_EAGAIN == rc) { /* must loop around */ - continue; - } else if (rc > 0) { - /* rc indicates how many bytes were written this time */ - sent += rc; - } - ptr += sent; - nread -= sent; - } while (rc > 0 && sent < nread); - } while (1); - - ret = 0; - - cleanup: - VIR_FREE(remote_file); - if (channel) { - libssh2_channel_send_eof(channel); - libssh2_channel_wait_eof(channel); - libssh2_channel_wait_closed(channel); - libssh2_channel_free(channel); - channel = NULL; - } - VIR_FORCE_FCLOSE(f); - return ret; -} - -static int -phypUUIDTable_RemLpar(virConnectPtr conn, int id) -{ - phyp_driverPtr phyp_driver = conn->privateData; - uuid_tablePtr uuid_table = phyp_driver->uuid_table; - size_t i = 0; - - for (i = 0; i <= uuid_table->nlpars; i++) { - if (uuid_table->lpars[i]->id == id) { - uuid_table->lpars[i]->id = -1; - memset(uuid_table->lpars[i]->uuid, 0, VIR_UUID_BUFLEN); - } - } - - if (phypUUIDTable_WriteFile(conn) == -1) - goto err; - - if (phypUUIDTable_Push(conn) == -1) - goto err; - - return 0; - - err: - return -1; -} - -static int -phypUUIDTable_AddLpar(virConnectPtr conn, unsigned char *uuid, int id) -{ - phyp_driverPtr phyp_driver = conn->privateData; - uuid_tablePtr uuid_table = phyp_driver->uuid_table; - lparPtr item = NULL; - - if (VIR_ALLOC(item) < 0) - goto err; - - item->id = id; - memcpy(item->uuid, uuid, VIR_UUID_BUFLEN); - - if (VIR_APPEND_ELEMENT_COPY(uuid_table->lpars, uuid_table->nlpars, item) < 0) - goto err; - - if (phypUUIDTable_WriteFile(conn) == -1) - goto err; - - if (phypUUIDTable_Push(conn) == -1) - goto err; - - return 0; - - err: - VIR_FREE(item); - return -1; -} - -static int -phypUUIDTable_ReadFile(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - uuid_tablePtr uuid_table = phyp_driver->uuid_table; - size_t i = 0; - int fd = -1; - char local_file[] = "./uuid_table"; - int rc = 0; - int id; - - if ((fd = open(local_file, O_RDONLY)) == -1) { - VIR_WARN("Unable to read information from local file."); - goto err; - } - - /* Creating a new data base and writing to local file */ - if (VIR_ALLOC_N(uuid_table->lpars, uuid_table->nlpars) >= 0) { - for (i = 0; i < uuid_table->nlpars; i++) { - - rc = read(fd, &id, sizeof(int)); - if (rc == sizeof(int)) { - if (VIR_ALLOC(uuid_table->lpars[i]) < 0) - goto err; - uuid_table->lpars[i]->id = id; - } else { - VIR_WARN - ("Unable to read from information from local file."); - goto err; - } - - rc = read(fd, uuid_table->lpars[i]->uuid, VIR_UUID_BUFLEN); - if (rc != VIR_UUID_BUFLEN) { - VIR_WARN("Unable to read information from local file."); - goto err; - } - } - } - - VIR_FORCE_CLOSE(fd); - return 0; - - err: - VIR_FORCE_CLOSE(fd); - return -1; -} - -static int -phypUUIDTable_Pull(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - LIBSSH2_CHANNEL *channel = NULL; - struct stat fileinfo; - char buffer[1024]; - int rc = 0; - int fd = -1; - int got = 0; - int amount = 0; - int total = 0; - int sock = 0; - char local_file[] = "./uuid_table"; - char *remote_file = NULL; - int ret = -1; - - remote_file = g_strdup_printf("/home/%s/libvirt_uuid_table", - NULLSTR(conn->uri->user)); - - /* Trying to stat the remote file. */ - do { - channel = libssh2_scp_recv(session, remote_file, &fileinfo); - - if (!channel) { - if (libssh2_session_last_errno(session) != - LIBSSH2_ERROR_EAGAIN) { - goto cleanup; - } else { - if (waitsocket(sock, session) < 0 && errno != EINTR) { - virReportSystemError(errno, "%s", - _("unable to wait on libssh2 socket")); - goto cleanup; - } - } - } - } while (!channel); - - /* Creating a new data base based on remote file */ - if ((fd = creat(local_file, 0755)) == -1) - goto cleanup; - - /* Request a file via SCP */ - while (got < fileinfo.st_size) { - do { - amount = sizeof(buffer); - - if ((fileinfo.st_size - got) < amount) - amount = fileinfo.st_size - got; - - rc = libssh2_channel_read(channel, buffer, amount); - if (rc > 0) { - if (safewrite(fd, buffer, rc) != rc) - VIR_WARN - ("Unable to write information to local file."); - - got += rc; - total += rc; - } - } while (rc > 0); - - if ((rc == LIBSSH2_ERROR_EAGAIN) - && (got < fileinfo.st_size)) { - /* this is due to blocking that would occur otherwise - * so we loop on this condition */ - - /* now we wait */ - if (waitsocket(sock, session) < 0 && errno != EINTR) { - virReportSystemError(errno, "%s", - _("unable to wait on libssh2 socket")); - goto cleanup; - } - continue; - } - break; - } - if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, _("Could not close %s"), - local_file); - goto cleanup; - } - - ret = 0; - - cleanup: - if (channel) { - libssh2_channel_send_eof(channel); - libssh2_channel_wait_eof(channel); - libssh2_channel_wait_closed(channel); - libssh2_channel_free(channel); - channel = NULL; - } - VIR_FORCE_CLOSE(fd); - return ret; -} - -static int -phypUUIDTable_Init(virConnectPtr conn) -{ - uuid_tablePtr uuid_table = NULL; - phyp_driverPtr phyp_driver; - int nids_numdomains = 0; - int nids_listdomains = 0; - int *ids = NULL; - size_t i = 0; - int ret = -1; - bool table_created = false; - - if ((nids_numdomains = phypConnectNumOfDomainsGeneric(conn, 2)) < 0) - goto cleanup; - - if (VIR_ALLOC_N(ids, nids_numdomains) < 0) - goto cleanup; - - if ((nids_listdomains = - phypConnectListDomainsGeneric(conn, ids, nids_numdomains, 1)) < 0) - goto cleanup; - - /* exit early if there are no domains */ - if (nids_numdomains == 0 && nids_listdomains == 0) { - ret = 0; - goto cleanup; - } - if (nids_numdomains != nids_listdomains) { - VIR_ERROR(_("Unable to determine number of domains.")); - goto cleanup; - } - - phyp_driver = conn->privateData; - uuid_table = phyp_driver->uuid_table; - uuid_table->nlpars = nids_listdomains; - - /* try to get the table from server */ - if (phypUUIDTable_Pull(conn) == -1) { - /* file not found in the server, creating a new one */ - table_created = true; - if (VIR_ALLOC_N(uuid_table->lpars, uuid_table->nlpars) >= 0) { - for (i = 0; i < uuid_table->nlpars; i++) { - if (VIR_ALLOC(uuid_table->lpars[i]) < 0) - goto cleanup; - uuid_table->lpars[i]->id = ids[i]; - - if (virUUIDGenerate(uuid_table->lpars[i]->uuid) < 0) - VIR_WARN("Unable to generate UUID for domain %d", - ids[i]); - } - } else { - goto cleanup; - } - - if (phypUUIDTable_WriteFile(conn) == -1) - goto cleanup; - - if (phypUUIDTable_Push(conn) == -1) - goto cleanup; - } else { - if (phypUUIDTable_ReadFile(conn) == -1) - goto cleanup; - } - - ret = 0; - - cleanup: - if (ret < 0 && table_created) { - for (i = 0; i < uuid_table->nlpars; i++) - VIR_FREE(uuid_table->lpars[i]); - VIR_FREE(uuid_table->lpars); - } - VIR_FREE(ids); - return ret; -} - -static void -phypUUIDTable_Free(uuid_tablePtr uuid_table) -{ - size_t i; - - if (uuid_table == NULL) - return; - - for (i = 0; i < uuid_table->nlpars; i++) - VIR_FREE(uuid_table->lpars[i]); - - VIR_FREE(uuid_table->lpars); - VIR_FREE(uuid_table); -} - -#define SPECIALCHARACTER_CASES \ - case '&': case ';': case '`': case '@': case '"': case '|': case '*': \ - case '?': case '~': case '<': case '>': case '^': case '(': case ')': \ - case '[': case ']': case '{': case '}': case '$': case '%': case '#': \ - case '\\': case '\n': case '\r': case '\t': - -static bool -contains_specialcharacters(const char *src) -{ - size_t len = strlen(src); - size_t i = 0; - - if (len == 0) - return false; - - for (i = 0; i < len; i++) { - switch (src[i]) { - SPECIALCHARACTER_CASES - return true; - default: - continue; - } - } - - return false; -} - -static char * -escape_specialcharacters(const char *src) -{ - size_t len = strlen(src); - size_t i = 0, j = 0; - char *dst; - - if (len == 0) - return NULL; - - if (VIR_ALLOC_N(dst, len + 1) < 0) - return NULL; - - for (i = 0; i < len; i++) { - switch (src[i]) { - SPECIALCHARACTER_CASES - continue; - default: - dst[j] = src[i]; - j++; - } - } - - dst[j] = '\0'; - - return dst; -} - -static LIBSSH2_SESSION * -openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, - int *internal_socket) -{ - LIBSSH2_SESSION *session; - const char *hostname = conn->uri->server; - char *username = NULL; - char *password = NULL; - int sock = -1; - int rc; - struct addrinfo *ai = NULL, *cur; - struct addrinfo hints; - int ret; - char *pubkey = NULL; - char *pvtkey = NULL; - char *userhome = virGetUserDirectory(); - struct stat pvt_stat, pub_stat; - - if (userhome == NULL) - goto err; - - pubkey = g_strdup_printf("%s/.ssh/id_rsa.pub", userhome); - - pvtkey = g_strdup_printf("%s/.ssh/id_rsa", userhome); - - if (conn->uri->user != NULL) { - username = g_strdup(conn->uri->user); - } else { - if (!(username = virAuthGetUsername(conn, auth, "ssh", NULL, - conn->uri->server))) - goto err; - } - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = 0; - - ret = getaddrinfo(hostname, "22", &hints, &ai); - if (ret != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Error while getting %s address info"), hostname); - goto err; - } - - cur = ai; - while (cur != NULL) { - sock = socket(cur->ai_family, cur->ai_socktype, cur->ai_protocol); - if (sock >= 0) { - if (connect(sock, cur->ai_addr, cur->ai_addrlen) == 0) { - freeaddrinfo(ai); - goto connected; - } - VIR_FORCE_CLOSE(sock); - } - cur = cur->ai_next; - } - - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to connect to %s"), hostname); - freeaddrinfo(ai); - goto err; - - connected: - - (*internal_socket) = sock; - - /* Create a session instance */ - session = libssh2_session_init(); - if (!session) - goto err; - - /* tell libssh2 we want it all done non-blocking */ - libssh2_session_set_blocking(session, 0); - - while ((rc = libssh2_session_startup(session, sock)) == - LIBSSH2_ERROR_EAGAIN); - if (rc) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Failure establishing SSH session.")); - goto disconnect; - } - - /* Trying authentication by pubkey */ - if (stat(pvtkey, &pvt_stat) || stat(pubkey, &pub_stat)) { - rc = LIBSSH2_ERROR_SOCKET_NONE; - goto keyboard_interactive; - } - - while ((rc = - libssh2_userauth_publickey_fromfile(session, username, - pubkey, - pvtkey, - NULL)) == - LIBSSH2_ERROR_EAGAIN); - - keyboard_interactive: - if (rc == LIBSSH2_ERROR_SOCKET_NONE - || rc == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED - || rc == LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED) { - - if (!(password = virAuthGetPassword(conn, auth, "ssh", username, - conn->uri->server))) - goto disconnect; - - while ((rc = - libssh2_userauth_password(session, username, - password)) == - LIBSSH2_ERROR_EAGAIN); - - if (rc) { - virReportError(VIR_ERR_AUTH_FAILED, - "%s", _("Authentication failed")); - goto disconnect; - } else { - goto exit; - } - - } else if (rc == LIBSSH2_ERROR_NONE) { - goto exit; - - } else if (rc == LIBSSH2_ERROR_ALLOC || rc == LIBSSH2_ERROR_SOCKET_SEND - || rc == LIBSSH2_ERROR_SOCKET_TIMEOUT) { - goto err; - } - - disconnect: - libssh2_session_disconnect(session, "Disconnecting..."); - libssh2_session_free(session); - err: - VIR_FORCE_CLOSE(sock); - VIR_FREE(userhome); - VIR_FREE(pubkey); - VIR_FREE(pvtkey); - VIR_FREE(username); - VIR_FREE(password); - return NULL; - - exit: - VIR_FREE(userhome); - VIR_FREE(pubkey); - VIR_FREE(pvtkey); - VIR_FREE(username); - VIR_FREE(password); - return session; -} - - -static int -phypDomainDefPostParse(virDomainDefPtr def, - unsigned int parseFlags G_GNUC_UNUSED, - void *opaque, - void *parseOpaque G_GNUC_UNUSED) -{ - phyp_driverPtr driver = opaque; - if (!virCapabilitiesDomainSupported(driver->caps, def->os.type, - def->os.arch, - def->virtType)) - return -1; - - return 0; -} - - -static int -phypDomainDeviceDefPostParse(virDomainDeviceDefPtr dev G_GNUC_UNUSED, - const virDomainDef *def G_GNUC_UNUSED, - unsigned int parseFlags G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED, - void *parseOpaque G_GNUC_UNUSED) -{ - return 0; -} - - -virDomainDefParserConfig virPhypDriverDomainDefParserConfig = { - .devicesPostParseCallback = phypDomainDeviceDefPostParse, - .domainPostParseCallback = phypDomainDefPostParse, - .features = VIR_DOMAIN_DEF_FEATURE_NAME_SLASH, -}; - - -static virDrvOpenStatus -phypConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth, - virConfPtr conf G_GNUC_UNUSED, - unsigned int flags) -{ - LIBSSH2_SESSION *session = NULL; - int internal_socket = -1; - uuid_tablePtr uuid_table = NULL; - phyp_driverPtr phyp_driver = NULL; - char *char_ptr; - char *managed_system = NULL; - - virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - - if (VIR_ALLOC(phyp_driver) < 0) - goto failure; - - phyp_driver->sock = -1; - - if (VIR_ALLOC(uuid_table) < 0) - goto failure; - - if (conn->uri->path[0] != '\0') { - /* need to shift one byte in order to remove the first "/" of URI component */ - managed_system = g_strdup(conn->uri->path + (conn->uri->path[0] == '/')); - - /* here we are handling only the first component of the path, - * so skipping the second: - * */ - char_ptr = strchr(managed_system, '/'); - - if (char_ptr) - *char_ptr = '\0'; - - if (contains_specialcharacters(conn->uri->path)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", - _("Error parsing 'path'. Invalid characters.")); - goto failure; - } - } - - if ((session = openSSHSession(conn, auth, &internal_socket)) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Error while opening SSH session.")); - goto failure; - } - - phyp_driver->session = session; - phyp_driver->sock = internal_socket; - - uuid_table->nlpars = 0; - uuid_table->lpars = NULL; - - if (conn->uri->path) - phyp_driver->managed_system = managed_system; - - phyp_driver->uuid_table = uuid_table; - if ((phyp_driver->caps = phypCapsInit()) == NULL) - goto failure; - - virPhypDriverDomainDefParserConfig.priv = phyp_driver; - if (!(phyp_driver->xmlopt = virDomainXMLOptionNew(&virPhypDriverDomainDefParserConfig, - NULL, NULL, NULL, NULL))) - goto failure; - - conn->privateData = phyp_driver; - - if ((phyp_driver->system_type = phypGetSystemType(conn)) == -1) - goto failure; - - if (phypUUIDTable_Init(conn) == -1) - goto failure; - - if (phyp_driver->system_type == HMC) { - if ((phyp_driver->vios_id = phypGetVIOSPartitionID(conn)) == -1) - goto failure; - } - - return VIR_DRV_OPEN_SUCCESS; - - failure: - VIR_FREE(managed_system); - - if (phyp_driver != NULL) { - virObjectUnref(phyp_driver->caps); - virObjectUnref(phyp_driver->xmlopt); - VIR_FREE(phyp_driver); - } - - phypUUIDTable_Free(uuid_table); - - if (session != NULL) { - libssh2_session_disconnect(session, "Disconnecting..."); - libssh2_session_free(session); - } - - VIR_FORCE_CLOSE(internal_socket); - - return VIR_DRV_OPEN_ERROR; -} - -static int -phypConnectClose(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - - libssh2_session_disconnect(session, "Disconnecting..."); - libssh2_session_free(session); - - virObjectUnref(phyp_driver->caps); - virObjectUnref(phyp_driver->xmlopt); - phypUUIDTable_Free(phyp_driver->uuid_table); - VIR_FREE(phyp_driver->managed_system); - VIR_FORCE_CLOSE(phyp_driver->sock); - VIR_FREE(phyp_driver); - return 0; -} - - -static int -phypConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) -{ - /* Phyp uses an SSH tunnel, so is always encrypted */ - return 1; -} - - -static int -phypConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) -{ - /* Phyp uses an SSH tunnel, so is always secure */ - return 1; -} - - -static int -phypConnectIsAlive(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - /* XXX we should be able to do something better but this is simple, safe, - * and good enough for now. In worst case, the function will return true - * even though the connection is not alive. - */ - if (phyp_driver->session) - return 1; - else - return 0; -} - - -static int -phypDomainIsUpdated(virDomainPtr conn G_GNUC_UNUSED) -{ - return 0; -} - -/* return the lpar_id given a name and a managed system name */ -static int -phypGetLparID(LIBSSH2_SESSION * session, const char *managed_system, - const char *name, virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - int system_type = phyp_driver->system_type; - int lpar_id = -1; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "lssyscfg -r lpar"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " --filter lpar_names=%s -F lpar_id", name); - phypExecInt(session, &buf, conn, &lpar_id); - return lpar_id; -} - -/* return the lpar name given a lpar_id and a managed system name */ -static char * -phypGetLparNAME(LIBSSH2_SESSION * session, const char *managed_system, - unsigned int lpar_id, virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - int system_type = phyp_driver->system_type; - char *ret = NULL; - int exit_status = 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "lssyscfg -r lpar"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " --filter lpar_ids=%d -F name", lpar_id); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0) - VIR_FREE(ret); - return ret; -} - - -/* Search into the uuid_table for a lpar_uuid given a lpar_id - * and a managed system name - * - * return: 0 - record found - * -1 - not found - * */ -static int -phypGetLparUUID(unsigned char *uuid, int lpar_id, virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - uuid_tablePtr uuid_table = phyp_driver->uuid_table; - lparPtr *lpars = uuid_table->lpars; - size_t i = 0; - - for (i = 0; i < uuid_table->nlpars; i++) { - if (lpars[i]->id == lpar_id) { - memcpy(uuid, lpars[i]->uuid, VIR_UUID_BUFLEN); - return 0; - } - } - - return -1; -} - -/* - * type: - * 0 - maxmem - * 1 - memory - * */ -static unsigned long -phypGetLparMem(virConnectPtr conn, const char *managed_system, int lpar_id, - int type) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - int memory = 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (type != 1 && type != 0) - return 0; - - virBufferAddLit(&buf, "lshwres"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, - " -r mem --level lpar -F %s --filter lpar_ids=%d", - type ? "curr_mem" : "curr_max_mem", lpar_id); - phypExecInt(session, &buf, conn, &memory); - return memory; -} - -static unsigned long -phypGetLparCPUGeneric(virConnectPtr conn, const char *managed_system, - int lpar_id, int type) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - int vcpus = 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "lshwres"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, - " -r proc --level lpar -F %s --filter lpar_ids=%d", - type ? "curr_max_procs" : "curr_procs", lpar_id); - phypExecInt(session, &buf, conn, &vcpus); - return vcpus; -} - -static unsigned long -phypGetLparCPU(virConnectPtr conn, const char *managed_system, int lpar_id) -{ - return phypGetLparCPUGeneric(conn, managed_system, lpar_id, 0); -} - -static int -phypDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) -{ - phyp_driverPtr phyp_driver = dom->conn->privateData; - char *managed_system = phyp_driver->managed_system; - - if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { - virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags); - return -1; - } - - return phypGetLparCPUGeneric(dom->conn, managed_system, dom->id, 1); -} - -static int -phypDomainGetMaxVcpus(virDomainPtr dom) -{ - return phypDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_LIVE | - VIR_DOMAIN_VCPU_MAXIMUM)); -} - -static int -phypGetRemoteSlot(virConnectPtr conn, const char *managed_system, - const char *lpar_name) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - int remote_slot = -1; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "lshwres"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -r virtualio --rsubtype scsi -F " - "remote_slot_num --filter lpar_names=%s", lpar_name); - phypExecInt(session, &buf, conn, &remote_slot); - return remote_slot; -} - -/* XXX - is this needed? */ -static char *phypGetBackingDevice(virConnectPtr, const char *, char *) - G_GNUC_UNUSED; -static char * -phypGetBackingDevice(virConnectPtr conn, const char *managed_system, - char *lpar_name) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *ret = NULL; - int remote_slot = 0; - int exit_status = 0; - char *char_ptr; - char *backing_device = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if ((remote_slot = - phypGetRemoteSlot(conn, managed_system, lpar_name)) == -1) - return NULL; - - virBufferAddLit(&buf, "lshwres"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -r virtualio --rsubtype scsi -F " - "backing_devices --filter slots=%d", remote_slot); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - /* here is a little trick to deal returns of this kind: - * - * 0x8100000000000000//lv01 - * - * the information we really need is only lv01, so we - * need to skip a lot of things on the string. - * */ - char_ptr = strchr(ret, '/'); - - if (char_ptr) { - char_ptr++; - if (char_ptr[0] == '/') - char_ptr++; - else - goto cleanup; - - backing_device = g_strdup(char_ptr); - } else { - backing_device = g_steal_pointer(&ret); - } - - char_ptr = strchr(backing_device, '\n'); - - if (char_ptr) - *char_ptr = '\0'; - - cleanup: - VIR_FREE(ret); - - return backing_device; -} - -static char * -phypGetLparProfile(virConnectPtr conn, int lpar_id) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "lssyscfg"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, - " -r prof --filter lpar_ids=%d -F name|head -n 1", - lpar_id); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0) - VIR_FREE(ret); - return ret; -} - -static int -phypGetVIOSNextSlotNumber(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - char *profile = NULL; - int slot = -1; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (!(profile = phypGetLparProfile(conn, vios_id))) { - VIR_ERROR(_("Unable to get VIOS profile name.")); - return -1; - } - - virBufferAddLit(&buf, "lssyscfg"); - - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - - virBufferAsprintf(&buf, " -r prof --filter " - "profile_names=%s -F virtual_eth_adapters," - "virtual_opti_pool_id,virtual_scsi_adapters," - "virtual_serial_adapters|sed -e 's/\"//g' -e " - "'s/,/\\n/g'|sed -e 's/\$^[0-9][0-9]\\*\$.*$/\\1/'" - "|sort|tail -n 1", profile); - if (phypExecInt(session, &buf, conn, &slot) < 0) - return -1; - return slot + 1; -} - -static int -phypCreateServerSCSIAdapter(virConnectPtr conn) -{ - int result = -1; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - char *ret = NULL; - char *profile = NULL; - int slot = 0; - char *vios_name = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (! - (vios_name = - phypGetLparNAME(session, managed_system, vios_id, conn))) { - VIR_ERROR(_("Unable to get VIOS name")); - goto cleanup; - } - - if (!(profile = phypGetLparProfile(conn, vios_id))) { - VIR_ERROR(_("Unable to get VIOS profile name.")); - goto cleanup; - } - - if ((slot = phypGetVIOSNextSlotNumber(conn)) == -1) { - VIR_ERROR(_("Unable to get free slot number")); - goto cleanup; - } - - /* Listing all the virtual_scsi_adapter interfaces, the new adapter must - * be appended to this list - * */ - virBufferAddLit(&buf, "lssyscfg"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -r prof --filter lpar_ids=%d,profile_names=%s" - " -F virtual_scsi_adapters|sed -e s/\\\"//g", - vios_id, profile); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - /* Here I change the VIOS configuration to append the new adapter - * with the free slot I got with phypGetVIOSNextSlotNumber. - * */ - virBufferAddLit(&buf, "chsyscfg"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -r prof -i 'name=%s,lpar_id=%d," - "\"virtual_scsi_adapters=%s,%d/server/any/any/1\"'", - vios_name, vios_id, ret, slot); - VIR_FREE(ret); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - /* Finally I add the new scsi adapter to VIOS using the same slot - * I used in the VIOS configuration. - * */ - virBufferAddLit(&buf, "chhwres -r virtualio --rsubtype scsi"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, - " -p %s -o a -s %d -d 0 -a \"adapter_type=server\"", - vios_name, slot); - VIR_FREE(ret); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - result = 0; - - cleanup: - VIR_FREE(profile); - VIR_FREE(vios_name); - VIR_FREE(ret); - - return result; -} - -static char * -phypGetVIOSFreeSCSIAdapter(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAddLit(&buf, "lsmap -all -field svsa backing -fmt , "); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAddLit(&buf, "|sed '/,[^.*]/d; s/,//g; q'"); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0) - VIR_FREE(ret); - return ret; -} - - -static int -phypDomainAttachDeviceFlags(virDomainPtr domain, - const char *xml, - unsigned int flags) -{ - int result = -1; - virConnectPtr conn = domain->conn; - phyp_driverPtr phyp_driver = domain->conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - char *ret = NULL; - char *scsi_adapter = NULL; - int slot = 0; - char *vios_name = NULL; - char *profile = NULL; - virDomainDeviceDefPtr dev = NULL; - virDomainDefPtr def = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *domain_name = NULL; - - virCheckFlags(0, -1); - - if (!(def = virDomainDefNew())) - goto cleanup; - - domain_name = escape_specialcharacters(domain->name); - - if (domain_name == NULL) - goto cleanup; - - def->os.type = VIR_DOMAIN_OSTYPE_LINUX; - - dev = virDomainDeviceDefParse(xml, def, NULL, NULL, - VIR_DOMAIN_DEF_PARSE_INACTIVE); - if (!dev) - goto cleanup; - - if (! - (vios_name = - phypGetLparNAME(session, managed_system, vios_id, conn))) { - VIR_ERROR(_("Unable to get VIOS name")); - goto cleanup; - } - - /* First, let's look for a free SCSI Adapter - * */ - if (!(scsi_adapter = phypGetVIOSFreeSCSIAdapter(conn))) { - /* If not found, let's create one. - * */ - if (phypCreateServerSCSIAdapter(conn) == -1) { - VIR_ERROR(_("Unable to create new virtual adapter")); - goto cleanup; - } else { - if (!(scsi_adapter = phypGetVIOSFreeSCSIAdapter(conn))) { - VIR_ERROR(_("Unable to create new virtual adapter")); - goto cleanup; - } - } - } - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "mkvdev -vdev %s -vadapter %s", - virDomainDiskGetSource(dev->data.disk), scsi_adapter); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - if (!(profile = phypGetLparProfile(conn, domain->id))) { - VIR_ERROR(_("Unable to get VIOS profile name.")); - goto cleanup; - } - - /* Let's get the slot number for the adapter we just created - * */ - virBufferAddLit(&buf, "lshwres -r virtualio --rsubtype scsi"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, - " slot_num,backing_device|grep %s|cut -d, -f1", - virDomainDiskGetSource(dev->data.disk)); - if (phypExecInt(session, &buf, conn, &slot) < 0) - goto cleanup; - - /* Listing all the virtual_scsi_adapter interfaces, the new adapter must - * be appended to this list - * */ - virBufferAddLit(&buf, "lssyscfg"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, - " -r prof --filter lpar_ids=%d,profile_names=%s" - " -F virtual_scsi_adapters|sed -e 's/\"//g'", - vios_id, profile); - VIR_FREE(ret); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - /* Here I change the LPAR configuration to append the new adapter - * with the new slot we just created - * */ - virBufferAddLit(&buf, "chsyscfg"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, - " -r prof -i 'name=%s,lpar_id=%d," - "\"virtual_scsi_adapters=%s,%d/client/%d/%s/0\"'", - domain_name, domain->id, ret, slot, - vios_id, vios_name); - if (phypExecInt(session, &buf, conn, &slot) < 0) - goto cleanup; - - /* Finally I add the new scsi adapter to VIOS using the same slot - * I used in the VIOS configuration. - * */ - virBufferAddLit(&buf, "chhwres -r virtualio --rsubtype scsi"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, - " -p %s -o a -s %d -d 0 -a \"adapter_type=server\"", - domain_name, slot); - VIR_FREE(ret); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) { - VIR_ERROR(_ - ("Possibly you don't have IBM Tools installed in your LPAR." - "Contact your support to enable this feature.")); - goto cleanup; - } - - result = 0; - - cleanup: - VIR_FREE(ret); - virDomainDeviceDefFree(dev); - virDomainDefFree(def); - VIR_FREE(vios_name); - VIR_FREE(scsi_adapter); - VIR_FREE(profile); - VIR_FREE(domain_name); - - return result; -} - -static int -phypDomainAttachDevice(virDomainPtr domain, const char *xml) -{ - return phypDomainAttachDeviceFlags(domain, xml, 0); -} - -static char * -phypStorageVolGetKey(virConnectPtr conn, const char *name) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "lslv %s -field lvid", name); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAddLit(&buf, "|sed -e 's/^LV IDENTIFIER://' -e 's/ //g'"); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0) - VIR_FREE(ret); - return ret; -} - -static char * -phypGetStoragePoolDevice(virConnectPtr conn, char *name) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "lssp -detail -sp %s -field name", name); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAddLit(&buf, "|sed '1d; s/ //g'"); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0) - VIR_FREE(ret); - return ret; -} - -static unsigned long int -phypGetStoragePoolSize(virConnectPtr conn, char *name) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int sp_size = -1; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "lssp -detail -sp %s -field size", name); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAddLit(&buf, "|sed '1d; s/ //g'"); - phypExecInt(session, &buf, conn, &sp_size); - return sp_size; -} - -static char * -phypBuildVolume(virConnectPtr conn, const char *lvname, const char *spname, - unsigned int capacity) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int vios_id = phyp_driver->vios_id; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - char *ret = NULL; - int exit_status = 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *key = NULL; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "mklv -lv %s %s %d", lvname, spname, capacity); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0) { - VIR_ERROR(_("Unable to create Volume: %s"), NULLSTR(ret)); - goto cleanup; - } - - key = phypStorageVolGetKey(conn, lvname); - - cleanup: - VIR_FREE(ret); - - return key; -} - -static virStorageVolPtr -phypStorageVolLookupByName(virStoragePoolPtr pool, const char *volname) -{ - char *key; - virStorageVolPtr vol; - - key = phypStorageVolGetKey(pool->conn, volname); - - if (key == NULL) - return NULL; - - vol = virGetStorageVol(pool->conn, pool->name, volname, key, NULL, NULL); - - VIR_FREE(key); - - return vol; -} - -static virStorageVolPtr -phypStorageVolCreateXML(virStoragePoolPtr pool, - const char *xml, unsigned int flags) -{ - virCheckFlags(0, NULL); - - virStorageVolPtr vol = NULL; - virStorageVolPtr dup_vol = NULL; - char *key = NULL; - g_autoptr(virStorageVolDef) voldef = NULL; - g_autoptr(virStoragePoolDef) spdef = NULL; - - if (VIR_ALLOC(spdef) < 0) - return NULL; - - /* Filling spdef manually - * */ - if (pool->name != NULL) { - spdef->name = pool->name; - } else { - VIR_ERROR(_("Unable to determine storage pool's name.")); - goto err; - } - - if (memcpy(spdef->uuid, pool->uuid, VIR_UUID_BUFLEN) == NULL) { - VIR_ERROR(_("Unable to determine storage pool's uuid.")); - goto err; - } - - if ((spdef->capacity = - phypGetStoragePoolSize(pool->conn, pool->name)) == -1) { - VIR_ERROR(_("Unable to determine storage pools's size.")); - goto err; - } - - /* Information not available */ - spdef->allocation = 0; - spdef->available = 0; - - spdef->source.ndevice = 1; - - /*XXX source adapter not working properly, should show hdiskX */ - if ((spdef->source.adapter.data.scsi_host.name = - phypGetStoragePoolDevice(pool->conn, pool->name)) == NULL) { - VIR_ERROR(_("Unable to determine storage pools's source adapter.")); - goto err; - } - - if ((voldef = virStorageVolDefParseString(spdef, xml, 0)) == NULL) { - VIR_ERROR(_("Error parsing volume XML.")); - goto err; - } - - /* checking if this name already exists on this system */ - if ((dup_vol = phypStorageVolLookupByName(pool, voldef->name)) != NULL) { - VIR_ERROR(_("StoragePool name already exists.")); - virObjectUnref(dup_vol); - goto err; - } - - /* The key must be NULL, the Power Hypervisor creates a key - * in the moment you create the volume. - * */ - if (voldef->key) { - VIR_ERROR(_("Key must be empty, Power Hypervisor will create one for you.")); - goto err; - } - - if (!voldef->target.capacity) { - VIR_ERROR(_("Capacity cannot be empty.")); - goto err; - } - - key = phypBuildVolume(pool->conn, voldef->name, spdef->name, - voldef->target.capacity); - - if (key == NULL) - goto err; - - if ((vol = - virGetStorageVol(pool->conn, pool->name, voldef->name, - key, NULL, NULL)) == NULL) - goto err; - - VIR_FREE(key); - - return vol; - - err: - VIR_FREE(key); - virObjectUnref(vol); - return NULL; -} - -static char * -phypStorageVolGetPhysicalVolumeByStoragePool(virStorageVolPtr vol, char *sp) -{ - virConnectPtr conn = vol->conn; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "lssp -detail -sp %s -field pvname", sp); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAddLit(&buf, "|sed 1d"); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0) - VIR_FREE(ret); - return ret; -} - -static virStorageVolPtr -phypStorageVolLookupByPath(virConnectPtr conn, const char *volname) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - char *ret = NULL; - char *key = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - virStorageVolPtr vol = NULL; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "lslv %s -field vgname", volname); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAddLit(&buf, "|sed -e 's/^VOLUME GROUP://g' -e 's/ //g'"); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - key = phypStorageVolGetKey(conn, volname); - - if (key == NULL) - goto cleanup; - - vol = virGetStorageVol(conn, ret, volname, key, NULL, NULL); - - cleanup: - VIR_FREE(ret); - VIR_FREE(key); - - return vol; -} - -static int -phypGetStoragePoolUUID(virConnectPtr conn, unsigned char *uuid, - const char *name) -{ - int result = -1; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "lsdev -dev %s -attr vgserial_id", name); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAddLit(&buf, "|sed '1,2d'"); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - if (memcpy(uuid, ret, VIR_UUID_BUFLEN) == NULL) - goto cleanup; - - result = 0; - - cleanup: - VIR_FREE(ret); - - return result; -} - -static virStoragePoolPtr -phypStoragePoolLookupByName(virConnectPtr conn, const char *name) -{ - unsigned char uuid[VIR_UUID_BUFLEN]; - - if (phypGetStoragePoolUUID(conn, uuid, name) == -1) - return NULL; - - return virGetStoragePool(conn, name, uuid, NULL, NULL); -} - -static char * -phypStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) -{ - virStorageVolDef voldef; - virStoragePoolDef pool; - virStoragePoolPtr sp; - char *xml = NULL; - - virCheckFlags(0, NULL); - - memset(&voldef, 0, sizeof(virStorageVolDef)); - memset(&pool, 0, sizeof(virStoragePoolDef)); - - sp = phypStoragePoolLookupByName(vol->conn, vol->pool); - - if (!sp) - goto cleanup; - - if (sp->name != NULL) { - pool.name = sp->name; - } else { - VIR_ERROR(_("Unable to determine storage sp's name.")); - goto cleanup; - } - - if (memcpy(pool.uuid, sp->uuid, VIR_UUID_BUFLEN) == NULL) { - VIR_ERROR(_("Unable to determine storage sp's uuid.")); - goto cleanup; - } - - if ((pool.capacity = phypGetStoragePoolSize(sp->conn, sp->name)) == -1) { - VIR_ERROR(_("Unable to determine storage sps's size.")); - goto cleanup; - } - - /* Information not available */ - pool.allocation = 0; - pool.available = 0; - - pool.source.ndevice = 1; - - if ((pool.source.adapter.data.scsi_host.name = - phypGetStoragePoolDevice(sp->conn, sp->name)) == NULL) { - VIR_ERROR(_("Unable to determine storage sps's source adapter.")); - goto cleanup; - } - - if (vol->name != NULL) { - voldef.name = vol->name; - } else { - VIR_ERROR(_("Unable to determine storage pool's name.")); - goto cleanup; - } - - voldef.key = g_strdup(vol->key); - - voldef.type = VIR_STORAGE_POOL_LOGICAL; - - xml = virStorageVolDefFormat(&pool, &voldef); - - VIR_FREE(voldef.key); - - cleanup: - virObjectUnref(sp); - return xml; -} - -/* The Volume Group path here will be treated as suggested in the - * email on the libvirt mailling list. As soon as I can't get the - * path for every volume, the path will be a representation in - * the form: - * - * /physical_volume/storage_pool/logical_volume - * - * */ -static char * -phypStorageVolGetPath(virStorageVolPtr vol) -{ - virConnectPtr conn = vol->conn; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - char *ret = NULL; - char *path = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *pv; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "lslv %s -field vgname", vol->name); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAsprintf(&buf, - "|sed -e 's/^VOLUME GROUP://g' -e 's/ //g'"); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - pv = phypStorageVolGetPhysicalVolumeByStoragePool(vol, ret); - - if (!pv) - goto cleanup; - - path = g_strdup_printf("/%s/%s/%s", pv, ret, vol->name); - - cleanup: - VIR_FREE(ret); - VIR_FREE(path); - - return path; -} - -static int -phypStoragePoolListVolumes(virStoragePoolPtr pool, char **const volumes, - int nvolumes) -{ - bool success = false; - virConnectPtr conn = pool->conn; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - int got = 0; - size_t i; - char *ret = NULL; - char *volumes_list = NULL; - char *char_ptr = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "lsvg -lv %s -field lvname", pool->name); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAddLit(&buf, "|sed '1,2d'"); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - /* I need to parse the textual return in order to get the volumes */ - if (exit_status < 0 || ret == NULL) { - goto cleanup; - } else { - volumes_list = ret; - - while (got < nvolumes) { - char_ptr = strchr(volumes_list, '\n'); - - if (char_ptr) { - *char_ptr = '\0'; - volumes[got++] = g_strdup(volumes_list); - char_ptr++; - volumes_list = char_ptr; - } else { - break; - } - } - } - - success = true; - - cleanup: - if (!success) { - for (i = 0; i < got; i++) - VIR_FREE(volumes[i]); - - got = -1; - } - VIR_FREE(ret); - return got; -} - -static int -phypStoragePoolNumOfVolumes(virStoragePoolPtr pool) -{ - virConnectPtr conn = pool->conn; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - int nvolumes = -1; - char *managed_system = phyp_driver->managed_system; - int vios_id = phyp_driver->vios_id; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - virBufferAsprintf(&buf, "lsvg -lv %s -field lvname", pool->name); - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - virBufferAddLit(&buf, "|grep -c '^.*$'"); - if (phypExecInt(session, &buf, conn, &nvolumes) < 0) - return -1; - - /* We need to remove 2 line from the header text output */ - return nvolumes - 2; -} - -static int -phypStoragePoolDestroy(virStoragePoolPtr pool) -{ - int result = -1; - virConnectPtr conn = pool->conn; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int vios_id = phyp_driver->vios_id; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - char *ret = NULL; - int exit_status = 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "rmsp %s", pool->name); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0) { - VIR_ERROR(_("Unable to destroy Storage Pool: %s"), NULLSTR(ret)); - goto cleanup; - } - - result = 0; - - cleanup: - VIR_FREE(ret); - - return result; -} - -static int -phypBuildStoragePool(virConnectPtr conn, virStoragePoolDefPtr def) -{ - int result = -1; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - virStoragePoolSource source = def->source; - int vios_id = phyp_driver->vios_id; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - char *ret = NULL; - int exit_status = 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (source.adapter.type != VIR_STORAGE_ADAPTER_TYPE_SCSI_HOST) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Only 'scsi_host' adapter is supported")); - goto cleanup; - } - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAsprintf(&buf, "mksp -f %schild %s", def->name, - source.adapter.data.scsi_host.name); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0) { - VIR_ERROR(_("Unable to create Storage Pool: %s"), NULLSTR(ret)); - goto cleanup; - } - - result = 0; - - cleanup: - VIR_FREE(ret); - - return result; - -} - -static int -phypConnectNumOfStoragePools(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - int nsp = -1; - char *managed_system = phyp_driver->managed_system; - int vios_id = phyp_driver->vios_id; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAddLit(&buf, "lsvg"); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - - virBufferAddLit(&buf, "|grep -c '^.*$'"); - phypExecInt(session, &buf, conn, &nsp); - return nsp; -} - -static int -phypConnectListStoragePools(virConnectPtr conn, char **const pools, int npools) -{ - bool success = false; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - int got = 0; - size_t i; - char *ret = NULL; - char *storage_pools = NULL; - char *char_ptr = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (system_type == HMC) - virBufferAsprintf(&buf, "viosvrcmd -m %s --id %d -c '", - managed_system, vios_id); - - virBufferAddLit(&buf, "lsvg"); - - if (system_type == HMC) - virBufferAddChar(&buf, '\''); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - /* I need to parse the textual return in order to get the storage pools */ - if (exit_status < 0 || ret == NULL) { - goto cleanup; - } else { - storage_pools = ret; - - while (got < npools) { - char_ptr = strchr(storage_pools, '\n'); - - if (char_ptr) { - *char_ptr = '\0'; - pools[got++] = g_strdup(storage_pools); - char_ptr++; - storage_pools = char_ptr; - } else { - break; - } - } - } - - success = true; - - cleanup: - if (!success) { - for (i = 0; i < got; i++) - VIR_FREE(pools[i]); - - got = -1; - } - VIR_FREE(ret); - return got; -} - -static virStoragePoolPtr -phypStoragePoolLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) -{ - virStoragePoolPtr sp = NULL; - int npools = 0; - int gotpools = 0; - char **pools = NULL; - size_t i = 0; - unsigned char *local_uuid = NULL; - - if (VIR_ALLOC_N(local_uuid, VIR_UUID_BUFLEN) < 0) - goto err; - - if ((npools = phypConnectNumOfStoragePools(conn)) == -1) - goto err; - - if (VIR_ALLOC_N(pools, npools) < 0) - goto err; - - if ((gotpools = phypConnectListStoragePools(conn, pools, npools)) == -1) - goto err; - - if (gotpools != npools) { - virReportOOMError(); - goto err; - } - - for (i = 0; i < gotpools; i++) { - if (phypGetStoragePoolUUID(conn, local_uuid, pools[i]) == -1) - continue; - - if (!memcmp(local_uuid, uuid, VIR_UUID_BUFLEN)) { - sp = virGetStoragePool(conn, pools[i], uuid, NULL, NULL); - VIR_FREE(local_uuid); - VIR_FREE(pools); - - if (sp) - return sp; - else - goto err; - } - } - - err: - VIR_FREE(local_uuid); - VIR_FREE(pools); - return NULL; -} - -static virStoragePoolPtr -phypStoragePoolCreateXML(virConnectPtr conn, - const char *xml, unsigned int flags) -{ - virCheckFlags(0, NULL); - - virStoragePoolDefPtr def = NULL; - virStoragePoolPtr dup_sp = NULL; - virStoragePoolPtr sp = NULL; - - if (!(def = virStoragePoolDefParseString(xml))) - goto err; - - /* checking if this name already exists on this system */ - if ((dup_sp = phypStoragePoolLookupByName(conn, def->name)) != NULL) { - VIR_WARN("StoragePool name already exists."); - virObjectUnref(dup_sp); - goto err; - } - - /* checking if ID or UUID already exists on this system */ - if ((dup_sp = phypStoragePoolLookupByUUID(conn, def->uuid)) != NULL) { - VIR_WARN("StoragePool uuid already exists."); - virObjectUnref(dup_sp); - goto err; - } - - if ((sp = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL)) == NULL) - goto err; - - if (phypBuildStoragePool(conn, def) == -1) - goto err; - - return sp; - - err: - virStoragePoolDefFree(def); - virObjectUnref(sp); - return NULL; -} - -static char * -phypStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) -{ - virCheckFlags(0, NULL); - - virStoragePoolDef def; - memset(&def, 0, sizeof(virStoragePoolDef)); - - if (pool->name != NULL) { - def.name = pool->name; - } else { - VIR_ERROR(_("Unable to determine storage pool's name.")); - goto err; - } - - if (memcpy(def.uuid, pool->uuid, VIR_UUID_BUFLEN) == NULL) { - VIR_ERROR(_("Unable to determine storage pool's uuid.")); - goto err; - } - - if ((def.capacity = - phypGetStoragePoolSize(pool->conn, pool->name)) == -1) { - VIR_ERROR(_("Unable to determine storage pools's size.")); - goto err; - } - - /* Information not available */ - def.allocation = 0; - def.available = 0; - - def.source.ndevice = 1; - - /*XXX source adapter not working properly, should show hdiskX */ - if ((def.source.adapter.data.scsi_host.name = - phypGetStoragePoolDevice(pool->conn, pool->name)) == NULL) { - VIR_ERROR(_("Unable to determine storage pools's source adapter.")); - goto err; - } - - return virStoragePoolDefFormat(&def); - - err: - return NULL; -} - -static int -phypInterfaceDestroy(virInterfacePtr iface, - unsigned int flags) -{ - virCheckFlags(0, -1); - - phyp_driverPtr phyp_driver = iface->conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int exit_status = 0; - int slot_num = 0; - int lpar_id = 0; - char *ret = NULL; - int rv = -1; - - /* Getting the remote slot number */ - - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype eth --level lpar " - " -F mac_addr,slot_num|" - " sed -n '/%s/ s/^.*,//p'", iface->mac); - if (phypExecInt(session, &buf, iface->conn, &slot_num) < 0) - goto cleanup; - - /* Getting the remote slot number */ - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype eth --level lpar " - " -F mac_addr,lpar_id|" - " sed -n '/%s/ s/^.*,//p'", iface->mac); - if (phypExecInt(session, &buf, iface->conn, &lpar_id) < 0) - goto cleanup; - - /* excluding interface */ - virBufferAddLit(&buf, "chhwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype eth" - " --id %d -o r -s %d", lpar_id, slot_num); - VIR_FREE(ret); - ret = phypExecBuffer(session, &buf, &exit_status, iface->conn, false); - - if (exit_status < 0 || ret != NULL) - goto cleanup; - - rv = 0; - - cleanup: - VIR_FREE(ret); - return rv; -} - -static virInterfacePtr -phypInterfaceDefineXML(virConnectPtr conn, const char *xml, - unsigned int flags) -{ - virCheckFlags(0, NULL); - - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int exit_status = 0; - int slot = 0; - char *ret = NULL; - char name[PHYP_IFACENAME_SIZE]; - char mac[PHYP_MAC_SIZE]; - virInterfaceDefPtr def; - virInterfacePtr result = NULL; - - if (!(def = virInterfaceDefParseString(xml))) - goto cleanup; - - /* Now need to get the next free slot number */ - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype slot --level slot" - " -Fslot_num --filter lpar_names=%s" - " |sort|tail -n 1", def->name); - if (phypExecInt(session, &buf, conn, &slot) < 0) - goto cleanup; - - /* The next free slot itself: */ - slot++; - - /* Now adding the new network interface */ - virBufferAddLit(&buf, "chhwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype eth" - " -p %s -o a -s %d -a port_vlan_id=1," - "ieee_virtual_eth=0", def->name, slot); - VIR_FREE(ret); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret != NULL) - goto cleanup; - - /* Need to sleep a little while to wait for the HMC to - * complete the execution of the command. - * */ - sleep(1); - - /* Getting the new interface name */ - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype slot --level slot" - " |sed '/lpar_name=%s/!d; /slot_num=%d/!d; " - "s/^.*drc_name=//'", def->name, slot); - VIR_FREE(ret); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) { - /* roll back and excluding interface if error*/ - virBufferAddLit(&buf, "chhwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype eth" - " -p %s -o r -s %d", def->name, slot); - VIR_FREE(ret); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - goto cleanup; - } - - memcpy(name, ret, PHYP_IFACENAME_SIZE-1); - - /* Getting the new interface mac addr */ - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - "-r virtualio --rsubtype eth --level lpar " - " |sed '/lpar_name=%s/!d; /slot_num=%d/!d; " - "s/^.*mac_addr=//'", def->name, slot); - VIR_FREE(ret); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - memcpy(mac, ret, PHYP_MAC_SIZE-1); - - result = virGetInterface(conn, name, mac); - - cleanup: - VIR_FREE(ret); - virInterfaceDefFree(def); - return result; -} - -static virInterfacePtr -phypInterfaceLookupByName(virConnectPtr conn, const char *name) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int exit_status = 0; - char *ret = NULL; - int slot = 0; - int lpar_id = 0; - char mac[PHYP_MAC_SIZE]; - virInterfacePtr result = NULL; - - /*Getting the slot number for the interface */ - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype slot --level slot " - " -F drc_name,slot_num |" - " sed -n '/%s/ s/^.*,//p'", name); - if (phypExecInt(session, &buf, conn, &slot) < 0) - goto cleanup; - - /*Getting the lpar_id for the interface */ - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype slot --level slot " - " -F drc_name,lpar_id |" - " sed -n '/%s/ s/^.*,//p'", name); - if (phypExecInt(session, &buf, conn, &lpar_id) < 0) - goto cleanup; - - /*Getting the interface mac */ - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype eth --level lpar " - " -F lpar_id,slot_num,mac_addr|" - " sed -n '/%d,%d/ s/^.*,//p'", lpar_id, slot); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - memcpy(mac, ret, PHYP_MAC_SIZE-1); - - result = virGetInterface(conn, name, ret); - - cleanup: - VIR_FREE(ret); - return result; -} - -static int -phypInterfaceIsActive(virInterfacePtr iface) -{ - phyp_driverPtr phyp_driver = iface->conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - virBuffer buf = VIR_BUFFER_INITIALIZER; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int state = -1; - - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - " -r virtualio --rsubtype eth --level lpar " - " -F mac_addr,state |" - " sed -n '/%s/ s/^.*,//p'", iface->mac); - phypExecInt(session, &buf, iface->conn, &state); - return state; -} - -static int -phypConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - int vios_id = phyp_driver->vios_id; - int exit_status = 0; - int got = 0; - size_t i; - char *ret = NULL; - char *networks = NULL; - char *char_ptr = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - bool success = false; - - virBufferAddLit(&buf, "lshwres"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -r virtualio --rsubtype slot --level slot|" - " sed '/eth/!d; /lpar_id=%d/d; s/^.*drc_name=//g'", - vios_id); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - /* I need to parse the textual return in order to get the network - * interfaces */ - if (exit_status < 0 || ret == NULL) - goto cleanup; - - networks = ret; - - while (got < nnames) { - char_ptr = strchr(networks, '\n'); - - if (char_ptr) { - *char_ptr = '\0'; - names[got++] = g_strdup(networks); - char_ptr++; - networks = char_ptr; - } else { - break; - } - } - - cleanup: - if (!success) { - for (i = 0; i < got; i++) - VIR_FREE(names[i]); - } - VIR_FREE(ret); - return got; -} - -static int -phypConnectNumOfInterfaces(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - int system_type = phyp_driver->system_type; - int vios_id = phyp_driver->vios_id; - int nnets = -1; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "lshwres "); - if (system_type == HMC) - virBufferAsprintf(&buf, "-m %s ", managed_system); - - virBufferAsprintf(&buf, - "-r virtualio --rsubtype eth --level lpar|" - "grep -v lpar_id=%d|grep -c lpar_name", vios_id); - phypExecInt(session, &buf, conn, &nnets); - return nnets; -} - -static int -phypGetLparState(virConnectPtr conn, unsigned int lpar_id) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *ret = NULL; - int exit_status = 0; - char *managed_system = phyp_driver->managed_system; - int state = VIR_DOMAIN_NOSTATE; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "lssyscfg -r lpar"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -F state --filter lpar_ids=%d", lpar_id); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - if (STREQ(ret, "Running")) - state = VIR_DOMAIN_RUNNING; - else if (STREQ(ret, "Not Activated")) - state = VIR_DOMAIN_SHUTOFF; - else if (STREQ(ret, "Shutting Down")) - state = VIR_DOMAIN_SHUTDOWN; - - cleanup: - VIR_FREE(ret); - return state; -} - -/* XXX - is this needed? */ -static int phypDiskType(virConnectPtr, char *) G_GNUC_UNUSED; -static int -phypDiskType(virConnectPtr conn, char *backing_device) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *ret = NULL; - int exit_status = 0; - char *managed_system = phyp_driver->managed_system; - int vios_id = phyp_driver->vios_id; - int disk_type = -1; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "viosvrcmd"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -p %d -c \"lssp -field name type " - "-fmt , -all|sed -n '/%s/ {\n s/^.*,//\n p\n}'\"", - vios_id, backing_device); - ret = phypExecBuffer(session, &buf, &exit_status, conn, true); - - if (exit_status < 0 || ret == NULL) - goto cleanup; - - if (STREQ(ret, "LVPOOL")) - disk_type = VIR_STORAGE_TYPE_BLOCK; - else if (STREQ(ret, "FBPOOL")) - disk_type = VIR_STORAGE_TYPE_FILE; - - cleanup: - VIR_FREE(ret); - return disk_type; -} - -static int -phypConnectNumOfDefinedDomains(virConnectPtr conn) -{ - return phypConnectNumOfDomainsGeneric(conn, 1); -} - -static int -phypConnectNumOfDomains(virConnectPtr conn) -{ - return phypConnectNumOfDomainsGeneric(conn, 0); -} - -static int -phypConnectListDomains(virConnectPtr conn, int *ids, int nids) -{ - return phypConnectListDomainsGeneric(conn, ids, nids, 0); -} - -static int -phypConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) -{ - bool success = false; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - int exit_status = 0; - int got = 0; - size_t i; - char *ret = NULL; - char *domains = NULL; - char *char_ptr = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "lssyscfg -r lpar"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAddLit(&buf, " -F name,state" - "|sed -n '/Not Activated/ {\n s/,.*$//\n p\n}'"); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - /* I need to parse the textual return in order to get the domains */ - if (exit_status < 0 || ret == NULL) { - goto cleanup; - } else { - domains = ret; - - while (got < nnames) { - char_ptr = strchr(domains, '\n'); - - if (char_ptr) { - *char_ptr = '\0'; - names[got++] = g_strdup(domains); - char_ptr++; - domains = char_ptr; - } else { - break; - } - } - } - - success = true; - - cleanup: - if (!success) { - for (i = 0; i < got; i++) - VIR_FREE(names[i]); - - got = -1; - } - VIR_FREE(ret); - return got; -} - -static virDomainPtr -phypDomainLookupByName(virConnectPtr conn, const char *lpar_name) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int lpar_id = 0; - char *managed_system = phyp_driver->managed_system; - unsigned char lpar_uuid[VIR_UUID_BUFLEN]; - - lpar_id = phypGetLparID(session, managed_system, lpar_name, conn); - if (lpar_id == -1) - return NULL; - - if (phypGetLparUUID(lpar_uuid, lpar_id, conn) == -1) - return NULL; - - return virGetDomain(conn, lpar_name, lpar_uuid, lpar_id); -} - -static virDomainPtr -phypDomainLookupByID(virConnectPtr conn, int lpar_id) -{ - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - virDomainPtr dom = NULL; - char *managed_system = phyp_driver->managed_system; - unsigned char lpar_uuid[VIR_UUID_BUFLEN]; - - char *lpar_name = phypGetLparNAME(session, managed_system, lpar_id, - conn); - - if (phypGetLparUUID(lpar_uuid, lpar_id, conn) == -1) - goto cleanup; - - dom = virGetDomain(conn, lpar_name, lpar_uuid, lpar_id); - - cleanup: - VIR_FREE(lpar_name); - - return dom; -} - -static char * -phypDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) -{ - phyp_driverPtr phyp_driver = dom->conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - virDomainDef def; - char *managed_system = phyp_driver->managed_system; - unsigned long long memory; - unsigned int vcpus; - - virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS, NULL); - - memset(&def, 0, sizeof(virDomainDef)); - - def.virtType = VIR_DOMAIN_VIRT_PHYP; - def.id = dom->id; - - char *lpar_name = phypGetLparNAME(session, managed_system, def.id, - dom->conn); - - if (lpar_name == NULL) { - VIR_ERROR(_("Unable to determine domain's name.")); - goto err; - } - - if (phypGetLparUUID(def.uuid, dom->id, dom->conn) == -1) { - VIR_ERROR(_("Unable to generate random uuid.")); - goto err; - } - - if ((memory = phypGetLparMem(dom->conn, managed_system, dom->id, 0)) == 0) { - VIR_ERROR(_("Unable to determine domain's max memory.")); - goto err; - } - - virDomainDefSetMemoryTotal(&def, memory); - - if ((def.mem.cur_balloon = - phypGetLparMem(dom->conn, managed_system, dom->id, 1)) == 0) { - VIR_ERROR(_("Unable to determine domain's memory.")); - goto err; - } - - if ((vcpus = phypGetLparCPU(dom->conn, managed_system, dom->id)) == 0) { - VIR_ERROR(_("Unable to determine domain's CPU.")); - goto err; - } - - if (virDomainDefSetVcpusMax(&def, vcpus, phyp_driver->xmlopt) < 0) - goto err; - - if (virDomainDefSetVcpus(&def, vcpus) < 0) - goto err; - - return virDomainDefFormat(&def, phyp_driver->xmlopt, - virDomainDefFormatConvertXMLFlags(flags)); - - err: - return NULL; -} - -static int -phypDomainResume(virDomainPtr dom) -{ - int result = -1; - phyp_driverPtr phyp_driver = dom->conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferAddLit(&buf, "chsysstate"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -r lpar -o on --id %d -f %s", - dom->id, dom->name); - ret = phypExecBuffer(session, &buf, &exit_status, dom->conn, false); - - if (exit_status < 0) - goto cleanup; - - result = 0; - - cleanup: - VIR_FREE(ret); - - return result; -} - -static int -phypDomainReboot(virDomainPtr dom, unsigned int flags) -{ - int result = -1; - virConnectPtr conn = dom->conn; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virCheckFlags(0, -1); - - virBufferAddLit(&buf, "chsysstate"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, - " -r lpar -o shutdown --id %d --immed --restart", - dom->id); - ret = phypExecBuffer(session, &buf, &exit_status, dom->conn, false); - - if (exit_status < 0) - goto cleanup; - - result = 0; - - cleanup: - VIR_FREE(ret); - - return result; -} - -static int -phypDomainShutdownFlags(virDomainPtr dom, unsigned int flags) -{ - int result = -1; - virConnectPtr conn = dom->conn; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virCheckFlags(0, -1); - - virBufferAddLit(&buf, "chsysstate"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -r lpar -o shutdown --id %d", dom->id); - ret = phypExecBuffer(session, &buf, &exit_status, dom->conn, false); - - if (exit_status < 0) - goto cleanup; - - result = 0; - - cleanup: - VIR_FREE(ret); - - return result; -} - -static int -phypDomainShutdown(virDomainPtr dom) -{ - return phypDomainShutdownFlags(dom, 0); -} - -static int -phypDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) -{ - phyp_driverPtr phyp_driver = dom->conn->privateData; - char *managed_system = phyp_driver->managed_system; - - info->state = phypGetLparState(dom->conn, dom->id); - - if ((info->maxMem = - phypGetLparMem(dom->conn, managed_system, dom->id, 0)) == 0) - VIR_WARN("Unable to determine domain's max memory."); - - if ((info->memory = - phypGetLparMem(dom->conn, managed_system, dom->id, 1)) == 0) - VIR_WARN("Unable to determine domain's memory."); - - if ((info->nrVirtCpu = - phypGetLparCPU(dom->conn, managed_system, dom->id)) == 0) - VIR_WARN("Unable to determine domain's CPU."); - - return 0; -} - -static int -phypDomainGetState(virDomainPtr dom, - int *state, - int *reason, - unsigned int flags) -{ - virCheckFlags(0, -1); - - *state = phypGetLparState(dom->conn, dom->id); - if (reason) - *reason = 0; - - return 0; -} - -static int -phypDomainDestroyFlags(virDomainPtr dom, - unsigned int flags) -{ - int result = -1; - phyp_driverPtr phyp_driver = dom->conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - int exit_status = 0; - char *ret = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virCheckFlags(0, -1); - - virBufferAddLit(&buf, "rmsyscfg"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -r lpar --id %d", dom->id); - ret = phypExecBuffer(session, &buf, &exit_status, dom->conn, false); - - if (exit_status < 0) - goto cleanup; - - if (phypUUIDTable_RemLpar(dom->conn, dom->id) == -1) - goto cleanup; - - dom->id = -1; - result = 0; - - cleanup: - VIR_FREE(ret); - - return result; -} - -static int -phypDomainDestroy(virDomainPtr dom) -{ - return phypDomainDestroyFlags(dom, 0); -} - -static int -phypBuildLpar(virConnectPtr conn, virDomainDefPtr def) -{ - int result = -1; - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - char *ret = NULL; - int exit_status = 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (!def->mem.cur_balloon) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Field <currentMemory> on the domain XML file is " - "missing or has invalid value")); - goto cleanup; - } - - if (!virDomainDefGetMemoryInitial(def)) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Field <memory> on the domain XML file is missing or " - "has invalid value")); - goto cleanup; - } - - if (def->ndisks < 1) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Domain XML must contain at least one <disk> element.")); - goto cleanup; - } - - if (!virDomainDiskGetSource(def->disks[0])) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Field <src> under <disk> on the domain XML file is " - "missing.")); - goto cleanup; - } - - virBufferAddLit(&buf, "mksyscfg"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " -r lpar -p %s -i min_mem=%lld,desired_mem=%lld," - "max_mem=%lld,desired_procs=%u,virtual_scsi_adapters=%s", - def->name, def->mem.cur_balloon, - def->mem.cur_balloon, - virDomainDefGetMemoryInitial(def), - virDomainDefGetVcpus(def), - virDomainDiskGetSource(def->disks[0])); - ret = phypExecBuffer(session, &buf, &exit_status, conn, false); - - if (exit_status < 0) { - VIR_ERROR(_("Unable to create LPAR. Reason: '%s'"), NULLSTR(ret)); - goto cleanup; - } - - if (phypUUIDTable_AddLpar(conn, def->uuid, def->id) == -1) { - VIR_ERROR(_("Unable to add LPAR to the table")); - goto cleanup; - } - - result = 0; - - cleanup: - VIR_FREE(ret); - - return result; -} - -static virDomainPtr -phypDomainCreateXML(virConnectPtr conn, - const char *xml, unsigned int flags) -{ - virCheckFlags(0, NULL); - - phyp_driverPtr phyp_driver = conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - virDomainDefPtr def = NULL; - virDomainPtr dom = NULL; - uuid_tablePtr uuid_table = phyp_driver->uuid_table; - lparPtr *lpars = uuid_table->lpars; - size_t i = 0; - char *managed_system = phyp_driver->managed_system; - unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; - - virCheckFlags(VIR_DOMAIN_START_VALIDATE, NULL); - - if (flags & VIR_DOMAIN_START_VALIDATE) - parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; - - if (!(def = virDomainDefParseString(xml, - phyp_driver->xmlopt, - NULL, - parse_flags))) - goto err; - - /* checking if this name already exists on this system */ - if (phypGetLparID(session, managed_system, def->name, conn) != -1) { - VIR_WARN("LPAR name already exists."); - goto err; - } - - /* checking if ID or UUID already exists on this system */ - for (i = 0; i < uuid_table->nlpars; i++) { - if (lpars[i]->id == def->id || lpars[i]->uuid == def->uuid) { - VIR_WARN("LPAR ID or UUID already exists."); - goto err; - } - } - - if ((dom = virGetDomain(conn, def->name, def->uuid, def->id)) == NULL) - goto err; - - if (phypBuildLpar(conn, def) == -1) - goto err; - - if (phypDomainResume(dom) == -1) - goto err; - - return dom; - - err: - virDomainDefFree(def); - virObjectUnref(dom); - return NULL; -} - -static char * -phypConnectGetCapabilities(virConnectPtr conn) -{ - phyp_driverPtr phyp_driver = conn->privateData; - - return virCapabilitiesFormatXML(phyp_driver->caps); -} - -static int -phypDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, - unsigned int flags) -{ - phyp_driverPtr phyp_driver = dom->conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - int system_type = phyp_driver->system_type; - char *managed_system = phyp_driver->managed_system; - int exit_status = 0; - char *ret = NULL; - char operation; - unsigned long ncpus = 0; - unsigned int amount = 0; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - if (flags != VIR_DOMAIN_VCPU_LIVE) { - virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), flags); - return -1; - } - - if ((ncpus = phypGetLparCPU(dom->conn, managed_system, dom->id)) == 0) - return 0; - - if (nvcpus > phypDomainGetMaxVcpus(dom)) { - VIR_ERROR(_("You are trying to set a number of CPUs bigger than " - "the max possible.")); - return 0; - } - - if (ncpus > nvcpus) { - operation = 'r'; - amount = nvcpus - ncpus; - } else if (ncpus < nvcpus) { - operation = 'a'; - amount = nvcpus - ncpus; - } else { - return 0; - } - - virBufferAddLit(&buf, "chhwres -r proc"); - if (system_type == HMC) - virBufferAsprintf(&buf, " -m %s", managed_system); - virBufferAsprintf(&buf, " --id %d -o %c --procunits %d 2>&1 |sed " - "-e 's/^.*\$[0-9][0-9]*.[0-9][0-9]*\$.*$/\\1/'", - dom->id, operation, amount); - ret = phypExecBuffer(session, &buf, &exit_status, dom->conn, false); - - if (exit_status < 0) { - VIR_ERROR(_ - ("Possibly you don't have IBM Tools installed in your LPAR." - " Contact your support to enable this feature.")); - } - - VIR_FREE(ret); - return 0; - -} - -static int -phypDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) -{ - return phypDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE); -} - -static int -phypDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) -{ - phyp_driverPtr phyp_driver = dom->conn->privateData; - LIBSSH2_SESSION *session = phyp_driver->session; - char *managed_system = phyp_driver->managed_system; - char *lpar_name = NULL; - int ret = -1; - - virCheckFlags(0, -1); - - lpar_name = phypGetLparNAME(session, managed_system, dom->id, dom->conn); - - if (lpar_name == NULL) { - VIR_ERROR(_("Unable to determine domain's name.")); - goto cleanup; - } - - ret = 0; - - cleanup: - VIR_FREE(lpar_name); - return ret; -} - -static virHypervisorDriver phypHypervisorDriver = { - .name = "PHYP", - .connectOpen = phypConnectOpen, /* 0.7.0 */ - .connectClose = phypConnectClose, /* 0.7.0 */ - .connectGetCapabilities = phypConnectGetCapabilities, /* 0.7.3 */ - .connectListDomains = phypConnectListDomains, /* 0.7.0 */ - .connectNumOfDomains = phypConnectNumOfDomains, /* 0.7.0 */ - .domainCreateXML = phypDomainCreateXML, /* 0.7.3 */ - .domainLookupByID = phypDomainLookupByID, /* 0.7.0 */ - .domainLookupByName = phypDomainLookupByName, /* 0.7.0 */ - .domainResume = phypDomainResume, /* 0.7.0 */ - .domainShutdown = phypDomainShutdown, /* 0.7.0 */ - .domainShutdownFlags = phypDomainShutdownFlags, /* 5.6.0 */ - .domainReboot = phypDomainReboot, /* 0.9.1 */ - .domainDestroy = phypDomainDestroy, /* 0.7.3 */ - .domainDestroyFlags = phypDomainDestroyFlags, /* 0.9.4 */ - .domainGetInfo = phypDomainGetInfo, /* 0.7.0 */ - .domainGetState = phypDomainGetState, /* 0.9.2 */ - .domainSetVcpus = phypDomainSetVcpus, /* 0.7.3 */ - .domainSetVcpusFlags = phypDomainSetVcpusFlags, /* 0.8.5 */ - .domainGetVcpusFlags = phypDomainGetVcpusFlags, /* 0.8.5 */ - .domainGetMaxVcpus = phypDomainGetMaxVcpus, /* 0.7.3 */ - .domainGetXMLDesc = phypDomainGetXMLDesc, /* 0.7.0 */ - .connectListDefinedDomains = phypConnectListDefinedDomains, /* 0.7.0 */ - .connectNumOfDefinedDomains = phypConnectNumOfDefinedDomains, /* 0.7.0 */ - .domainAttachDevice = phypDomainAttachDevice, /* 0.8.2 */ - .domainAttachDeviceFlags = phypDomainAttachDeviceFlags, /* 5.6.0 */ - .connectIsEncrypted = phypConnectIsEncrypted, /* 0.7.3 */ - .connectIsSecure = phypConnectIsSecure, /* 0.7.3 */ - .domainIsUpdated = phypDomainIsUpdated, /* 0.8.6 */ - .connectIsAlive = phypConnectIsAlive, /* 0.9.8 */ - .domainHasManagedSaveImage = phypDomainHasManagedSaveImage, /* 1.2.13 */ -}; - -static virStorageDriver phypStorageDriver = { - .connectNumOfStoragePools = phypConnectNumOfStoragePools, /* 0.8.2 */ - .connectListStoragePools = phypConnectListStoragePools, /* 0.8.2 */ - .storagePoolLookupByName = phypStoragePoolLookupByName, /* 0.8.2 */ - .storagePoolLookupByUUID = phypStoragePoolLookupByUUID, /* 0.8.2 */ - .storagePoolCreateXML = phypStoragePoolCreateXML, /* 0.8.2 */ - .storagePoolDestroy = phypStoragePoolDestroy, /* 0.8.2 */ - .storagePoolGetXMLDesc = phypStoragePoolGetXMLDesc, /* 0.8.2 */ - .storagePoolNumOfVolumes = phypStoragePoolNumOfVolumes, /* 0.8.2 */ - .storagePoolListVolumes = phypStoragePoolListVolumes, /* 0.8.2 */ - - .storageVolLookupByName = phypStorageVolLookupByName, /* 0.8.2 */ - .storageVolLookupByPath = phypStorageVolLookupByPath, /* 0.8.2 */ - .storageVolCreateXML = phypStorageVolCreateXML, /* 0.8.2 */ - .storageVolGetXMLDesc = phypStorageVolGetXMLDesc, /* 0.8.2 */ - .storageVolGetPath = phypStorageVolGetPath, /* 0.8.2 */ -}; - -static virInterfaceDriver phypInterfaceDriver = { - .connectNumOfInterfaces = phypConnectNumOfInterfaces, /* 0.9.1 */ - .connectListInterfaces = phypConnectListInterfaces, /* 0.9.1 */ - .interfaceLookupByName = phypInterfaceLookupByName, /* 0.9.1 */ - .interfaceDefineXML = phypInterfaceDefineXML, /* 0.9.1 */ - .interfaceDestroy = phypInterfaceDestroy, /* 0.9.1 */ - .interfaceIsActive = phypInterfaceIsActive /* 0.9.1 */ -}; - -static virConnectDriver phypConnectDriver = { - .remoteOnly = true, - .uriSchemes = (const char *[]){ "phyp", NULL }, - .hypervisorDriver = &phypHypervisorDriver, - .interfaceDriver = &phypInterfaceDriver, - .storageDriver = &phypStorageDriver, -}; - -int -phypRegister(void) -{ - return virRegisterConnectDriver(&phypConnectDriver, - false); -} diff --git a/src/phyp/phyp_driver.h b/src/phyp/phyp_driver.h deleted file mode 100644 index d7076e3697..0000000000 --- a/src/phyp/phyp_driver.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2010, 2013 Red Hat, Inc. - * Copyright IBM Corp. 2009 - * - * phyp_driver.c: ssh layer to access Power Hypervisors - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#pragma once - -int phypRegister(void); -- 2.23.0

5 7

[libvirt] [jenkins-ci PATCH 0/3] lcitool: Some pip-related fixes
by Andrea Bolognani 08 Jan '20

08 Jan '20

Andrea Bolognani (3): lcitool: Rename temp -> resolved lcitool: Fix flattening of pip mappings lcitool: Fix pip use on CentOS 7 guests/playbooks/update/tasks/packages.yml | 61 ++++++++++++---------- 1 file changed, 32 insertions(+), 29 deletions(-) -- 2.24.1

2 6

[libvirt] [PATCH] qemu: fix implicit fallthrough warning
by Ján Tomko 08 Jan '20

08 Jan '20

src/qemu/qemu_domain_address.c:680:13: error: this statement may fall through [-Werror=implicit-fallthrough=] switch ((virDomainFSModel) dev->data.fs->model) { Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Fixes: f363af7e351c6cac0ff442390d0dab283cbd9fae --- Pushed src/qemu/qemu_domain_address.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 29ec97e735..9e3bcc434d 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -688,6 +688,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_FS_MODEL_LAST: break; } + break; case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP: case VIR_DOMAIN_FS_DRIVER_TYPE_NBD: -- 2.19.2

1 0

[libvirt] [PATCH v2 0/4] qemu_firmware: Try to autofill for old style UEFI specification
by Michal Privoznik 08 Jan '20

08 Jan '20

v2 of: https://www.redhat.com/archives/libvir-list/2019-December/msg01076.html diff to v1: - split 2/2 in the original series into 3 patches as suggested by Cole Note, 1/4 is reviewed, but I haven't pushed it yet and sending it here for completeness. Michal Prívozník (4): qemu_firmware: Pass virDomainDef into qemuFirmwareFillDomain() qemu_firmware: Introduce @want variable to qemuFirmwareMatchDomain() src: Introduce and use virDomainDefHasOldStyleUEFI() and virDomainDefHasOldStyleROUEFI() qemu_firmware: Try to autofill for old style UEFI specification src/bhyve/bhyve_driver.c | 3 +- src/conf/domain_conf.c | 16 ++++++++ src/conf/domain_conf.h | 6 +++ src/libvirt_private.syms | 2 + src/libxl/libxl_conf.c | 3 +- src/libxl/xen_xl.c | 8 ++-- src/qemu/qemu_domain.c | 14 ++----- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_firmware.c | 80 +++++++++++++++++++++++++++++++++------- src/qemu/qemu_firmware.h | 2 +- src/qemu/qemu_process.c | 2 +- 11 files changed, 103 insertions(+), 36 deletions(-) -- 2.24.1

2 10

[libvirt] [PATCH 0/2] A pair of build fixes.
by Michal Privoznik 08 Jan '20

08 Jan '20

Even though these fix a broken build, I'm sending them up for review. Michal Prívozník (2): qemu_firmware: Accept int in qemuFirmwareOSInterfaceTypeFromOsDefFirmware() vz: Don't try to jump on a non-existent label in prlsdkRemoveBootDevices() src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_firmware.c | 2 +- src/vz/vz_sdk.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -- 2.24.1

2 4

[libvirt] [PATCH] po/Makefile.am: use SOURCE_DATE_EPOCH to set POT creation date
by Pavel Hrdina 07 Jan '20

07 Jan '20

When building RPMs for libvirt the PO files are part of libvirt-libs package. Now that we generate libvirt.pot during build time the POT creation date is also generated at that time. The issue here is that when building libvirt-libs for x86_64 and i686 the generated libvirt.pot file will have different POT creation date which affects installed PO files as well which leads to conflict when installing both x86_64 and i686 packages. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- po/Makefile.am | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/po/Makefile.am b/po/Makefile.am index 443d8a4dc1..277dd89d7d 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -45,10 +45,19 @@ XGETTEXT_ARGS = \ --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ $(NULL) +POT_CREATION_DATE = $(shell \ + if test -n "$$SOURCE_DATE_EPOCH"; \ + then \ + date --date="@$$SOURCE_DATE_EPOCH" +"%F %R%z"; \ + else \ + date +'%F %R%z'; \ + fi) + SED_PO_FIXUP_ARGS = \ -e "s|text/plain; charset=CHARSET|text/plain; charset=UTF-8|g" \ -e "s|SOME DESCRIPTIVE TITLE|Libvirt package strings|g" \ -e "s|Copyright (C) YEAR|Copyright (C) $$(date +'%Y')|" \ + -e "s|POT-Creation-Date:[^\]*|POT-Creation-Date: $(POT_CREATION_DATE)|" \ $(NULL) update-po: $(POFILES) -- 2.24.1

3 3

[libvirt] [RFC PATCH 1/1] src: remove NULL check before VIR_FREE()
by Daniel Henrique Barboza 07 Jan '20

07 Jan '20

Functions virDomainSoundCodecDefFree(), virCapabilitiesFreeStoragePool() and virStorageSourceNVMeDefFree() are doing 'if (ptr)' NULL checks right before a 'VIR_FREE(ptr)' call. VIR_FREE() is a wrapper for g_free(). g_free(mem) documentation [1] states: 'If mem is NULL it simply returns, so there is no need to check mem against NULL before calling this function.' This patch removes these needless NULL checks. The virDomainSoundCodecDefFree() instance was found by accident via code inspection, the other 2 instances were found using Coccinelle. [1] https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html#g-free Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Sending this one as RFC because I am unsure about its utility. src/conf/capabilities.c | 3 --- src/conf/domain_conf.c | 3 --- src/util/virstoragefile.c | 3 --- 3 files changed, 9 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 9a39858280..4414b61fb2 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -174,9 +174,6 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest) static void virCapabilitiesFreeStoragePool(virCapsStoragePoolPtr pool) { - if (!pool) - return; - VIR_FREE(pool); } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6b05d06481..08e669daa9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2732,9 +2732,6 @@ void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def) void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def) { - if (!def) - return; - VIR_FREE(def); } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index e46ac99219..e9e74ef124 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2121,9 +2121,6 @@ virStorageSourceNVMeDefIsEqual(const virStorageSourceNVMeDef *a, void virStorageSourceNVMeDefFree(virStorageSourceNVMeDefPtr def) { - if (!def) - return; - VIR_FREE(def); } -- 2.24.1

2 1

[libvirt] [PATCH] po: Fix indentation of SED_PO_FIXUP_ARGS variable
by Michal Privoznik 07 Jan '20

07 Jan '20

1 0

[libvirt] [PATCH] virt-aa-helper: Drop unused variable in verify_xpath_context()
by Michal Privoznik 07 Jan '20

07 Jan '20

After one of previous commits (v5.10.0-524-gce56408e5f) there is a variable left unused in verify_xpath_context() which breaks the build. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build breaker rules. src/security/virt-aa-helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e01ec12d09..3ce58c8a6c 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -541,7 +541,6 @@ valid_path(const char *path, const bool readonly) static int verify_xpath_context(xmlXPathContextPtr ctxt) { - int rc = -1; char *tmp = NULL; if (!ctxt) { -- 2.24.1

1 0

[libvirt] [PATCH] Improve security driver error message
by Sebastian Mitterle 07 Jan '20

07 Jan '20

Currently, when security driver is not available users are informed that it wasn't found which can be confusing. 1. Update error message 2. Add comment to domain doc Signed-off-by Sebastian Mitterle <smitterl(a)redhat.com> --- docs/formatdomain.html.in | 3 ++- src/security/security_manager.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index dd04a05f09..3040448df1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -9011,7 +9011,8 @@ qemu-kvm -net nic,model=? /dev/null </dd> <dt><code>model</code></dt> <dd>A valid security model name, matching the currently - activated security model + activated security model. Model <code>dac</code> is not available + when guest is run by unprivileged user. </dd> <dt><code>relabel</code></dt> <dd>Either <code>yes</code> or <code>no</code>. This must always diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 952675381d..f229d94570 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -769,7 +769,7 @@ static int virSecurityManagerCheckModel(virSecurityManagerPtr mgr, } virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unable to find security driver for model %s"), + _("Security driver model '%s' is not available"), secmodel); cleanup: VIR_FREE(sec_managers); -- 2.21.0

2 1

[libvirt] [PATCH v1] virSecuritySELinuxSetTapFDLabel: Use fd_path instead of /dev/tap* to get context
by Dominick Grift 07 Jan '20

07 Jan '20

/dev/tap* is an invalid path but it works with lax policy. Make it work with more accurate policy as well v1: fix typo in description Signed-off-by: Dominick Grift <dac.override(a)gmail.com> --- src/security/security_selinux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 32dc78d777..8c698966cb 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -3251,7 +3251,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, goto cleanup; } - /* Label /dev/tap.* devices only. Leave /dev/net/tun alone! */ + /* Label /dev/tap([0-9]+)? devices only. Leave /dev/net/tun alone! */ proc = g_strdup_printf("/proc/self/fd/%d", fd); if (virFileResolveLink(proc, &fd_path) < 0) { @@ -3267,7 +3267,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, goto cleanup; } - if (getContext(mgr, "/dev/tap*", buf.st_mode, &fcon) < 0) { + if (getContext(mgr, fd_path, buf.st_mode, &fcon) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot lookup default selinux label for tap fd %d"), fd); goto cleanup; -- 2.24.1

2 1

[libvirt] [PATCH 0/3] virsh: Fix virshDomainInterfaceSourceCompleter
by Michal Privoznik 07 Jan '20

07 Jan '20

*** BLURB HERE *** Michal Prívozník (3): virsh: Use VIR_ENUM_* instead of open coding string -> enum conversion virsh: Fix virshDomainInterfaceSourceCompleter cmdDomIfAddr: Move domain lookup down a few lines tools/virsh-completer-domain.c | 17 ++++++++++------- tools/virsh-domain-monitor.c | 31 +++++++++++++++---------------- tools/virsh-domain-monitor.h | 2 ++ tools/virsh.h | 1 + 4 files changed, 28 insertions(+), 23 deletions(-) -- 2.24.1

2 6

[libvirt] [PATCH 0/2] backup: Remove checkpoint metadata on failed backup
by Peter Krempa 07 Jan '20

07 Jan '20

When creating a checkpoint along with a backup, failure in some cases lead to libvirt keeping the stale chekckpoint metadata. Peter Krempa (2): qemu: checkpoint: Extract and export rollback of checkpoint metadata storing qemu: backup: roll-back checkpoint metadata if the checkpoint wasn't taken src/qemu/qemu_backup.c | 14 +++++++++++--- src/qemu/qemu_checkpoint.c | 22 ++++++++++++++++++++-- src/qemu/qemu_checkpoint.h | 4 ++++ 3 files changed, 35 insertions(+), 5 deletions(-) -- 2.24.1

2 4

[libvirt] [PATCH 0/9] Filesystem-device-related refactors (virtio-fs epopee)
by Ján Tomko 07 Jan '20

07 Jan '20

Ján Tomko (9): build: error out when check-augeas fails qemu: rename gluster_debug_entry conf: add xmlopt to virDomainFSDefNew conf: add private data to virDomainFSDef qemu: add private data to virDomainFSDef qemu: pass private data to qemuBuildFilesystemCommandLine qemu: address: take fsdriver type into account qemu: command: take fsdriver type into account docs: formatdomain: use 'element' instead of 'block' docs/formatdomain.html.in | 2 +- src/Makefile.am | 2 +- src/conf/domain_conf.c | 9 ++++++-- src/conf/domain_conf.h | 4 +++- src/lxc/lxc_native.c | 2 +- src/lxc/lxc_process.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/qemu/libvirtd_qemu.aug | 4 ++-- src/qemu/qemu_command.c | 22 ++++++++++++++++---- src/qemu/qemu_conf.c | 11 ++++++---- src/qemu/qemu_domain.c | 38 ++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 12 +++++++++++ src/qemu/qemu_domain_address.c | 34 ++++++++++++++++++++---------- src/vmx/vmx.c | 2 +- src/vz/vz_sdk.c | 2 +- 15 files changed, 117 insertions(+), 31 deletions(-) -- 2.21.0

2 18

[libvirt] [PATCH v1 00/26] remove more unneeded labels
by Daniel Henrique Barboza 07 Jan '20

07 Jan '20

Hi, This is a follow up of a cleanup I did last year [1], which was more focused on 'cleanup' labels. In this one I covered all labels that are simply a 'return' proxy call. This wasn't a 'purge all return labels' series. Some of them are still around in cases where they help the code flow (like Jano suggested in the review at [2], for example). I divided the series by module and by amount of changes made to make it less daunting for reviews (although cases such as domain_conf.c couldn't be avoided without splitting changes in the same file in multiple patches). The maintainer is welcome to squash the patches up as needed. [1] https://www.redhat.com/archives/libvir-list/2019-October/msg01420.html [2] https://www.redhat.com/archives/libvir-list/2019-November/msg00468.html Daniel Henrique Barboza (26): bhyve: remove unneeded labels conf: remove unneeded labels conf: remove more unneeded labels conf/domain_conf.c: remove unneeded labels test/test_driver.c: remove unneeded labels storage: remove unneeded labels nwfilter: remove unneeded labels remote/remote_daemon_config.c: remove unneeded label hyperv/hyperv_wmi.c: remove unneeded labels locking/lock_driver_lockd.c: remove unneeded labels cpu/cpu_ppc64.c: remove unneeded label lxc: remove unneeded labels node_device: remove unneeded labels secret/secret_driver.c: remove unneeded label openvz: remove unneeded labels qemu: remove unneeded labels qemu: remove remaining unneeded labels vz/vz_sdk.c: remove unneeded labels vbox: remove unneeded labels security: remove unneeded labels util/virsysinfo.c: remove unneeded labels util: remove unneeded labels util: remove remaining unneeded labels logging: remove unneeded labels tests: remove unneeded labels examples: remove unneeded labels examples/c/misc/hellolibvirt.c | 28 +-- examples/c/misc/openauth.c | 22 +-- src/bhyve/bhyve_device.c | 13 +- src/bhyve/bhyve_parse_command.c | 47 ++--- src/conf/capabilities.c | 14 +- src/conf/cpu_conf.c | 36 ++-- src/conf/domain_addr.c | 9 +- src/conf/domain_conf.c | 192 +++++++-------------- src/conf/interface_conf.c | 9 +- src/conf/network_conf.c | 45 ++--- src/conf/networkcommon_conf.c | 11 +- src/conf/nwfilter_conf.c | 3 +- src/conf/nwfilter_params.c | 5 +- src/conf/virnetworkobj.c | 7 +- src/cpu/cpu_ppc64.c | 12 +- src/hyperv/hyperv_wmi.c | 15 +- src/locking/lock_driver_lockd.c | 16 +- src/logging/log_handler.c | 7 +- src/logging/log_manager.c | 14 +- src/lxc/lxc_container.c | 7 +- src/lxc/lxc_controller.c | 10 +- src/node_device/node_device_driver.c | 4 +- src/node_device/node_device_hal.c | 10 +- src/nwfilter/nwfilter_ebiptables_driver.c | 11 +- src/nwfilter/nwfilter_learnipaddr.c | 3 +- src/openvz/openvz_conf.c | 11 +- src/openvz/openvz_driver.c | 42 ++--- src/qemu/qemu_capabilities.c | 15 +- src/qemu/qemu_command.c | 93 +++++----- src/qemu/qemu_domain.c | 11 +- src/qemu/qemu_domain_address.c | 52 +++--- src/qemu/qemu_driver.c | 32 ++-- src/qemu/qemu_hostdev.c | 11 +- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_migration_cookie.c | 10 +- src/qemu/qemu_migration_params.c | 11 +- src/remote/remote_daemon_config.c | 101 ++++++----- src/secret/secret_driver.c | 6 +- src/security/security_dac.c | 26 ++- src/security/security_selinux.c | 26 ++- src/security/virt-aa-helper.c | 41 ++--- src/storage/storage_backend_iscsi_direct.c | 4 +- src/storage/storage_driver.c | 4 +- src/test/test_driver.c | 51 +++--- src/util/virhostcpu.c | 6 +- src/util/virnetdev.c | 13 +- src/util/virnetdevmacvlan.c | 3 +- src/util/virnetdevtap.c | 15 +- src/util/virnetdevvportprofile.c | 52 +++--- src/util/virnetlink.c | 4 +- src/util/virpci.c | 14 +- src/util/virsocketaddr.c | 11 +- src/util/virstoragefile.c | 4 +- src/util/virsysinfo.c | 54 ++---- src/util/virtpm.c | 5 +- src/util/virtypedparam.c | 14 +- src/util/viruuid.c | 13 +- src/vbox/vbox_MSCOMGlue.c | 11 +- src/vbox/vbox_snapshot_conf.c | 9 +- src/vz/vz_sdk.c | 102 ++++------- tests/qemumonitortestutils.c | 15 +- tests/testutilsqemu.c | 8 +- tests/virhostdevtest.c | 14 +- 63 files changed, 564 insertions(+), 915 deletions(-) -- 2.24.1

2 33

[libvirt] [PATCH] virSecuritySELinuxSetTapFDLabel: Use fd_path instead of /dev/tap* to get context
by Dominick Grift 07 Jan '20

07 Jan '20

/dev/tap* is an invalid path but it works with lacks policy. Make it work with more accurate policy as well Signed-off-by: Dominick Grift <dac.override(a)gmail.com> --- src/security/security_selinux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 32dc78d777..8c698966cb 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -3251,7 +3251,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, goto cleanup; } - /* Label /dev/tap.* devices only. Leave /dev/net/tun alone! */ + /* Label /dev/tap([0-9]+)? devices only. Leave /dev/net/tun alone! */ proc = g_strdup_printf("/proc/self/fd/%d", fd); if (virFileResolveLink(proc, &fd_path) < 0) { @@ -3267,7 +3267,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, goto cleanup; } - if (getContext(mgr, "/dev/tap*", buf.st_mode, &fcon) < 0) { + if (getContext(mgr, fd_path, buf.st_mode, &fcon) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot lookup default selinux label for tap fd %d"), fd); goto cleanup; -- 2.24.1

1 0

[libvirt] [PATCH 0/7] fix debian 9 incompatibility with recent changes
by Daniel P. Berrangé 07 Jan '20

07 Jan '20

Previous commits to eliminate gnulib modules accidentally used some glib APIs not available in Debian 9. GLib has support for compile time version checking of APIs but we mistakenly havent enabled it in libvirt. This series fixes the bad API usage, then enables version checkihng, and finally adds Debian to the Travis config Daniel P. Berrangé (7): util: always replace g_fsync usage with our wrapper util: keep glib compat methods in alphabetical order util: fix indent depth for glib compat impls util: add compat impl of g_canonicalize_filename src: remove use of g_date_time_new_from_iso8601 function util: introduce compile time API version checking travis: add build for Debian 9 .travis.yml | 7 ++ config-post.h | 10 ++ src/conf/domain_conf.c | 28 ++++-- src/esx/esx_vi_types.c | 56 +++++++++-- src/libvirt_private.syms | 1 + src/util/glibcompat.c | 196 ++++++++++++++++++++++++++++++++++----- src/util/glibcompat.h | 10 +- src/vz/vz_sdk.c | 24 ++++- 8 files changed, 286 insertions(+), 46 deletions(-) -- 2.24.1

3 13

[libvirt] [PATCH] man: virsh: Mention how to disable snapshot of disk in snapshot-create-as
by Peter Krempa 07 Jan '20

07 Jan '20

Document that --diskspec DISK,snapshot=no disables snapshot for the given disk. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/manpages/virsh.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index d0f9e15c38..4522259657 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -6734,7 +6734,8 @@ form ``disk[,snapshot=type][,driver=type][,stype=type][,file=name]``. A *diskspec* must be provided for disks backed by block devices as libvirt doesn't auto-generate file names for those. The optional ``stype`` parameter allows to control the type of the source file. Supported values are 'file' -(default) and 'block'. +(default) and 'block'. To exclude a disk from an external snapshot use +``--diskspec disk,snapshot=no``. To include a literal comma in ``disk`` or in ``file=name``, escape it with a second comma. A literal *--diskspec* must precede each ``diskspec`` unless -- 2.24.1

2 1

[libvirt] [PATCH 0/7] Support rng backend model 'builtin'
by Han Han 07 Jan '20

07 Jan '20

https://bugzilla.redhat.com/show_bug.cgi?id=1785091 This rng backend is added since QEMU 4.2. It uses getrandom() syscall to generate random instread of external rng source. QEMU bug reference: https://bugzilla.redhat.com/show_bug.cgi?id=1689946 Han Han (7): qemu_capabilities: Introduce QEMU_CAPS_OBJECT_RNG_BUILTIN util: Do not assume comma after object id qemu: Implement builtin rng backend docs: Add schemas for rng backend builtin tests: Add tests fr virtio-rng backend builtin docs: Documents for virtio-rng backend builtin news: Update news for rng backend type builtin docs/formatdomain.html.in | 10 ++++++ docs/formatdomaincaps.html.in | 1 + docs/news.xml | 10 ++++++ docs/schemas/domaincommon.rng | 6 ++++ src/conf/domain_audit.c | 2 ++ src/conf/domain_conf.c | 9 ++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 15 +++++++++ src/qemu/qemu_domain.c | 3 ++ src/util/virqemu.c | 13 ++++---- .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../qemuxml2argvdata/virtio-rng-builtin.args | 30 ++++++++++++++++++ tests/qemuxml2argvdata/virtio-rng-builtin.xml | 26 ++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../qemuxml2xmloutdata/virtio-rng-builtin.xml | 31 +++++++++++++++++++ tests/qemuxml2xmltest.c | 2 ++ 28 files changed, 172 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-rng-builtin.xml -- 2.23.0

2 17

[libvirt] Xen + libvirt + TPM
by Arthur Borsboom 07 Jan '20

07 Jan '20

Hello, I am trying to get TPM 2.0 pass through to work with Xen and libvirt, but I can't get it to work. According to the following sites both Xen and libirt have TPM 2.0 support. https://wiki.xen.org/wiki/Virtual_Trusted_Platform_Module_(vTPM) https://libvirt.org/formatdomain.html#elementsTpm However, when I add a TPM device to a VM (by virt-manager), the VM guest XML does contain the TPM configuration, but the VM guest (linux) does not show any TPM device. Also, when looking in /var/log/libvirt/libxl/vmguest.log there is no mention of tpm in the (converted libvirt XML to libxl) vm structure. Is this because libvirt only supports TPM with QEMU? If so, are there any development plans for TPM support with XEN? Is there a workaround for the time being? Best regards, Arthur Borsboom.

2 1

[libvirt] [PATCHv2 0/2] Introduce the support of Intel RDT-MBM
by Wang Huaqiang 07 Jan '20

07 Jan '20

This is a followup to Daniel's review in thread https://www.redhat.com/archives/libvir-list/2019-December/msg00978.html. Hi Daniel, In this series, patch 1/2 is trying to fix a bug that using the 64bit, instead of the current 32bit, interface, to hold cache monitor value reported by underlying 64bit counter. In last series, you have suggested of adding a new field such as "cpu.cache.monitor.%zu.bank.%zu.bytes64" for new 64bit counter result, and keep the old but already exported 32bit field, to avoid reporting a truncated cache monitor result to user. But considering the fact that, in reality, CPU cache size will never exceed 4GB in size, it is safe to truccate a 64bit counter to 32 bit since the counter is counting for the cache size that vcpus are using. Change List: v2: * Using old "cpu.cache.monitor.%zu.bank.%zu.bytes" field for cache monitor result, and keeping the interface consistent. * Add 'virsh domstats --memory' document in file 'virsh.rst' Wang Huaqiang (2): util, resctrl: using 64bit interface instead of 32bit for counters Introduce command 'virsh domstats --memory' for reporting memory BW docs/manpages/virsh.rst | 22 +++++- include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 21 ++++++ src/qemu/qemu_driver.c | 118 ++++++++++++++++++++++++++++++- src/util/virfile.c | 40 +++++++++++ src/util/virfile.h | 2 + src/util/virresctrl.c | 6 +- src/util/virresctrl.h | 2 +- tools/virsh-domain-monitor.c | 7 ++ 9 files changed, 211 insertions(+), 8 deletions(-) -- 2.23.0

3 6

[libvirt] [PATCH 0/2] qemu_firmware: Try to autofill for old style UEFI specification
by Michal Privoznik 06 Jan '20

06 Jan '20

See 2/2 for info. Michal Prívozník (2): qemu_firmware: Pass virDomainDef into qemuFirmwareFillDomain() qemu_firmware: Try to autofill for old style UEFI specification src/qemu/qemu_firmware.c | 90 +++++++++++++++++++++++++++++++++------- src/qemu/qemu_firmware.h | 2 +- src/qemu/qemu_process.c | 2 +- 3 files changed, 78 insertions(+), 16 deletions(-) -- 2.24.1

2 5

[libvirt] [jenkins-ci PATCH 0/2] CentOS fixes
by Fabiano Fidêncio 06 Jan '20

06 Jan '20

This series consists in two simple patches: - Mention CentOS8 as a valid OS version; - Only install OpenVZ on CentOS 7; Fabiano Fidêncio (2): guests: Mention CentOS8 as a valid OS version guests: Only install OpenVZ on CentOS 7 guests/playbooks/update/tasks/base.yml | 1 + guests/vars/mappings.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.23.0

2 4

[libvirt] [PATCH] ci: Fetch list of available container images dynamically
by Andrea Bolognani 06 Jan '20

06 Jan '20

Any static list of images is destined to become outdated eventually, so let's start generating it dynamically instead. Unfortunately there doesn't seem to be a straightforward way to get Podman/Docker to list all repositories under quay.io/libvirt, so we have to resort to searching and filtering manually; and since the two tools behave slightly differently in that regard, it's more sane to have the logic in a separate shell script than it would be to keep it inline in the Makefile with all the annoying escaping that would entail. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- ci/Makefile | 37 +++++++++++++------------------------ ci/list-images.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 ci/list-images.sh diff --git a/ci/Makefile b/ci/Makefile index 27c1049b38..acb655941c 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -238,6 +238,17 @@ ci-build@%: ci-check@%: $(MAKE) -C $(CI_ROOTDIR) ci-build@$* CI_MAKE_ARGS="check" +ci-list-images: + @echo + @echo "Available x86 container images:" + @echo + @sh list-images.sh "$(CI_ENGINE)" "$(CI_IMAGE_PREFIX)" | grep -v cross + @echo + @echo "Available cross-compiler container images:" + @echo + @sh list-images.sh "$(CI_ENGINE)" "$(CI_IMAGE_PREFIX)" | grep cross + @echo + ci-help: @echo "Build libvirt inside containers used for CI" @echo @@ -246,30 +257,8 @@ ci-help: @echo " ci-build@\$$IMAGE - run a default 'make'" @echo " ci-check@\$$IMAGE - run a 'make check'" @echo " ci-shell@\$$IMAGE - run an interactive shell" - @echo - @echo "Available x86 container images:" - @echo - @echo " centos-7" - @echo " debian-9" - @echo " debian-10" - @echo " debian-sid" - @echo " fedora-29" - @echo " fedora-30" - @echo " fedora-rawhide" - @echo " ubuntu-16" - @echo " ubuntu-18" - @echo - @echo "Available cross-compiler container images:" - @echo - @echo " debian-{9,10,sid}-cross-aarch64" - @echo " debian-{9,10,sid}-cross-armv6l" - @echo " debian-{9,10,sid}-cross-armv7l" - @echo " debian-{10,sid}-cross-i686" - @echo " debian-{9,10,sid}-cross-mips64el" - @echo " debian-{9,10,sid}-cross-mips" - @echo " debian-{9,10,sid}-cross-mipsel" - @echo " debian-{9,10,sid}-cross-ppc64le" - @echo " debian-{9,10,sid}-cross-s390x" + @echo " ci-list-images - list available images" + @echo " ci-help - show this help message" @echo @echo "Available make variables:" @echo diff --git a/ci/list-images.sh b/ci/list-images.sh new file mode 100644 index 0000000000..35efdb6982 --- /dev/null +++ b/ci/list-images.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +engine="$1" +prefix="$2" + +do_podman() { + # Podman freaks out if the search term ends with a dash, which ours + # by default does, so let's strip it. The repository name is the + # second field in the output, and it already starts with the registry + podman search --limit 100 "${prefix%-}" | while read _ repo _; do + echo "$repo" + done +} + +do_docker() { + # Docker doesn't include the registry name in the output, so we have + # to add it. The repository name is the first field in the output + registry="${prefix%%/*}" + docker search --limit 100 "$prefix" | while read repo _; do + echo "$registry/$repo" + done +} + +"do_$engine" | grep "^$prefix" | sed "s,^$prefix,,g" | while read repo; do + echo " $repo" +done | sort -u -- 2.23.0

2 2

[libvirt] [PATCH 0/2] vircgroupv2devices: Avoid double close on map FD
by Michal Privoznik 06 Jan '20

06 Jan '20

*** BLURB HERE *** Michal Prívozník (2): vircgroupv2devices: Unexport virCgroupV2DevicesAttachProg() vircgroupv2devices: Avoid double close on map FD src/libvirt_private.syms | 1 - src/util/vircgroupv2devices.c | 29 +++++------------------------ src/util/vircgroupv2devices.h | 5 ----- 3 files changed, 5 insertions(+), 30 deletions(-) -- 2.24.1

2 3

[libvirt] [PATCH] qemu: backup: Move capability check after inactive check
by Peter Krempa 06 Jan '20

06 Jan '20

Inactive VM doesn't have qemuCaps set thus we'd never properly report that VM backups are supported only for running VMs. Move the capability check after the active check. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_backup.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index c0445e0869..86b10a2b8a 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -750,12 +750,6 @@ qemuBackupBegin(virDomainObjPtr vm, virCheckFlags(VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL, -1); - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("incremental backup is not supported yet")); - return -1; - } - if (!(def = virDomainBackupDefParseString(backupXML, priv->driver->xmlopt, 0))) return -1; @@ -793,6 +787,12 @@ qemuBackupBegin(virDomainObjPtr vm, goto endjob; } + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("incremental backup is not supported yet")); + goto endjob; + } + if (priv->backup) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("another backup job is already running")); -- 2.24.1

2 1

[libvirt] [PATCH] util: time: Fix comment for virTimeFieldsNow
by Peter Krempa 06 Jan '20

06 Jan '20

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Trivial. diff --git a/src/util/virtime.c b/src/util/virtime.c index 54466b2f39..13f899cb91 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -223,7 +223,7 @@ int virTimeMillisNow(unsigned long long *now) /** - * virTimeFieldsNowRaw: + * virTimeFieldsNow: * @fields: filled with current time fields * * Retrieves the current time, in broken-down field format. -- 2.24.1

1 0

[libvirt] stream does not work in non-block mode with event loop implementation on Fibers
by senid senid 06 Jan '20

06 Jan '20

*libvirt_stream_event_add_callback* creates *passthrough* variable using *rb_ary_new2* and pass it to *virStreamEventAddCallback* at *ext/libvirt/stream.c:272*. After that ruby garbage collector removes this variable (I think because there is no references for *passthrough* in ruby code). https://bugzilla.redhat.com/show_bug.cgi?id=1787914#

1 0

[libvirt] [PATCH 00/23] Take 64 gnulib modules, eliminate 14, to give 50 remaining
by Daniel P. Berrangé 06 Jan '20

06 Jan '20

In the last days before the xmas break I took some time to eliminate 14 more gnulib modules, bringing us down to just 50 left to go. They're getting harder to eliminate as we go on, but to give some hints, I've annotated every module in bootstrap.conf with a suggested replacement strategy. Daniel P. Berrangé (23): build: set min version for CLang to 3.4 / XCode CLang to 5.1 docs: expand macOS platform support coverage travis: add macOS Xcode 11.3 testing util: add note about event file descriptors on Windows src: always pull in glib/gstdio.h header src: switch to use g_setenv/g_unsetenv util: add compat wrapper for g_fsync src: use g_fsync for portability util: introduce virFileDataSync src: use g_lstat() instead of lstat() src: switch from fnmatch to g_pattern_match_simple src: replace clock_gettime()/gettimeofday() with g_get_real_time() src: replace last_component() with g_path_get_basename() util: replace IS_ABSOLUTE_FILE_NAME with g_path_is_absolute src: replace mdir_name() with g_path_get_dirname() src: remove unused imports of dirname.h src: replace getcwd() with g_get_current_dir() util: use realpath/g_canonicalize_filename util: replace gethostname() with g_get_hostname() src: replace WSAStartup with g_networking_init() src: replace strptime()/timegm()/mktime() with GDateTime APIs set bootstrap: remove now unused gnulib modules bootstrap: annotate with info about desired replacement .travis.yml | 15 ++ bootstrap.conf | 173 +++++++++++++++--------- build-aux/syntax-check.mk | 4 +- config-post.h | 18 ++- docs/platforms.html.in | 13 +- include/libvirt/libvirt-event.h | 4 + m4/virt-glib.m4 | 2 +- src/conf/domain_conf.c | 32 ++--- src/conf/moment_conf.c | 7 +- src/conf/node_device_conf.c | 6 +- src/esx/esx_vi_types.c | 71 +--------- src/internal.h | 4 +- src/libvirt.c | 25 +--- src/libvirt_private.syms | 2 + src/libxl/libxl_driver.c | 21 +-- src/locking/lock_driver_sanlock.c | 6 +- src/node_device/node_device_udev.c | 12 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/qemu/qemu_backup.c | 5 +- src/qemu/qemu_command.c | 1 - src/qemu/qemu_domain.c | 14 +- src/qemu/qemu_driver.c | 7 +- src/qemu/qemu_firmware.c | 4 +- src/qemu/qemu_tpm.c | 33 +---- src/remote/libvirtd.conf.in | 8 +- src/rpc/virnetsaslcontext.c | 11 +- src/rpc/virnetsocket.c | 5 +- src/rpc/virnettlscontext.c | 10 +- src/security/security_dac.c | 2 +- src/security/virt-aa-helper.c | 8 +- src/storage/storage_backend_disk.c | 9 +- src/storage/storage_driver.c | 1 - src/storage/storage_util.c | 11 +- src/test/test_driver.c | 51 ++----- src/util/glibcompat.c | 13 ++ src/util/glibcompat.h | 6 + src/util/iohelper.c | 2 +- src/util/vircgroupv1.c | 4 +- src/util/virevent.c | 7 + src/util/virfile.c | 49 ++++--- src/util/virfile.h | 2 + src/util/virlog.c | 22 +-- src/util/virmdev.c | 12 +- src/util/virnetdev.c | 5 +- src/util/virpci.c | 17 ++- src/util/virstoragefile.c | 13 +- src/util/virsystemd.c | 4 +- src/util/virtime.c | 22 +-- src/util/virutil.c | 12 +- src/vbox/vbox_XPCOMCGlue.c | 4 +- src/vmware/vmware_conf.c | 7 +- src/vz/vz_sdk.c | 10 +- tests/eventtest.c | 18 +-- tests/libxlxml2domconfigtest.c | 4 +- tests/lxcxml2xmltest.c | 2 +- tests/qemudomaincheckpointxml2xmltest.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemufirmwaretest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumemlocktest.c | 2 +- tests/qemusecuritytest.c | 4 +- tests/qemuvhostusertest.c | 2 +- tests/qemuxml2argvtest.c | 24 ++-- tests/qemuxml2xmltest.c | 4 +- tests/securityselinuxhelper.c | 4 +- tests/testutils.c | 15 +- tests/testutils.h | 6 +- tests/testutilsqemu.c | 4 +- tests/vircgrouptest.c | 16 +-- tests/virconfdata/libvirtd.conf | 8 +- tests/virconfdata/libvirtd.out | 8 +- tests/virfilemock.c | 12 +- tests/virfiletest.c | 4 +- tests/virhostdevtest.c | 2 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 2 +- tests/virpcimock.c | 3 +- tests/virpcitest.c | 2 +- tests/virportallocatortest.c | 2 +- tests/virstoragetest.c | 1 - tests/virsystemdtest.c | 46 +++---- tests/virtimetest.c | 4 +- tools/virsh-domain.c | 10 +- tools/virt-login-shell-helper.c | 17 ++- tools/vsh.c | 27 +--- tools/vsh.h | 1 - 86 files changed, 470 insertions(+), 602 deletions(-) -- 2.24.1

3 31

[libvirt] [PATCH 00/11] qemu: backup: Fixes and improvements
by Peter Krempa 06 Jan '20

06 Jan '20

I've got a report of pull-mode backup not working properly. While investigating I've found out few other problems and one regression caused by a recent patch. All of those are fixed below. Additionally the last 3 patches are RFC and were created based on the discussion on qemu-block and I don't really intend to push them right away. At least until the discussion there is over: https://lists.gnu.org/archive/html/qemu-block/2019-12/msg00416.html Peter Krempa (11): qemu: block: Use proper asyncJob when waiting for completion of blockdev-create qemu: Reset the node-name allocator in qemuDomainObjPrivateDataClear qemu: backup: Configure backup store image with backing file qemu: backup: Move deletion of backup images to job termination qemu: blockjob: Remove infrastructure for remembering to delete image qemu: backup: Properly propagate async job type when cancelling the job qemu: process: Terminate backup job on VM destroy schemas: backup: Remove pointless <choice> for 'name' of backup disk RFC: conf: backup: Allow configuration of names exported via NBD qemu: backup: Implement support for backup disk export name configuration qemu: backup: Implement support for backup disk bitmap name configuration docs/formatbackup.html.in | 9 +++ docs/schemas/domainbackup.rng | 16 ++-- src/conf/backup_conf.c | 11 +++ src/conf/backup_conf.h | 2 + src/qemu/qemu_backup.c | 77 +++++++++++++------ src/qemu/qemu_backup.h | 10 ++- src/qemu/qemu_block.c | 4 +- src/qemu/qemu_blockjob.c | 20 +---- src/qemu/qemu_blockjob.h | 2 - src/qemu/qemu_domain.c | 10 +-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 8 +- .../backup-pull-seclabel.xml | 2 +- .../backup-pull-seclabel.xml | 2 +- .../qemustatusxml2xmldata/backup-pull-in.xml | 1 - 15 files changed, 110 insertions(+), 66 deletions(-) -- 2.23.0

4 29

[libvirt] [PATCH] Cleaning up pools is not always ideal
by ebenner 06 Jan '20

06 Jan '20

Libvirt cleans up pools that error out by deactivating them. When using LVM this is not very useful. We rather would have our own system handle any real failures and to many situations where errors are meaningless and unimportant cause Libvirt to disable our pools continuously causing lots of grief. This patch is what we use to add a config option to disable this behavior. An example of one of the issues we encountered requiring this patch is a race condition between Libvirt and LVM. Pool refreshes will hand if LVM is having an action performed, then Libvirt will continue when LVM finishes. When a pool is being refreshed while an LV is being removed, the refresh hangs as expected, when the removal is completed the refresh continues. Afterwards when the refresh goes to refresh the specific LV it errors because it cannot be found and the entire pool is disabled. Bellow are two commands when run together reliably recreates the issue. while :; do lvcreate /dev/vgpool --name TEST -L 100G && lvremove -f /dev/vgpool/TEST; done while :; do virsh pool-refresh vgpool; done I am aware this is not the most elegant solution here and am up for suggestions for resolving the underlying issue, however we never need our pools to be disabled because of an error and I am sure there are other's who's usecase may be similar. --- src/remote/libvirtd.conf.in | 7 +++++++ src/storage/storage_driver.c | 38 ++++++++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in index 34741183cc..5600c26eca 100644 --- a/src/remote/libvirtd.conf.in +++ b/src/remote/libvirtd.conf.in @@ -506,3 +506,10 @@ # potential infinite waits blocking libvirt. # #ovs_timeout = 5 + +################################################################### +# This decides whether to disable pools that errors in some way such as during a refresh +# This can negatively affect LVM pools. 1 = disable the pools, 2 = don't disable the pools +# Do not use this if you are not using only LVM pools +# +cleanup_pools = 1 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 6bbf52f729..93ebcd662c 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -55,6 +55,7 @@ VIR_LOG_INIT("storage.storage_driver"); static virStorageDriverStatePtr driver; +static int cleanup_pools = -1; static int storageStateCleanup(void); @@ -74,6 +75,20 @@ static void storageDriverUnlock(void) virMutexUnlock(&driver->lock); } +static int cleanupPools(void) +{ + if (cleanup_pools == -1) { + g_autoptr(virConf) libvirtConf = NULL; + virConfLoadConfig(&libvirtConf, "libvirtd.conf"); + + if (!virConfGetValueInt(libvirtConf, "cleanup_pools", &cleanup_pools) + || (cleanup_pools != 0 && cleanup_pools != 1)) + cleanup_pools = 1; + } + + return cleanup_pools; +} + static void storagePoolRefreshFailCleanup(virStorageBackendPtr backend, @@ -81,14 +96,26 @@ storagePoolRefreshFailCleanup(virStorageBackendPtr backend, const char *stateFile) { virErrorPtr orig_err; - virErrorPreserveLast(&orig_err); virStoragePoolObjClearVols(obj); if (stateFile) unlink(stateFile); - if (backend->stopPool) - backend->stopPool(obj); + + if (!cleanupPools()) { + virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to refresh storage pool '%s'. Would have disabled this pool but clean_pools = 0: %s"), + def->name, virGetLastErrorMessage()); + } else { + virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to refresh storage pool '%s'. Disabled this pool because clean_pools = 1: %s"), + def->name, virGetLastErrorMessage()); + if (backend->stopPool) { + backend->stopPool(obj); + } + } virErrorRestore(&orig_err); } @@ -101,7 +128,10 @@ storagePoolRefreshImpl(virStorageBackendPtr backend, virStoragePoolObjClearVols(obj); if (backend->refreshPool(obj) < 0) { storagePoolRefreshFailCleanup(backend, obj, stateFile); - return -1; + if (!cleanupPools()) + return 0; + else + return -1; } return 0; -- 2.24.1

1 0

[libvirt] [PATCH v2 00/12] Various bhyve driver improvements for FreeBSD
by Ryan Moeller 05 Jan '20

05 Jan '20

The main changes are: * Add support for standard hooks in bhyve backend: - prepare - start - started - stopped - release * Some code cleanup & general housekeeping in bhyve backend * Add support for reboot in bhyve backend, both from within the VM and from the host Ryan Moeller (12): Add hooks for bhyve backend Fix build errors on FreeBSD Simplify bhyve driver caps helpers Remove redundant parameter to virBhyveProcessStart() Factor out conn Fix indentation Eliminate rc variable Make bhyveMonitor a virClass Don't bother seeking to the end of a file opened O_APPEND Add reboot support for bhyve backend Fix bhyvexml2argvtest Add missing virtlogd.init for OpenRC src/bhyve/bhyve_command.c | 40 ++++----- src/bhyve/bhyve_command.h | 4 +- src/bhyve/bhyve_driver.c | 67 ++++++++++---- src/bhyve/bhyve_driver.h | 4 +- src/bhyve/bhyve_monitor.c | 165 +++++++++++++++++++++++------------ src/bhyve/bhyve_monitor.h | 2 + src/bhyve/bhyve_process.c | 106 +++++++++++++++------- src/bhyve/bhyve_process.h | 4 +- src/conf/virnetworkobj.c | 7 +- src/logging/Makefile.inc.am | 10 +++ src/logging/virtlogd.init.in | 14 +++ src/util/virhook.c | 15 ++++ src/util/virhook.h | 11 +++ tests/bhyvexml2argvtest.c | 4 +- 14 files changed, 319 insertions(+), 134 deletions(-) create mode 100644 src/logging/virtlogd.init.in -- 2.23.0

3 22

[libvirt] [PATCH] virsh: Add a completer for `domifaddr` --source parameter.
by Julio Faracco 04 Jan '20

04 Jan '20

The command `domifaddr` can use three different sources to grab IP address of a Virtual Machine: lease, agent and arp. This parameter does not have a completer function to return source options. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-completer-domain.c | 17 +++++++++++++++++ tools/virsh-completer-domain.h | 5 +++++ tools/virsh-domain-monitor.c | 1 + 3 files changed, 23 insertions(+) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 0311ee50d0..c8709baa38 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -296,3 +296,20 @@ virshDomainShutdownModeCompleter(vshControl *ctl, return virshCommaStringListComplete(mode, modes); } + + +char ** +virshDomainIfAddrSourceCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags) +{ + const char *sources[] = {"lease", "agent", "arp", NULL}; + const char *source = NULL; + + virCheckFlags(0, NULL); + + if (vshCommandOptStringQuiet(ctl, cmd, "source", &source) < 0) + return NULL; + + return virshCommaStringListComplete(source, sources); +} diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h index 083ab327cc..f5e5625051 100644 --- a/tools/virsh-completer-domain.h +++ b/tools/virsh-completer-domain.h @@ -53,3 +53,8 @@ char ** virshDomainDeviceAliasCompleter(vshControl *ctl, char ** virshDomainShutdownModeCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + +char ** +virshDomainIfAddrSourceCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 30b186ffd1..1d1f87eb9e 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2346,6 +2346,7 @@ static const vshCmdOptDef opts_domifaddr[] = { {.name = "source", .type = VSH_OT_STRING, .flags = VSH_OFLAG_NONE, + .completer = virshDomainIfAddrSourceCompleter, .help = N_("address source: 'lease', 'agent', or 'arp'")}, {.name = NULL} }; -- 2.20.1

3 4

[libvirt] [PULL 0/3] Block patches
by Stefan Hajnoczi 03 Jan '20

03 Jan '20

The following changes since commit aceeaa69d28e6f08a24395d0aa6915b687d0a681: Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging (2019-12-17 15:55:20 +0000) are available in the Git repository at: https://github.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 725fe5d10dbd4259b1853b7d253cef83a3c0d22a: virtio-blk: fix out-of-bounds access to bitmap in notify_guest_bh (2019-12-19 16:20:25 +0000) ---------------------------------------------------------------- Pull request ---------------------------------------------------------------- Li Hangjing (1): virtio-blk: fix out-of-bounds access to bitmap in notify_guest_bh Stefan Hajnoczi (2): virtio-blk: deprecate SCSI passthrough docs: fix rst syntax errors in unbuilt docs docs/arm-cpu-features.rst | 6 +++--- docs/virtio-net-failover.rst | 4 ++-- docs/virtio-pmem.rst | 19 ++++++++++--------- hw/block/dataplane/virtio-blk.c | 2 +- qemu-deprecated.texi | 11 +++++++++++ 5 files changed, 27 insertions(+), 15 deletions(-) -- 2.23.0

2 4

[libvirt] [PATCH] docs: Harmonize backend names for QEMU and LXC
by Michael Weiser 03 Jan '20

03 Jan '20

Trivially replace usages of qemu and lxc in the virsh manpage with their more heavily used and (according to Wikipedia) correct upper-case spellings QEMU and LXC. Signed-off-by: Michael Weiser <michael.weiser(a)gmx.de> Suggested-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/manpages/virsh.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index fea0527caf..7e26676570 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -577,7 +577,7 @@ from the domain's XML <os/> element and <type/> subelement or one from a list of machines from the ``virsh capabilities`` output for a specific architecture and domain type. -For the qemu hypervisor, a *virttype* of either 'qemu' or 'kvm' must be +For the QEMU hypervisor, a *virttype* of either 'qemu' or 'kvm' must be supplied along with either the *emulatorbin* or *arch* in order to generate output for the default *machine*. Supplying a *machine* value will generate output for the specific machine. @@ -1072,7 +1072,7 @@ read I/O operations limit. write I/O operations limit. *--size-iops-sec* specifies size I/O operations limit per second. *--group-name* specifies group name to share I/O quota between multiple drives. -For a qemu domain, if no name is provided, then the default is to have a single +For a QEMU domain, if no name is provided, then the default is to have a single group for each *device*. Older versions of virsh only accepted these options with underscore @@ -1084,7 +1084,7 @@ An explicit 0 also clears any limit. A non-zero value for a given total cannot be mixed with non-zero values for read or write. It is up to the hypervisor to determine how to handle the length values. -For the qemu hypervisor, if an I/O limit value or maximum value is set, +For the QEMU hypervisor, if an I/O limit value or maximum value is set, then the default value of 1 second will be displayed. Supplying a 0 will reset the value back to the default. @@ -1642,7 +1642,7 @@ domblkstat Get device block stats for a running domain. A *block-device* corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to *domain* (see -also ``domblklist`` for listing these names). On a lxc or qemu domain, +also ``domblklist`` for listing these names). On a LXC or QEMU domain, omitting the *block-device* yields device block stats summarily for the entire domain. @@ -3247,7 +3247,7 @@ destination). Some hypervisors do not support this feature and will return an error if this parameter is used. Optional *disks-port* sets the port that hypervisor on destination side should -bind to for incoming disks traffic. Currently it is supported only by qemu. +bind to for incoming disks traffic. Currently it is supported only by QEMU. migrate-compcache -- 2.24.1

2 1

[libvirt] [PATCH v2 0/3] Mark and document restore with managed save as risky
by Michael Weiser 03 Jan '20

03 Jan '20

This series marks restore of an inactive qemu snapshot while there is managed saved state as risky due to the reasons explained in patch 1 and 3. Patch 2 is a simple reformatting of the documentation with no other changes in preparation of addition of more reasons why reverts might need to be forced. Changes from v1: - reword error message to "error: revert requires force: snapshot without memory state, removal of existing managed saved state strongly recommended to avoid corruption" - add documentation of the new behaviour Michael Weiser (3): qemu: Warn of restore with managed save being risky docs: Reformat snapshot-revert force reasons docs: Add snapshot-revert qemu managedsave force docs/manpages/virsh.rst | 39 ++++++++++++++++++++++++--------------- src/qemu/qemu_driver.c | 9 +++++++++ 2 files changed, 33 insertions(+), 15 deletions(-) -- 2.24.1

2 5

[libvirt] [PATCH] Add overrides for network port UUID getter/lookup methods
by Daniel P. Berrangé 03 Jan '20

03 Jan '20

The generator creates broken code for all these methods. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- generator.py | 3 ++ libvirt-override-api.xml | 16 ++++++++ libvirt-override.c | 83 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/generator.py b/generator.py index cba9d47..426f007 100755 --- a/generator.py +++ b/generator.py @@ -430,6 +430,9 @@ skip_impl = ( 'virNetworkGetUUID', 'virNetworkGetUUIDString', 'virNetworkLookupByUUID', + 'virNetworkPortGetUUID', + 'virNetworkPortGetUUIDString', + 'virNetworkPortLookupByUUID', 'virDomainGetAutostart', 'virNetworkGetAutostart', 'virDomainBlockStats', diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 7a0d4c5..4ab403c 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -64,6 +64,12 @@ <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> <arg name='uuid' type='const unsigned char *' info='the UUID string for the network, must be 16 bytes'/> </function> + <function name='virNetworkPortLookupByUUID' file='python'> + <info>Try to lookup a port on the given network based on its UUID.</info> + <return type='virNetworkPortPtr' info='a new network port object or NULL in case of failure'/> + <arg name='net' type='virNetworkPtr' info='pointer to the network object'/> + <arg name='uuid' type='const unsigned char *' info='the UUID string for the network port, must be 16 bytes'/> + </function> <function name='virDomainGetInfo' file='python'> <info>Extract information about a domain. Note that if the connection used to get the domain is limited only a partial set of the information can be extracted.</info> <return type='char *' info='the list of information or None in case of error'/> @@ -153,6 +159,16 @@ <return type='char *' info='the UUID string or None in case of error'/> <arg name='net' type='virNetworkPtr' info='a network object'/> </function> + <function name='virNetworkPortGetUUID' file='python'> + <info>Extract the UUID unique Identifier of a network port.</info> + <return type='char *' info='the 16 bytes string or None in case of error'/> + <arg name='domain' type='virNetworkPortPtr' info='a network port object'/> + </function> + <function name='virNetworkPortGetUUIDString' file='python'> + <info>Fetch globally unique ID of the network port as a string.</info> + <return type='char *' info='the UUID string or None in case of error'/> + <arg name='net' type='virNetworkPortPtr' info='a network port object'/> + </function> <function name='virStoragePoolGetUUID' file='python'> <info>Extract the UUID unique Identifier of a storage pool.</info> <return type='char *' info='the 16 bytes string or None in case of error'/> diff --git a/libvirt-override.c b/libvirt-override.c index 4e4c00a..2b39ace 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -10185,6 +10185,86 @@ libvirt_virNetworkPortGetParameters(PyObject *self ATTRIBUTE_UNUSED, virTypedParamsFree(params, nparams); return dict; } + +static PyObject * +libvirt_virNetworkPortGetUUID(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + unsigned char uuid[VIR_UUID_BUFLEN]; + virNetworkPortPtr port; + PyObject *pyobj_port; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"O:virNetworkPortGetUUID", &pyobj_port)) + return NULL; + port = (virNetworkPortPtr) PyvirNetworkPort_Get(pyobj_port); + + if (port == NULL) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virNetworkPortGetUUID(port, &uuid[0]); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + return libvirt_charPtrSizeWrap((char *) &uuid[0], VIR_UUID_BUFLEN); +} + +static PyObject * +libvirt_virNetworkPortGetUUIDString(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virNetworkPortPtr port; + PyObject *pyobj_port; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"O:virNetworkPortGetUUIDString", + &pyobj_port)) + return NULL; + port = (virNetworkPortPtr) PyvirNetworkPort_Get(pyobj_port); + + if (port == NULL) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virNetworkPortGetUUIDString(port, &uuidstr[0]); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + return libvirt_constcharPtrWrap((char *) &uuidstr[0]); +} + +static PyObject * +libvirt_virNetworkPortLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virNetworkPortPtr c_retval; + virNetworkPtr net; + PyObject *pyobj_net; + unsigned char *uuid; + int len; + + if (!PyArg_ParseTuple(args, (char *)"Oz#:virNetworkPortLookupByUUID", + &pyobj_net, &uuid, &len)) + return NULL; + net = (virNetworkPtr) PyvirNetwork_Get(pyobj_net); + + if ((uuid == NULL) || (len != VIR_UUID_BUFLEN)) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virNetworkPortLookupByUUID(net, uuid); + LIBVIRT_END_ALLOW_THREADS; + + return libvirt_virNetworkPortPtrWrap((virNetworkPortPtr) c_retval); +} + + #endif /* LIBVIR_CHECK_VERSION(5, 5, 0) */ #if LIBVIR_CHECK_VERSION(5, 7, 0) @@ -10535,6 +10615,9 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virNetworkListAllPorts", libvirt_virNetworkListAllPorts, METH_VARARGS, NULL}, {(char *) "virNetworkPortSetParameters", libvirt_virNetworkPortSetParameters, METH_VARARGS, NULL}, {(char *) "virNetworkPortGetParameters", libvirt_virNetworkPortGetParameters, METH_VARARGS, NULL}, + {(char *) "virNetworkPortGetUUID", libvirt_virNetworkPortGetUUID, METH_VARARGS, NULL}, + {(char *) "virNetworkPortGetUUIDString", libvirt_virNetworkPortGetUUIDString, METH_VARARGS, NULL}, + {(char *) "virNetworkPortLookupByUUID", libvirt_virNetworkPortLookupByUUID, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(5, 5, 0) */ #if LIBVIR_CHECK_VERSION(5, 7, 0) {(char *) "virDomainGetGuestInfo", libvirt_virDomainGetGuestInfo, METH_VARARGS, NULL}, -- 2.24.1

2 2

[libvirt] when libvirt xml define nic driver e1000, my vm fail to start
by thomas.kuang 03 Jan '20

03 Jan '20

hi, all: my xml define interface as following: <interface type='ethernet'> <mac address='00:04:00:41:03:11'/> <model type='e1000'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> when run the command: bash-4.1# virsh start root-vsys_v77 error: Failed to start domain root-vsys_v77 error: Unable to open /dev/net/tun, is tun module loaded?: No such file or directory is my xml define error ? how can create my vm with nic driver e1000 ? bash-4.1# libvirtd -v ,yum install libvirt 2020-01-02 10:00:49.261+0000: 8349: info : libvirt version: 4.5.0, package: 23.el7 (CentOS BuildSystem <http://bugs.centos.org>, 2019-08-09-00:39:08, x86-02.bsys.centos.org) 2020-01-02 10:00:49.261+0000: 8349: info : hostname: NSG 2020-01-02 10:00:49.261+0000: 8349: warning : virGetHostnameImpl:719 : getaddrinfo failed for 'NSG': Name or service not known 2020-01-02 10:00:49.263+0000: 8349: info : libvirt version: 4.5.0, package: 23.el7 (CentOS BuildSystem <http://bugs.centos.org>, 2019-08-09-00:39:08, x86-02.bsys.centos.org) 2020-01-02 10:00:49.263+0000: 8349: info : hostname: NSG 2020-01-02 10:00:49.263+0000: 8349: info : virObjectNew:248 : OBJECT_NEW: obj=0x5605a6104de0 classname=virAccessManager 2020-01-02 10:00:49.263+0000: 8349: info : virObjectNew:248 : OBJECT_NEW: obj=0x5605a60f54e0 classname=virAccessManager my emulator is qemu-3.0 ,i download qemu source code and compiled the emulator: bash-4.1# /usr/local/bin/qemu-system-x86_64 --version QEMU emulator version 3.0.0 Copyright (c) 2003-2017 Fabrice Bellard and the QEMU Project developers thanks !

1 0

[libvirt] [PATCH] qemu: Warn of restore with managed save being risky
by Michael Weiser 02 Jan '20

02 Jan '20

Internal snapshots of a non-running domain do not carry any memory state and restoring such a snapshot will not replace existing saved memory state. This allows a scenario, where a user first suspends a domain into managedsave, restores a non-running snapshot and then resumes the domain from managedsave. After that, the guest system will run with its previous memory state atop a different disk state. The most obvious possible fallout from this is extensive file system corruption. Swap content and RAID bitmaps might also be off. This has been discussed[1] and fixed[2] from the end-user perspective for virt-manager. This patch marks the restore operation as risky at the libvirt level, requiring the user to remove the saved memory state first or force the operation. [1] https://www.redhat.com/archives/virt-tools-list/2019-November/msg00011.html [2] https://www.redhat.com/archives/virt-tools-list/2019-December/msg00049.html Signed-off-by: Michael Weiser <michael.weiser(a)gmx.de> Cc: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ec8faf384c..dcd103d3bb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16652,6 +16652,15 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, _("must respawn qemu to start inactive snapshot")); goto endjob; } + if (vm->hasManagedSave && + !(snapdef->state == VIR_DOMAIN_SNAPSHOT_RUNNING || + snapdef->state == VIR_DOMAIN_SNAPSHOT_PAUSED)) { + virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, "%s", + _("revert to snapshot while there is a managed " + "saved state will cause corruption when run, " + "remove saved state first")); + goto endjob; + } } if (snap->def->dom) { -- 2.24.1

2 6

[libvirt] [PATCH RFC] update cacrl without restarting libvirtd via virt-admin
by Zhangbo (Oscar) 02 Jan '20

02 Jan '20

This is an RFC request for supporting virt-admin to update cacrl without restarting libvirtd. When a client wants to establish a TLS connection with libvirtd, a CRL file is used by libvirtd to verify the client's certificate. Right now, if the CRL file is changed, you must restart libvirtd to make it take effect. The restart behavior of libvirtd will cause clients connecting with libvirtd to fail. In a server cluster, the CRL file may be updated quite frequently due to the large amount of certificates. If the new CRL does not take effect in time, there are security risks. So you may need to restart libvirtd frequently to make the CRL take effect in time. However, frequent restarts will affect the reliability of cluster virtual machine management(such as openstack) services. This RFC patch adds a virt-admin command to update the server's CRL *online*. This patch is not elegant enough, if this feature makes sense, I'd do more improvements. --- include/libvirt/libvirt-admin.h | 4 ++ src/admin/admin_protocol.x | 13 +++++- src/admin/admin_server.c | 13 ++++++ src/admin/admin_server.h | 4 ++ src/admin/libvirt-admin.c | 33 ++++++++++++++++ src/admin/libvirt_admin_private.syms | 1 + src/admin/libvirt_admin_public.syms | 1 + src/rpc/virnetserver.c | 58 +++++++++++++++++++++++++++ src/rpc/virnetserver.h | 3 ++ src/rpc/virnettlscontext.c | 33 ++++++++++++++++ src/rpc/virnettlscontext.h | 3 ++ tools/virt-admin.c | 59 ++++++++++++++++++++++++++++ 12 files changed, 224 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h index abf2792926..2df43db567 100644 --- a/include/libvirt/libvirt-admin.h +++ b/include/libvirt/libvirt-admin.h @@ -402,6 +402,10 @@ int virAdmServerSetClientLimits(virAdmServerPtr srv, int nparams, unsigned int flags); +int virAdmServerUpdateTlsFile(virAdmServerPtr srv, + unsigned int filetype, + unsigned int flags); + int virAdmConnectGetLoggingOutputs(virAdmConnectPtr conn, char **outputs, unsigned int flags); diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x index 42e215d23a..c74c0d777b 100644 --- a/src/admin/admin_protocol.x +++ b/src/admin/admin_protocol.x @@ -181,6 +181,12 @@ struct admin_server_set_client_limits_args { unsigned int flags; }; +struct admin_server_update_tls_file_args { + admin_nonnull_server srv; + unsigned int filetype; + unsigned int flags; +}; + struct admin_connect_get_logging_outputs_args { unsigned int flags; }; @@ -314,5 +320,10 @@ enum admin_procedure { /** * @generate: both */ - ADMIN_PROC_CONNECT_SET_LOGGING_FILTERS = 17 + ADMIN_PROC_CONNECT_SET_LOGGING_FILTERS = 17, + + /** + * @generate: both + */ + ADMIN_PROC_SERVER_UPDATE_TLS_FILE = 18 }; diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c index ba87f701c3..2f695eea4f 100644 --- a/src/admin/admin_server.c +++ b/src/admin/admin_server.c @@ -367,3 +367,16 @@ adminServerSetClientLimits(virNetServerPtr srv, return 0; } + +int +adminServerUpdateTlsFile(virNetServerPtr srv, + unsigned int filetype, + unsigned int flags) +{ + virCheckFlags(0, -1); + + if (virNetServerUpdateTlsFile(srv, filetype) < 0) + return -1; + + return 0; +} diff --git a/src/admin/admin_server.h b/src/admin/admin_server.h index 1d5cbec55f..748235811a 100644 --- a/src/admin/admin_server.h +++ b/src/admin/admin_server.h @@ -67,3 +67,7 @@ int adminServerSetClientLimits(virNetServerPtr srv, virTypedParameterPtr params, int nparams, unsigned int flags); + +int adminServerUpdateTlsFile(virNetServerPtr srv, + unsigned int filetype, + unsigned int flags); diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c index 4099a54854..13c8db016d 100644 --- a/src/admin/libvirt-admin.c +++ b/src/admin/libvirt-admin.c @@ -1082,6 +1082,39 @@ virAdmServerSetClientLimits(virAdmServerPtr srv, return ret; } +/** + * virAdmServerUpdateTlsFile: + * @srv: a valid server object reference + * @filetype: TLS file type, such as crl, cert, key + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * update TLS Context in TLS service. + * + * Returns 0 if the TLS files have been updated successfully or -1 in case of an + * error. + */ +int +virAdmServerUpdateTlsFile(virAdmServerPtr srv, + unsigned int filetype, + unsigned int flags) +{ + int ret = -1; + + VIR_DEBUG("srv=%p, filetype=%u flags=%x", srv, filetype, flags); + virResetLastError(); + + virCheckAdmServerGoto(srv, error); + + /* rpc call to update tls file */ + if ((ret = remoteAdminServerUpdateTlsFile(srv, filetype, flags)) < 0) + goto error; + + return ret; + error: + virDispatchError(NULL); + return ret; +} + /** * virAdmConnectGetLoggingOutputs: * @conn: pointer to an active admin connection diff --git a/src/admin/libvirt_admin_private.syms b/src/admin/libvirt_admin_private.syms index 9526412de8..d563757482 100644 --- a/src/admin/libvirt_admin_private.syms +++ b/src/admin/libvirt_admin_private.syms @@ -31,6 +31,7 @@ xdr_admin_server_lookup_client_args; xdr_admin_server_lookup_client_ret; xdr_admin_server_set_client_limits_args; xdr_admin_server_set_threadpool_parameters_args; +xdr_admin_server_update_tls_file_args; # datatypes.h virAdmClientClass; diff --git a/src/admin/libvirt_admin_public.syms b/src/admin/libvirt_admin_public.syms index 9a3f843780..97b223bfba 100644 --- a/src/admin/libvirt_admin_public.syms +++ b/src/admin/libvirt_admin_public.syms @@ -38,6 +38,7 @@ LIBVIRT_ADMIN_2.0.0 { virAdmClientClose; virAdmServerGetClientLimits; virAdmServerSetClientLimits; + virAdmServerUpdateTlsFile; }; LIBVIRT_ADMIN_3.0.0 { diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 4122636805..fc18b2a224 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -1209,3 +1209,61 @@ virNetServerSetClientLimits(virNetServerPtr srv, virObjectUnlock(srv); return ret; } + +int +virNetServerUpdateTlsFile(virNetServerPtr srv, + unsigned int filetype) +{ + int ret = -1; +#if WITH_GNUTLS + size_t i; + int cnt = 0; + virNetTLSContextPtr ctxt = NULL; + virNetServerServicePtr svc = NULL; + + if (filetype != TYPE_CACRL_LIBVIRT) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Don't support CRL filetype: %d"), + filetype); + return ret; + } + + virObjectLock(srv); + + /* find svcTLS from srv */ + for (i = 0; i < srv->nservices; i++) { + svc = srv->services[i]; + /* find tls from svc */ + ctxt = virNetServerServiceGetTLSContext(svc); + if (ctxt == NULL) + continue; + + ret = virNetTLSContextUpdateCRL(ctxt); + if (ret < 0) { + VIR_ERROR(_("update tls file fail, " + "filetype: %d, svcID: %zu"), filetype, i); + ret = -1; + goto cleanup; + } + VIR_INFO("update success, filetype: %d, svcID: %zu", filetype, i); + cnt++; + } + + if (cnt == 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("no tls server found, don't need update %d"), + filetype); + } else { + VIR_INFO("update tls file complete, filetype: %d", + filetype); + } + + cleanup: + virObjectUnlock(srv); +#else + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Don't support GNUTLS: %d"), + filetype); +#endif + return ret; +} diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 260c99b22d..d0138d250f 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -133,3 +133,6 @@ size_t virNetServerGetCurrentUnauthClients(virNetServerPtr srv); int virNetServerSetClientLimits(virNetServerPtr srv, long long int maxClients, long long int maxClientsUnauth); + +int virNetServerUpdateTlsFile(virNetServerPtr srv, + unsigned int filetype); diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 08944f6771..1cc3cb8620 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1106,6 +1106,39 @@ int virNetTLSContextCheckCertificate(virNetTLSContextPtr ctxt, return ret; } +int virNetTLSContextUpdateCRL(virNetTLSContextPtr ctxt) +{ + int ret = -1; + char *cacrl = NULL; + + if (VIR_STRDUP(cacrl, LIBVIRT_CACRL) < 0) + return -1; + + if (!virFileExists(cacrl)) { + virReportSystemError(errno, _("%s not exist"), cacrl); + goto cleanup; + } + + virObjectLock(ctxt); + + ret = gnutls_certificate_set_x509_crl_file(ctxt->x509cred, + cacrl, + GNUTLS_X509_FMT_PEM); + if (ret < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Unable to update x509 CRL %s: %s"), + cacrl, gnutls_strerror(ret)); + } else { + VIR_INFO("Load %d CRL from %s", ret, cacrl); + ret = 0; + } + + virObjectUnlock(ctxt); + cleanup: + VIR_FREE(cacrl); + return ret; +} + void virNetTLSContextDispose(void *obj) { virNetTLSContextPtr ctxt = obj; diff --git a/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h index f3273bc26a..b823ab2c3f 100644 --- a/src/rpc/virnettlscontext.h +++ b/src/rpc/virnettlscontext.h @@ -23,6 +23,8 @@ #include "internal.h" #include "virobject.h" +#define TYPE_CACRL_LIBVIRT 13 + typedef struct _virNetTLSContext virNetTLSContext; typedef virNetTLSContext *virNetTLSContextPtr; @@ -65,6 +67,7 @@ virNetTLSContextPtr virNetTLSContextNewClient(const char *cacert, int virNetTLSContextCheckCertificate(virNetTLSContextPtr ctxt, virNetTLSSessionPtr sess); +int virNetTLSContextUpdateCRL(virNetTLSContextPtr ctxt); typedef ssize_t (*virNetTLSSessionWriteFunc)(const char *buf, size_t len, void *opaque); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 30106d1971..25971dbf27 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -50,6 +50,8 @@ /* we don't need precision to milliseconds in this module */ #define VIRT_ADMIN_TIME_BUFLEN VIR_TIME_STRING_BUFLEN - 3 +#define LIBVIRT_CACRL_TYPE 13 + static char *progname; static const vshCmdGrp cmdGroups[]; @@ -1103,6 +1105,57 @@ cmdDaemonLogOutputs(vshControl *ctl, const vshCmd *cmd) return true; } +/* ------------------------ + * Command update-crl-file + * ------------------------ + */ +static const vshCmdInfo info_srv_update_tls_file[] = { + {.name = "help", + .data = N_("notify tls file type, current only support libvirt cacrl(13)") + }, + {.name = "desc", + .data = N_("notify libvirtd TLS server hot update CACRL.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_srv_update_tls_file[] = { + {.name = "server", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("Server to reload the CRL file."), + }, + {.name = NULL} +}; + +static bool +cmdSrvUpdateTlsFile(vshControl *ctl, const vshCmd *cmd) +{ + bool ret = false; + const char *srvname = NULL; + unsigned int filetype = LIBVIRT_CACRL_TYPE; + + virAdmServerPtr srv = NULL; + vshAdmControlPtr priv = ctl->privData; + + if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + return false; + + if (!(srv = virAdmConnectLookupServer(priv->conn, srvname, 0))) + goto cleanup; + + if (virAdmServerUpdateTlsFile(srv, filetype, 0) < 0) { + vshError(ctl, "%s", _("Unable to update server's tls file.")); + goto cleanup; + } + + ret = true; + + cleanup: + virAdmServerFree(srv); + return ret; +} + static void * vshAdmConnectionHandler(vshControl *ctl) { @@ -1486,6 +1539,12 @@ static const vshCmdDef managementCmds[] = { .info = info_daemon_log_outputs, .flags = 0 }, + {.name = "update-crl-file", + .handler = cmdSrvUpdateTlsFile, + .opts = opts_srv_update_tls_file, + .info = info_srv_update_tls_file, + .flags = 0 + }, {.name = NULL} };

2 1

[libvirt] [PATCH] fix class type instantiated when listing network ports
by Daniel P. Berrangé 02 Jan '20

02 Jan '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt-override-virNetwork.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override-virNetwork.py b/libvirt-override-virNetwork.py index 749ee44..4245322 100644 --- a/libvirt-override-virNetwork.py +++ b/libvirt-override-virNetwork.py @@ -6,6 +6,6 @@ retlist = list() for domptr in ret: - retlist.append(virNetwork(self, _obj=domptr)) + retlist.append(virNetworkPort(self, _obj=domptr)) return retlist -- 2.24.1

2 1

[libvirt] [PATCH v2 0/5] Remove the last "no_memory" label
by Fabiano Fidêncio 02 Jan '20

02 Jan '20

This series touches virfirewall.c, the last place where a no_memory label can be found. The series: - Gets rid of setting and checking for ENOMEM as a firewall's error; - Use g_auto / g_autofree in a few different places; - Adapt ADD_ARG() macro as VIR_RESIZE_N() just aborts in case of OOM; - Remove no_memory mention from the hacking guide; Changes since v1: https://www.redhat.com/archives/libvir-list/2020-January/msg00018.html - Daniel suggested to get rid of ADD_ARG(). Instead of doing so, I've adapted the macro (as it does more than just a realloc) and, by doing so, got rid of the no_memory labels; - Dropped: - util: Rename 'no_memory' label to 'cleanup' - util: Add ADD_ARG_RETURN_ON_ERROR - util: Add ADD_ARG_RETURN_VALUE_ON_ERROR - Added: - util: Adapt ADD_ARG() macro Fabiano Fidêncio (5): util: Don't set/check for ENOMEM as a firewall error util: Use g_auto/g_autofree in virFirewallAddRuleFullV() util: Use g_auto in virFirewallStartTransaction() util: Adapt ADD_ARG() macro docs: Remove mention to no_memory label docs/hacking.html.in | 1 - src/util/virfirewall.c | 65 +++++++++++------------------------------- 2 files changed, 16 insertions(+), 50 deletions(-) -- 2.24.1

1 5

[libvirt] [PATCH] travis: fix homebrew install of python3
by Daniel P. Berrangé 02 Jan '20

02 Jan '20

The Python3 package has started failing to install from HomeBrew with the following: Error: The `brew link` step did not complete successfully The formula built, but is not symlinked into /usr/local Could not symlink Frameworks/Python.framework/Headers Target /usr/local/Frameworks/Python.framework/Headers is a symlink belonging to python@2. You can unlink it: brew unlink python@2 To force the link and overwrite all conflicting files: brew link --overwrite python The result is that libvirt fails to find python3: checking for python3... no configure: error: 'python3' binary is required to build libvirt It is unclear what changed in Travis/HomeBrew to break our previously working setup, but running the suggested command fixes it well enough for libvirt's CI needs. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 44ff5e9898..f129706456 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,6 +67,9 @@ matrix: env: - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH" - PKG_CONFIG_PATH="/usr/local/opt/libxml2/lib/pkgconfig" + before_script: + # Hack to blow away py2 + - brew link --overwrite python script: # We can't run 'distcheck' or 'syntax-check' because they fail on # macOS, but doing 'install' and 'dist' gives us some useful coverage -- 2.24.1

1 0

[libvirt] [PATCH 0/7] Remove the last "no_memory" label
by Fabiano Fidêncio 02 Jan '20

02 Jan '20

This series touches virfirewall.c, the last place where a no_memory label can be found. The series: - Renames no_memory to cleanup; - Gets rid of ENOMEM error treatment; - Use g_auto / g_autofree in a few different places; - Add new macros as ADD_ARG heavily rely on a goto; - Remove no_memory mention from the hacking guide; I'm not totally sure whether the new macros addition are worth it. Fabiano Fidêncio (7): util: Rename 'no_memory' label to 'cleanup' util: Don't set/check for ENOMEM as a firewall error util: Use g_auto/g_autofree in virFirewallAddRuleFullV() util: Use g_auto in virFirewallStartTransaction() util: Add ADD_ARG_RETURN_ON_ERROR util: Add ADD_ARG_RETURN_VALUE_ON_ERROR docs: Remove mention to no_memory label docs/hacking.html.in | 1 - src/util/virfirewall.c | 94 +++++++++++++++++++----------------------- 2 files changed, 42 insertions(+), 53 deletions(-) -- 2.24.1

2 9