- Devel - libvirt List Archives

[PATCH v3 0/7] Add Security Guest doc and check for capabilities cache validation
by Paulo de Rezende Pinatti 16 Jun '20

16 Jun '20

This series introduces the concept of a 'Secure Guest' feature which covers on s390 IBM Secure Execution and on x86 AMD Secure Encrypted Virtualization. Besides adding documentation for IBM Secure Execution it also adds checks during validation of the qemu capabilities cache. These checks per architecture can be performed for IBM Secure Execution on s390 and AMD Secure Encrypted Virtualization on AMD x86 CPUs (both checks implemented in this series). For s390 the verification consists of: - checking if /sys/firmware/uv is available: meaning the HW facility is available and the host OS supports it; - checking if the kernel cmdline contains 'prot_virt=1': meaning the host OS wants to use the feature. For AMD Secure Encrypted Virtualization the verification consists of: - checking if /sys/module/kvm_amd/parameters/sev contains the value '1': meaning SEV is enabled in the host kernel; - checking if /dev/sev exists Whenever the availability of the feature does not match the secure guest flag in the cache then libvirt will re-build it in order to pick up the new set of capabilities available. Additionally, this series adds the same aforementioned checks to the virt-host-validate tool to facilitate the manual verification process for users. Changes in v3: [Patch 1] Reworked auxiliary functions to eliminate unnecessary wrappers Moved arg normalization to MatchParam function Replaced macro VIR_CMDLINE_STR_CMP by the simpler function virKernelCmdlineStrCmp Renamed function SkipDbQuote to SkipQuote Renamed flag SEARCH_STICKY to SEARCH_FIRST Reworked some input values in unit test for better test coverage [Patches 4, 5] Added empty lines between if statements link to v2: https://www.redhat.com/archives/libvir-list/2020-May/msg01175.html Boris Fiuczynski (3): tools: secure guest check on s390 in virt-host-validate tools: secure guest check for AMD in virt-host-validate docs: update AMD launch secure description Paulo de Rezende Pinatti (3): util: introduce a parser for kernel cmdline arguments qemu: check if s390 secure guest support is enabled qemu: check if AMD secure guest support is enabled Viktor Mihajlovski (1): docs: Describe protected virtualization guest setup docs/kbase.html.in | 3 + docs/kbase/launch_security_sev.rst | 9 +- docs/kbase/s390_protected_virt.rst | 189 +++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 76 ++++++++++++ src/util/virutil.c | 188 ++++++++++++++++++++++++++++ src/util/virutil.h | 17 +++ tests/utiltest.c | 144 ++++++++++++++++++++++ tools/virt-host-validate-common.c | 88 +++++++++++++- tools/virt-host-validate-common.h | 5 + tools/virt-host-validate-qemu.c | 4 + 11 files changed, 720 insertions(+), 5 deletions(-) create mode 100644 docs/kbase/s390_protected_virt.rst -- 2.26.2

3 21

[PATCH] virQEMUDriverConfigNew: Add slash to cfg->defaultTLSx509certdir for non-embedded driver
by Peter Krempa 16 Jun '20

16 Jun '20

Commit 068efae5b1a9ef accidentally removed the slash. https://bugzilla.redhat.com/show_bug.cgi?id=1847234 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b49299e1de..33b3989268 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -234,7 +234,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged, * directory doesn't exist (although we don't check if this exists). */ if (root == NULL) { - cfg->defaultTLSx509certdir = g_strdup(SYSCONFDIR "pki/qemu"); + cfg->defaultTLSx509certdir = g_strdup(SYSCONFDIR "/pki/qemu"); } else { cfg->defaultTLSx509certdir = g_strdup_printf("%s/etc/pki/qemu", root); } -- 2.26.2

2 1

[libvirt] [PATCH 0/5] Add support for fine grained discard control of qemu
by Lin Ma 16 Jun '20

16 Jun '20

* The 'discard_granularity' property is available to 'scsi-hd', 'virtio-blk' and 'ide-*'. It impacts the 'Optimal Unmap Granularity' field in the block limits VPD page: Optimal Unmap Granularity = discard granularity / logical block size * The 'max_unmap_size' property is available to 'scsi-hd' and 'scsi-block'. It impacts the 'Maximum unmap LBA count' field in the block limits VPD page: Maximum unmap LBA count = max unmap size / logical block size Lin Ma (5): conf: Add support for discard granularity qemu: Add Support for discard granularity conf: Add support for unmap limit qemu: caps: Add max_unmap_size property of scsi-disk qemu: Add support for max_unmap_size property of scsi-disk docs/formatdomain.html.in | 18 +++++++- docs/schemas/domaincommon.rng | 10 +++++ src/conf/domain_conf.c | 43 ++++++++++++++++++- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++++++ src/qemu/qemu_domain.c | 4 ++ .../caps_2.1.1.x86_64.xml | 1 + .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_2.4.0.x86_64.xml | 1 + .../caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + .../caps_2.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../caps_2.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../caps_2.8.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../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 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + tests/qemuxml2argvdata/disk-blockio.args | 2 +- tests/qemuxml2argvdata/disk-blockio.xml | 2 +- .../disk-scsi-disk-max_unmap_size.args | 32 ++++++++++++++ .../disk-scsi-disk-max_unmap_size.xml | 28 ++++++++++++ tests/qemuxml2argvtest.c | 4 ++ 59 files changed, 203 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.args create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.xml -- 2.26.0

1 5

[libvirt PATCH 0/2] conf: Increase cpuset length limit for CPU pinning
by Jiri Denemark 15 Jun '20

15 Jun '20

The tests in patch 2/2 would fail without the first patch. Jiri Denemark (2): conf: Increase cpuset length limit for CPU pinning qemuxml2*test: Add cases for CPU pinning to large host CPU IDs src/conf/domain_conf.h | 2 +- .../cputune-cpuset-big-id.x86_64-latest.args | 39 +++++++++++++++++ .../cputune-cpuset-big-id.xml | 33 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../cputune-cpuset-big-id.x86_64-latest.xml | 43 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cputune-cpuset-big-id.xml create mode 100644 tests/qemuxml2xmloutdata/cputune-cpuset-big-id.x86_64-latest.xml -- 2.27.0

2 3

Does 'numad' interacts with memory_migration with 'numatune'?
by Daniel Henrique Barboza 15 Jun '20

15 Jun '20

Hi, While investigating a 'virsh numatune' behavior in Power 9 guests I came across this doubt and couldn't find a direct answer. numad role, as far as [1] goes, is automatic NUMA affinity only. As far as Libvirt and my understanding goes , numad is used for placement='auto' setups, which aren't even allowed for numatune operations in the first place. Problem is that I'm not sure if the mere presence of numad running in the host might be accelerating the memory migration triggered by numatune, regardless of placement settings. My first answer would be no, but several examples in the internet shows all the RAM in the guest being migrated from one NUMA node to the other almost instantly*, and aside from them being done in x86 I wonder whether numad is having any impact on that. The reason I'm asking is because I don't have a x86 setup with multiple NUMA nodes to compare results, and numad is broken sparse NUMA setups for some time now ([2] tells the story if you're interested), and Power 8/9 happens to operate with sparse NUMA setups, so no numad for me. If someone can confirm my suspicion (i.e. numad has no interference in NUMA memory migration triggered by numatune) I appreciate. Thanks, DHB * or at very least no one cared to point out that the memory is migrated according to the paging demanding of the guest, as I see happen in Power guests and working as intended according to kernel cgroup docs. [1] https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/ht… [2] https://bugs.launchpad.net/ubuntu/+source/numad/+bug/1832915

2 1

[libvirt PATCH] docs: Remove libvirt-dockerfiles from CI dashboard
by Andrea Bolognani 15 Jun '20

15 Jun '20

The repository is now obsolete, and it never had GitLab CI support anyway. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/ci.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/ci.rst b/docs/ci.rst index 2a8788d0d7..2e88e06b1b 100644 --- a/docs/ci.rst +++ b/docs/ci.rst @@ -138,11 +138,6 @@ Testing :target: https://gitlab.com/libvirt/libvirt-ci/pipelines :alt: libvirt-ci pipeline status - * - libvirt-dockerfiles - - .. image:: https://gitlab.com/libvirt/libvirt-dockerfiles/badges/master/pipeline.svg - :target: https://gitlab.com/libvirt/libvirt-dockerfiles/pipelines - :alt: libvirt-dockerfiles pipeline status - * - libvirt-test-API - .. image:: https://gitlab.com/libvirt/libvirt-test-API/badges/master/pipeline.svg :target: https://gitlab.com/libvirt/libvirt-test-API/pipelines -- 2.25.4

2 1

[libvirt-dockerfiles PATCH] README: Update to reflect repository status
by Andrea Bolognani 15 Jun '20

15 Jun '20

The contents of this repository are no longer used, so briefly explain why that is the case and point interested people in the right direction. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- README.md | 51 --------------------------------------------------- README.rst | 12 ++++++++++++ 2 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 README.md create mode 100644 README.rst diff --git a/README.md b/README.md deleted file mode 100644 index 3508517..0000000 --- a/README.md +++ /dev/null @@ -1,51 +0,0 @@ -Docker-based build environments for libvirt -=========================================== - -These images come with all libvirt build dependencies, including -optional ones, already installed: this makes it possible to run -something like - - $ docker run \ - -v $(pwd):/libvirt \ - -w /libvirt \ - -it \ - buildenv-centos-7 - -from a git clone and start building libvirt right away. - -Image availability is influenced by libvirt's -[platform support policy](https://libvirt.org/platforms.html), -with the obvious caveat that non-Linux operating systems can't -be run on top of a Linux kernel and as such are not included. - - -Intended use ------------- - -The images are primarily intended for use on -[Travis CI](https://travis-ci.org/libvirt/libvirt). - -The primary CI environment for the libvirt project is hosted on -[CentOS CI](https://ci.centos.org/view/libvirt/); however, since -that environment feeds off the `master` branch of the various -projects, it can only detect issues after the code causing them -has already been merged. - -While testing on Travis CI doesn't cover as many platforms or the -interactions between as many components, it can be very useful as -a smoke test of sorts that allows developers to catch mistakes -before posting patches to the mailing list. - -As an alternative, images can be used locally without relying on -third-party services; in this scenario, the number of platforms -patches are tested against is only limited by image availability -and hardware resources. - - -Information about build dependencies ------------------------------------- - -The list of build dependencies for libvirt (as well as many -other virtualization-related projects) is taken from the -[libvirt-ci](https://gitlab.com/libvirt/libvirt-ci) repository, -which also contains the tooling used to generate Dockerfiles. diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..ecdabcf --- /dev/null +++ b/README.rst @@ -0,0 +1,12 @@ +=================================== +!!! This repository is obsolete !!! +=================================== + +Container images are now generated as part of the GitLab CI pipeline +for the respective projects and hosted on the GitLab container +registry instead of being generated and hosted on Quay, with builds +triggered manually using the scripts in this repository; the +Dockerfiles themselves are also now part of the project's repository +instead of being centrally managed here. + +For more information, look into each project's ``ci/`` directory. -- 2.25.4

2 1

[libvirt PATCH] docs: add kbase entry showing KVM real time guest config
by Daniel P. Berrangé 15 Jun '20

15 Jun '20

There are many different settings that required to config a KVM guest for real time, low latency workoads. The documentation included here is based on guidance developed & tested by the Red Hat KVM real time team. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/kbase.html.in | 3 + docs/kbase/kvm-realtime.rst | 213 ++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 docs/kbase/kvm-realtime.rst diff --git a/docs/kbase.html.in b/docs/kbase.html.in index c586e0f676..e663ca525f 100644 --- a/docs/kbase.html.in +++ b/docs/kbase.html.in @@ -36,6 +36,9 @@ <dt><a href="kbase/virtiofs.html">Virtio-FS</a></dt> <dd>Share a filesystem between the guest and the host</dd> + + <dt><a href="kbase/kvm-realtime.html">KVM real time</a></dt> + <dd>Run real time workloads in guests on a KVM hypervisor</dd> </dl> </div> diff --git a/docs/kbase/kvm-realtime.rst b/docs/kbase/kvm-realtime.rst new file mode 100644 index 0000000000..ac6102879b --- /dev/null +++ b/docs/kbase/kvm-realtime.rst @@ -0,0 +1,213 @@ +========================== +KVM Real Time Guest Config +========================== + +.. contents:: + +The KVM hypervisor is capable of running real time guest workloads. This page +describes the key pieces of configuration required in the domain XML to achieve +the low latency needs of real time workloads. + +For the most part, configuration of the host OS is out of scope of this +documentation. Refer to the operating system vendor's guidance on configuring +the host OS and hardware for real time. Note in particular that the default +kernel used by most Linux distros is not suitable for low latency real time and +must be replaced by an special kernel build. + + +Host partitioning plan +====================== + +Running real time workloads requires carefully partitioning up the host OS +resources, such that the KVM / QEMU processes are strictly separated from any +other workload running on the host, both userspace processes and kernel threads. + +As such, some subset of host CPUs need to be reserved exclusively for running +KVM guests. This requires that the host kernel be booted using the ``isolcpus`` +kernel command line parameter. This parameter removes a set of CPUs from the +schedular, such that that no kernel threads or userspace processes will ever get +placed on those CPUs automatically. KVM guests are then manually placed onto +these CPUs. + +Deciding which host CPUs to reserve for real time requires understanding of the +guest workload needs and balancing with the host OS needs. The trade off will +also vary based on the physical hardware available. + +For the sake of illustration, this guide will assume a physical machine with two +NUMA nodes, each with 2 sockets and 4 cores, giving a total of 16 CPUs on the +host. Furthermore, it is assumed that hyperthreading is either not supported or +has been disabled in the BIOS, since it is incompatible with real time. Each +NUMA node is assumed to have 32 GB of RAM, giving 64 GB total for the host. + +It is assumed that 2 CPUs in each NUMA node are reserved for the host OS, with +the remaining 6 CPUs available for KVM real time. With this in mind, the host +kernel should have booted with ``isolcpus=2-7,10,15`` to reserve CPUs. + +To maximise efficiency of page table lookups for the guest, the host needs to be +configured with most RAM exposed as huge pages, ideally 1 GB sized. 6 GB of RAM +in each NUMA node will be reserved for general host OS usage as normal sized +pages, leaving 26 GB for KVM usage as huge pages. + +Once huge pages are reserved on the hypothetical machine, the ``virsh +capabilities`` command output is expected to look approximately like: + +:: + + <topology> + <cells num='2'> + <cell id='0'> + <memory unit='KiB'>33554432</memory> + <pages unit='KiB' size='4'>1572864</pages> + <pages unit='KiB' size='2048'>0</pages> + <pages unit='KiB' size='1048576'>26</pages> + <distances> + <sibling id='0' value='10'/> + <sibling id='1' value='21'/> + </distances> + <cpus num='8'> + <cpu id='0' socket_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' core_id='3' siblings='3'/> + <cpu id='4' socket_id='1' core_id='0' siblings='4'/> + <cpu id='5' socket_id='1' core_id='1' siblings='5'/> + <cpu id='6' socket_id='1' core_id='2' siblings='6'/> + <cpu id='7' socket_id='1' core_id='3' siblings='7'/> + </cpus> + </cell> + <cell id='1'> + <memory unit='KiB'>33554432</memory> + <pages unit='KiB' size='4'>1572864</pages> + <pages unit='KiB' size='2048'>0</pages> + <pages unit='KiB' size='1048576'>26</pages> + <distances> + <sibling id='0' value='21'/> + <sibling id='1' value='10'/> + </distances> + <cpus num='8'> + <cpu id='8' socket_id='0' core_id='0' siblings='8'/> + <cpu id='9' socket_id='0' core_id='1' siblings='9'/> + <cpu id='10' socket_id='0' core_id='2' siblings='10'/> + <cpu id='11' socket_id='0' core_id='3' siblings='11'/> + <cpu id='12' socket_id='1' core_id='0' siblings='12'/> + <cpu id='13' socket_id='1' core_id='1' siblings='13'/> + <cpu id='14' socket_id='1' core_id='2' siblings='14'/> + <cpu id='15' socket_id='1' core_id='3' siblings='15'/> + </cpus> + </cell> + </cells> + </topology> + +Be aware that CPU ID numbers are not always allocated sequentially as shown +here. It is not unusual to see IDs interleaved between sockets on the two NUMA +nodes, such that ``0-3,8-11`` are be on the first node and ``4-7,12-15`` are on +the second node. Carefully check the ``virsh capabilities`` output to determine +the CPU ID numbers when configiring both ``isolcpus`` and the guest ``cpuset`` +values. + +Guest configuration +=================== + +What follows is an overview of the key parts of the domain XML that need to be +configured to achieve low latency for real time workflows. The following example +will assume a 4 CPU guest, requiring 16 GB of RAM. It is intended to be placed +on the second host NUMA node. + +CPU configuration +----------------- + +Real time KVM guests intended to run Linux should have a minimum of 2 CPUs. +One vCPU is for running non-real time processes and performing I/O. The other +vCPUs will run real time applications. Some non-Linux OS may not require a +special non-real time CPU to be available, in which case the 2 CPU minimum would +not apply. + +Each guest CPU, even the non-real time one, needs to be pinned to a dedicated +host core that is in the `isolcpus` reserved set. The QEMU emulator threads +also need to be pinned to host CPUs that are not in the `isolcpus` reserved set. +The vCPUs need to be given a real time CPU schedular policy. + +When configuring the `guest CPU count <../formatdomain.html#elementsCPUAllocation>`_, +do not include any CPU affinity are this stage: + +:: + + <vcpu placement='static'>4</vcpu> + +The guest CPUs now need to be placed individually. In this case, they will all +be put within the same host socket, such that they can be exposed as core +siblings. This is achieved using the `CPU tunning config <../formatdomain.html#elementsCPUTuning>`_: + +:: + + <cputune> + <emulatorpin cpuset="8-9"/> + <vcpupin vcpu="0" cpuset="12"/> + <vcpupin vcpu="1" cpuset="13"/> + <vcpupin vcpu="2" cpuset="14"/> + <vcpupin vcpu="3" cpuset="15"/> + <vcpusched vcpus='0-4' scheduler='fifo' priority='1'/> + </cputune> + +The `guest CPU model <formatdomain.html#elementsCPU>`_ now needs to be +configured to pass through the host model unchanged, with topology matching the +placement: + +:: + + <cpu mode='host-passthrough'> + <topology sockets='1' dies='1' cores='4' threads='1'/> + <feature policy='require' name='tsc-deadline'/> + </cpu> + +The performance monitoring unit virtualization needs to be disabled +via the `hypervisor features <../formatdomain.html#elementsFeatures>`_: + +:: + + <features> + ... + <pmu state='off'/> + </features> + + +Memory configuration +-------------------- + +The host memory used for guest RAM needs to be allocated from huge pages on the +second NUMA node, and all other memory allocation needs to be locked into RAM +with memory page sharing disabled. +This is achieved by using the `memory backing config <formatdomain.html#elementsMemoryBacking>`_: + +:: + + <memoryBacking> + <hugepages> + <page size="1" unit="G" nodeset="1"/> + </hugepages> + <locked/> + <nosharepages/> + </memoryBacking> + + +Device configuration +-------------------- + +Libvirt adds a few devices by default to maintain historical QEMU configuration +behaviour. It is unlikely these devices are required by real time guests, so it +is wise to disable them. Remove all USB controllers that may exist in the XML +config and replace them with: + +:: + + <controller type="usb" model="none"/> + +Similarly the memory balloon config should be changed to + +:: + + <memballoon model="none"/> + +If the guest had a graphical console at installation time this can also be +disabled, with remote access being over SSH, with a minimal serial console +for emergencies. -- 2.26.2

2 1

[PATCH 0/2] virDevMapperGetTargetsImpl: Check for dm major properly
by Michal Privoznik 15 Jun '20

15 Jun '20

*** BLURB HERE *** Michal Prívozník (2): util: Move virIsDevMapperDevice() to virdevmapper.c virDevMapperGetTargetsImpl: Check for dm major properly src/libvirt_private.syms | 2 +- src/storage/parthelper.c | 2 +- src/storage/storage_backend_disk.c | 1 + src/util/virdevmapper.c | 33 ++++++++++++++++++++++-------- src/util/virdevmapper.h | 3 +++ src/util/virutil.c | 24 ---------------------- src/util/virutil.h | 2 -- 7 files changed, 31 insertions(+), 36 deletions(-) -- 2.26.2

2 3

[libvirt-dockerfiles PATCH] Drop libvirt images
by Andrea Bolognani 15 Jun '20

15 Jun '20

As of https://gitlab.com/libvirt/libvirt/-/commit/95abbdc432133b9ae4a76d15251d64b… libvirt uses the GitLab container registry for its CI, so we no longer need to build these on Quay. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. buildenv-libvirt-centos-7.zip | Bin 2022 -> 0 bytes buildenv-libvirt-centos-8.zip | Bin 946 -> 0 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 1117 -> 0 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 1110 -> 0 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 1115 -> 0 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 1112 -> 0 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 1110 -> 0 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 1121 -> 0 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 1113 -> 0 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 1123 -> 0 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 1112 -> 0 bytes buildenv-libvirt-debian-10.zip | Bin 1039 -> 0 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 1150 -> 0 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 1142 -> 0 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 1147 -> 0 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 1141 -> 0 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 1152 -> 0 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 1146 -> 0 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 1154 -> 0 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 1144 -> 0 bytes buildenv-libvirt-debian-9.zip | Bin 1069 -> 0 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 1117 -> 0 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 1110 -> 0 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 1115 -> 0 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 1112 -> 0 bytes buildenv-libvirt-debian-sid-cross-mips64el.zip | Bin 1121 -> 0 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 1109 -> 0 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 1123 -> 0 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 1112 -> 0 bytes buildenv-libvirt-debian-sid.zip | Bin 1039 -> 0 bytes buildenv-libvirt-fedora-31.zip | Bin 910 -> 0 bytes buildenv-libvirt-fedora-32.zip | Bin 910 -> 0 bytes ...denv-libvirt-fedora-rawhide-cross-mingw32.zip | Bin 1057 -> 0 bytes ...denv-libvirt-fedora-rawhide-cross-mingw64.zip | Bin 1060 -> 0 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 929 -> 0 bytes buildenv-libvirt-opensuse-151.zip | Bin 920 -> 0 bytes buildenv-libvirt-ubuntu-1804.zip | Bin 1075 -> 0 bytes buildenv-libvirt-ubuntu-2004.zip | Bin 1045 -> 0 bytes 38 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 buildenv-libvirt-centos-7.zip delete mode 100644 buildenv-libvirt-centos-8.zip delete mode 100644 buildenv-libvirt-debian-10-cross-aarch64.zip delete mode 100644 buildenv-libvirt-debian-10-cross-armv6l.zip delete mode 100644 buildenv-libvirt-debian-10-cross-armv7l.zip delete mode 100644 buildenv-libvirt-debian-10-cross-i686.zip delete mode 100644 buildenv-libvirt-debian-10-cross-mips.zip delete mode 100644 buildenv-libvirt-debian-10-cross-mips64el.zip delete mode 100644 buildenv-libvirt-debian-10-cross-mipsel.zip delete mode 100644 buildenv-libvirt-debian-10-cross-ppc64le.zip delete mode 100644 buildenv-libvirt-debian-10-cross-s390x.zip delete mode 100644 buildenv-libvirt-debian-10.zip delete mode 100644 buildenv-libvirt-debian-9-cross-aarch64.zip delete mode 100644 buildenv-libvirt-debian-9-cross-armv6l.zip delete mode 100644 buildenv-libvirt-debian-9-cross-armv7l.zip delete mode 100644 buildenv-libvirt-debian-9-cross-mips.zip delete mode 100644 buildenv-libvirt-debian-9-cross-mips64el.zip delete mode 100644 buildenv-libvirt-debian-9-cross-mipsel.zip delete mode 100644 buildenv-libvirt-debian-9-cross-ppc64le.zip delete mode 100644 buildenv-libvirt-debian-9-cross-s390x.zip delete mode 100644 buildenv-libvirt-debian-9.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-aarch64.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-armv6l.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-armv7l.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-i686.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-mips64el.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-mipsel.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-ppc64le.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-s390x.zip delete mode 100644 buildenv-libvirt-debian-sid.zip delete mode 100644 buildenv-libvirt-fedora-31.zip delete mode 100644 buildenv-libvirt-fedora-32.zip delete mode 100644 buildenv-libvirt-fedora-rawhide-cross-mingw32.zip delete mode 100644 buildenv-libvirt-fedora-rawhide-cross-mingw64.zip delete mode 100644 buildenv-libvirt-fedora-rawhide.zip delete mode 100644 buildenv-libvirt-opensuse-151.zip delete mode 100644 buildenv-libvirt-ubuntu-1804.zip delete mode 100644 buildenv-libvirt-ubuntu-2004.zip -- 2.25.4

1 0

driver-storage: undefined symbols in libvirt_storage_backend_*.so
by liangpeng (H) 15 Jun '20

15 Jun '20

Hello everyone, There are lots of undefined symbols in /usr/lib64/libvirt/storage-backend/libvirt_storage_backend_*.so. For example, # ldd -r /usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so linux-vdso.so.1 (0x0000ffff97901000) ... libgpg-error.so.0 => /usr/lib64/libgpg-error.so.0 (0x0000ffff9555a000) undefined symbol: virStorageBackendRefreshLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendDeleteLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendVolBuildLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendVolBuildFromLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendVolCreateLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendVolRefreshLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendVolDeleteLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendVolResizeLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendVolUploadLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendVolDownloadLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendVolWipeLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendFileSystemMountCmd (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendFindGlusterPoolSources (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendRegister (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendNamespaceInit (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendDeviceIsEmpty (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendFileSystemGetPoolSource (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) undefined symbol: virStorageBackendBuildLocal (/usr/lib64/libvirt/storage-backend/libvirt_storage_backend_fs.so) All the undefined symbols are defined in libvirt_driver_storage.so. And libvirt_storage_backend_*.so are loaded by virStorageDriverLoadBackendModule in libvirt_driver_storage.so. So there is no error when using. Shall we add libvirt_driver_storage.so to the shared object dependencies of libvirt_storage_backend_*.so?

2 1

[PATCH v2 0/7] Add Security Guest doc and check for capabilities cache validation
by Paulo de Rezende Pinatti 12 Jun '20

12 Jun '20

This series introduces the concept of a 'Secure Guest' feature which covers on s390 IBM Secure Execution and on x86 AMD Secure Encrypted Virtualization. Besides adding documentation for IBM Secure Execution it also adds checks during validation of the qemu capabilities cache. These checks per architecture can be performed for IBM Secure Execution on s390 and AMD Secure Encrypted Virtualization on AMD x86 CPUs (both checks implemented in this series). For s390 the verification consists of: - checking if /sys/firmware/uv is available: meaning the HW facility is available and the host OS supports it; - checking if the kernel cmdline contains 'prot_virt=1': meaning the host OS wants to use the feature. For AMD Secure Encrypted Virtualization the verification consists of: - checking if /sys/module/kvm_amd/parameters/sev contains the value '1': meaning SEV is enabled in the host kernel; - checking if /dev/sev exists Whenever the availability of the feature does not match the secure guest flag in the cache then libvirt will re-build it in order to pick up the new set of capabilities available. Additionally, this series adds the same aforementioned checks to the virt-host-validate tool to facilitate the manual verification process for users. Changes in v2: [Patch 1] Reworked kernel cmdline parser into a parameter based processing. [Patch 2] Added missing value "on" to kvalue list [Patch 3] Changed AMD SEV support check to module parameter is set and /dev/sev exists. Moved doc changes to a new standalone patch 6. [Patch 4] Added missing value "on" to kvalue list [Patch 5] Changed AMD SEV support check to align with patch 3. Moved doc changes to a new standalone patch 6. [Patch 6] Summarized AMD SEV doc changes from patches 3 and 5. Adjusted libvirt version number [Patch 7 (v1: Patch 6)] Adjusted libvirt version number link to v1: https://www.redhat.com/archives/libvir-list/2020-May/msg00416.html Boris Fiuczynski (3): tools: secure guest check on s390 in virt-host-validate tools: secure guest check for AMD in virt-host-validate docs: update AMD launch secure description Paulo de Rezende Pinatti (3): util: introduce a parser for kernel cmdline arguments qemu: check if s390 secure guest support is enabled qemu: check if AMD secure guest support is enabled Viktor Mihajlovski (1): docs: Describe protected virtualization guest setup docs/kbase.html.in | 3 + docs/kbase/launch_security_sev.rst | 9 +- docs/kbase/s390_protected_virt.rst | 189 +++++++++++++++++++++++++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 76 ++++++++++++ src/util/virutil.c | 169 ++++++++++++++++++++++++++ src/util/virutil.h | 17 +++ tests/utiltest.c | 141 +++++++++++++++++++++ tools/virt-host-validate-common.c | 83 ++++++++++++- tools/virt-host-validate-common.h | 5 + tools/virt-host-validate-qemu.c | 4 + 11 files changed, 693 insertions(+), 5 deletions(-) create mode 100644 docs/kbase/s390_protected_virt.rst -- 2.25.4

3 19

[libvirt PATCH] ci: Swap mipsel and ppc64le builds
by Andrea Bolognani 11 Jun '20

11 Jun '20

Debian sid is currently broken on mipsel, so use Debian 10 for that architecture; at the same time, move the ppc64le build from Debian 10 to Debian sid to keep things balanced. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as a CI fix. .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0def25ff32..bfb66a652d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -257,12 +257,12 @@ mips64el-debian-10-container: NAME: debian-10-cross-mips64el mipsel-debian-10-container: - <<: *container_optional_job_definition + <<: *container_extra_job_definition variables: NAME: debian-10-cross-mipsel ppc64le-debian-10-container: - <<: *container_extra_job_definition + <<: *container_optional_job_definition variables: NAME: debian-10-cross-ppc64le @@ -302,12 +302,12 @@ mips64el-debian-sid-container: NAME: debian-sid-cross-mips64el mipsel-debian-sid-container: - <<: *container_extra_job_definition + <<: *container_optional_job_definition variables: NAME: debian-sid-cross-mipsel ppc64le-debian-sid-container: - <<: *container_optional_job_definition + <<: *container_extra_job_definition variables: NAME: debian-sid-cross-ppc64le @@ -426,11 +426,11 @@ aarch64-debian-10: NAME: debian-10 CROSS: aarch64 -ppc64le-debian-10: +mipsel-debian-10: <<: *cross_build_extra_job_definition variables: NAME: debian-10 - CROSS: ppc64le + CROSS: mipsel s390x-debian-10: <<: *cross_build_default_job_definition @@ -450,11 +450,11 @@ i686-debian-sid: NAME: debian-sid CROSS: i686 -mipsel-debian-sid: +ppc64le-debian-sid: <<: *cross_build_extra_job_definition variables: NAME: debian-sid - CROSS: mipsel + CROSS: ppc64le mingw32-fedora-rawhide: <<: *cross_build_default_job_definition -- 2.25.4

1 0

[libvirt PATCH v4 0/3] ci: Use GitLab container registry
by Andrea Bolognani 11 Jun '20

11 Jun '20

Changes from [v3]: * use 'latest' as tag name, consistently with how we do it for other repositories; * name the various Dockerfiles the same as the lcitool host instead of processing the name, which again is the same behavior seen in other repositories; * since we're running all builds as part of the same stage now, there is no need to add an additional stage between 'containers' and 'builds', so the corresponding patch has been dropped. Changes from [v2]: * use $CI_COMMIT_REF_SLUG instead of 'master' as tag name, so that it's possible to test changes to the Dockerfiles that affect the subsequent build jobs in a feature branch; * add CentOS Stream; * rename 'preliminary_checks' stage to 'sanity_checks'. Changes from [v1]: * only build containers necessary for extra jobs when said jobs are actually going to run; * rename container build jobs to '$arch-$os-container'; * rename 'other' stage to 'preliminary_checks' and move it before native builds; * simplify build system integration. [v1] https://www.redhat.com/archives/libvir-list/2020-May/msg01183.html [v2] https://www.redhat.com/archives/libvir-list/2020-June/msg00067.html [v3] https://www.redhat.com/archives/libvir-list/2020-June/msg00412.html Andrea Bolognani (3): ci: Use variables to build image names ci: Use GitLab container registry ci: Update build system integration .gitlab-ci.yml | 330 ++++++++++++++++-- ci/Makefile | 10 +- ci/containers/README.rst | 14 + ci/containers/libvirt-centos-7.Dockerfile | 137 ++++++++ ci/containers/libvirt-centos-8.Dockerfile | 108 ++++++ .../libvirt-centos-stream.Dockerfile | 109 ++++++ ...libvirt-debian-10-cross-aarch64.Dockerfile | 122 +++++++ .../libvirt-debian-10-cross-armv6l.Dockerfile | 120 +++++++ .../libvirt-debian-10-cross-armv7l.Dockerfile | 121 +++++++ .../libvirt-debian-10-cross-i686.Dockerfile | 121 +++++++ .../libvirt-debian-10-cross-mips.Dockerfile | 121 +++++++ ...ibvirt-debian-10-cross-mips64el.Dockerfile | 121 +++++++ .../libvirt-debian-10-cross-mipsel.Dockerfile | 121 +++++++ ...libvirt-debian-10-cross-ppc64le.Dockerfile | 121 +++++++ .../libvirt-debian-10-cross-s390x.Dockerfile | 121 +++++++ ci/containers/libvirt-debian-10.Dockerfile | 112 ++++++ .../libvirt-debian-9-cross-aarch64.Dockerfile | 126 +++++++ .../libvirt-debian-9-cross-armv6l.Dockerfile | 124 +++++++ .../libvirt-debian-9-cross-armv7l.Dockerfile | 125 +++++++ .../libvirt-debian-9-cross-mips.Dockerfile | 125 +++++++ ...libvirt-debian-9-cross-mips64el.Dockerfile | 125 +++++++ .../libvirt-debian-9-cross-mipsel.Dockerfile | 125 +++++++ .../libvirt-debian-9-cross-ppc64le.Dockerfile | 125 +++++++ .../libvirt-debian-9-cross-s390x.Dockerfile | 125 +++++++ ci/containers/libvirt-debian-9.Dockerfile | 116 ++++++ ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 122 +++++++ ...libvirt-debian-sid-cross-armv6l.Dockerfile | 120 +++++++ ...libvirt-debian-sid-cross-armv7l.Dockerfile | 121 +++++++ .../libvirt-debian-sid-cross-i686.Dockerfile | 121 +++++++ .../libvirt-debian-sid-cross-mips.Dockerfile | 121 +++++++ ...bvirt-debian-sid-cross-mips64el.Dockerfile | 121 +++++++ ...libvirt-debian-sid-cross-mipsel.Dockerfile | 120 +++++++ ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 121 +++++++ .../libvirt-debian-sid-cross-s390x.Dockerfile | 121 +++++++ ci/containers/libvirt-debian-sid.Dockerfile | 112 ++++++ ci/containers/libvirt-fedora-31.Dockerfile | 109 ++++++ ci/containers/libvirt-fedora-32.Dockerfile | 109 ++++++ ...rt-fedora-rawhide-cross-mingw32.Dockerfile | 130 +++++++ ...rt-fedora-rawhide-cross-mingw64.Dockerfile | 130 +++++++ .../libvirt-fedora-rawhide.Dockerfile | 110 ++++++ ci/containers/libvirt-opensuse-151.Dockerfile | 109 ++++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 117 +++++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 113 ++++++ ci/containers/refresh | 41 +++ ci/list-images.sh | 24 +- 45 files changed, 5169 insertions(+), 48 deletions(-) create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.Dockerfile create mode 100644 ci/containers/libvirt-centos-8.Dockerfile create mode 100644 ci/containers/libvirt-centos-stream.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-i686.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-mips.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile create mode 100644 ci/containers/libvirt-debian-10-cross-s390x.Dockerfile create mode 100644 ci/containers/libvirt-debian-10.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-mips.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile create mode 100644 ci/containers/libvirt-debian-9-cross-s390x.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-i686.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-mips.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile create mode 100644 ci/containers/libvirt-debian-sid.Dockerfile create mode 100644 ci/containers/libvirt-fedora-31.Dockerfile create mode 100644 ci/containers/libvirt-fedora-32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile create mode 100644 ci/containers/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/containers/libvirt-opensuse-151.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/containers/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/containers/refresh -- 2.25.4

2 6

[libvirt PATCH v2 0/3] network: support NAT with IPv6
by Daniel P. Berrangé 11 Jun '20

11 Jun '20

The virtual network has never supported NAT with IPv6 since this feature didn't exist at the time. NAT has been available since RHEL-7 vintage though, and it is desirable to be able to use it. This series enables it with <forward mode=3D"nat"> <nat ipv6=3D"yes"/> </forward> Note that I do NOT actually change the default.xml to enable use of IPv6 because that will cause failure if the user has force disabled IPv6 on their host kernel. Of course our current default.xml is already broken if someone has done the reverse and force disabled IPv4. We've also long had a problem with guests bringing up the default network with the same subnet as the host. We'll have this same issue with IPv6 too. On my prompting Laine proposed a way to deal with the clash by tearing down a network, if we see a real host NIC get assigned the same subnet. Meanwhile we also have complaints about the fact that libvirt does anything todo with networking in the %post of the RPM. I'm thinking that we can do something entirely different by introducing a concept of "automatic subnet selection" into the virtual network. Consider if we made default.xml be able to contain only: <network> <name>default</name> <forward/> <ip family=3D"ipv4" autoaddr=3D"yes"> <dhcp/> </ip> <ip family=3D"ipv6" autoaddr=3D"yes"/> </network> Conceptually this means - Try to gimme a subnet with IPv4 and DHCP - Try to gimme a subnet with IPv6 and RAs Now when we start the virtual network - If IPv4 is not enabled on host, don't assign addr - Else - Iterate N=3D1..254 to find a free range for IPv4 - Use 192.168.N.0/24 for subnet - Use 192.168.N.1 for host IP - Use 192.168.N.2 -> 192.168.N.254 for guest DHCP - If IPv6 is not enabled on host, don't assign addr - Else - Generate NNNN:NNNN as 4 random bytes - Use fd00:add:f00d:NNNN:NNNN::0/64 for IPv6 subnet - Use fd00:add:f00d:NNNN:NNNN::1 for host IP - Use route advertizement for IPv6 zero-conf With NNNN:NNNN, even with 1000 guests running, we have just a 0.02% chance of clashing with a guest for IPv6. The "live" XML would always reflect the currently assigned addresses Proactively monitor the address allocations of the host. If we see a conflicting address appear, take down the dnsmasq intance, generate a new subnet, bring dnsmasq back online. Ideally we would have to bring the guest network links offline and then online again to force DHCP re-assignment immediately. In v2: - Fix short circuit XML closing tag - Fix error checking in enum conversion - Fix docs typos - Improve RNG schema Daniel P. Berrang=C3=A9 (3): util: add support for IPv6 masquerade rules conf: add an attribute to turn on NAT for IPv6 virtual networks network: wire up support for IPv6 NAT rules docs/formatnetwork.html.in | 14 ++ docs/schemas/network.rng | 5 + src/conf/network_conf.c | 30 ++- src/conf/network_conf.h | 2 + src/network/bridge_driver_linux.c | 23 +- src/util/viriptables.c | 33 +-- .../nat-ipv6-masquerade-linux.args | 228 ++++++++++++++++++ .../nat-ipv6-masquerade.xml | 17 ++ tests/networkxml2firewalltest.c | 1 + .../nat-network-forward-nat-ipv6.xml | 10 + .../nat-network-forward-nat-ipv6.xml | 10 + tests/networkxml2xmltest.c | 1 + 12 files changed, 342 insertions(+), 32 deletions(-) create mode 100644 tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.a= rgs create mode 100644 tests/networkxml2firewalldata/nat-ipv6-masquerade.xml create mode 100644 tests/networkxml2xmlin/nat-network-forward-nat-ipv6.xml create mode 100644 tests/networkxml2xmlout/nat-network-forward-nat-ipv6.xml --=20 2.26.2

3 8

[PATCH] conf: convert network_conf.c to use g_auto* pointers
by Laine Stump 11 Jun '20

11 Jun '20

This was mostly boilerplate conversion, but in one case I needed to define several differently named char* to take the place of a single char *tmp that was re-used multiple times, and in another place there was a single char* that was used at the toplevel of the function, and then later used repeatedly inside a for loop, so I defined a new separate char* inside the loop. Signed-off-by: Laine Stump <laine(a)redhat.com> --- This should be applied on top of Dan's IPv6 NAT patch series (it was reviewing that series that showed me this file hadn't yet been converted). src/conf/network_conf.c | 613 +++++++++++++++++----------------------- src/conf/network_conf.h | 1 + src/util/virxml.h | 1 + 3 files changed, 259 insertions(+), 356 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 1b89e2985d..ebe8a03262 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -306,8 +306,7 @@ virNetworkDefCopy(virNetworkDefPtr def, virNetworkXMLOptionPtr xmlopt, unsigned int flags) { - char *xml = NULL; - virNetworkDefPtr newDef = NULL; + g_autofree char *xml = NULL; if (!def) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -317,11 +316,9 @@ virNetworkDefCopy(virNetworkDefPtr def, /* deep copy with a format/parse cycle */ if (!(xml = virNetworkDefFormat(def, xmlopt, flags))) - goto cleanup; - newDef = virNetworkDefParseString(xml, xmlopt); - cleanup: - VIR_FREE(xml); - return newDef; + return NULL; + + return virNetworkDefParseString(xml, xmlopt); } @@ -465,48 +462,43 @@ virNetworkDHCPRangeDefParseXML(const char *networkName, { virSocketAddrRangePtr addr = &range->addr; xmlNodePtr cur = node->children; - char *start = NULL, *end = NULL; - int ret = -1; + g_autofree char *start = NULL; + g_autofree char *end = NULL; if (!(start = virXMLPropString(node, "start"))) { virReportError(VIR_ERR_XML_ERROR, _("Missing 'start' attribute in dhcp range for network '%s'"), networkName); - goto cleanup; + return -1; } if (virSocketAddrParse(&addr->start, start, AF_UNSPEC) < 0) - goto cleanup; + return -1; if (!(end = virXMLPropString(node, "end"))) { virReportError(VIR_ERR_XML_ERROR, _("Missing 'end' attribute in dhcp range for network '%s'"), networkName); - goto cleanup; + return -1; } if (virSocketAddrParse(&addr->end, end, AF_UNSPEC) < 0) - goto cleanup; + return -1; /* do a sanity check of the range */ if (virSocketAddrGetRange(&addr->start, &addr->end, &ipdef->address, virNetworkIPDefPrefix(ipdef)) < 0) - goto cleanup; + return -1; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && virXMLNodeNameEqual(cur, "lease")) { if (virNetworkDHCPLeaseTimeDefParseXML(&range->lease, cur) < 0) - goto cleanup; + return -1; } cur = cur->next; } - ret = 0; - - cleanup: - VIR_FREE(start); - VIR_FREE(end); - return ret; + return 0; } @@ -517,11 +509,13 @@ virNetworkDHCPHostDefParseXML(const char *networkName, virNetworkDHCPHostDefPtr host, bool partialOkay) { - char *mac = NULL, *name = NULL, *ip = NULL, *id = NULL; + g_autofree char *mac = NULL; + g_autofree char *name = NULL; + g_autofree char *ip = NULL; + g_autofree char *id = NULL; virMacAddr addr; virSocketAddr inaddr; xmlNodePtr cur = node->children; - int ret = -1; mac = virXMLPropString(node, "mac"); if (mac != NULL) { @@ -530,20 +524,20 @@ virNetworkDHCPHostDefParseXML(const char *networkName, _("Invalid to specify MAC address '%s' " "in network '%s' IPv6 static host definition"), mac, networkName); - goto cleanup; + return -1; } if (virMacAddrParse(mac, &addr) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Cannot parse MAC address '%s' in network '%s'"), mac, networkName); - goto cleanup; + return -1; } if (virMacAddrIsMulticast(&addr)) { virReportError(VIR_ERR_XML_ERROR, _("expected unicast mac address, found " "multicast '%s' in network '%s'"), (const char *)mac, networkName); - goto cleanup; + return -1; } } @@ -554,7 +548,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("Invalid character '%c' in id '%s' of network '%s'"), *cp, id, networkName); - goto cleanup; + return -1; } } @@ -563,7 +557,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("Cannot use host name '%s' in network '%s'"), name, networkName); - goto cleanup; + return -1; } ip = virXMLPropString(node, "ip"); @@ -572,7 +566,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, _("Invalid IP address in static host definition " "for network '%s'"), networkName); - goto cleanup; + return -1; } if (partialOkay) { @@ -583,7 +577,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, "must be specified for static host definition " "in network '%s' "), networkName); - goto cleanup; + return -1; } } else { /* normal usage - you need at least name (IPv6) or one of MAC @@ -595,21 +589,21 @@ virNetworkDHCPHostDefParseXML(const char *networkName, _("Static host definition in IPv6 network '%s' " "must have id or name attribute"), networkName); - goto cleanup; + return -1; } } else if (!(mac || name)) { virReportError(VIR_ERR_XML_ERROR, _("Static host definition in IPv4 network '%s' " "must have mac or name attribute"), networkName); - goto cleanup; + return -1; } if (!ip) { virReportError(VIR_ERR_XML_ERROR, _("Missing IP address in static host definition " "for network '%s'"), networkName); - goto cleanup; + return -1; } } @@ -618,7 +612,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, virXMLNodeNameEqual(cur, "lease")) { if (virNetworkDHCPLeaseTimeDefParseXML(&host->lease, cur) < 0) - goto cleanup; + return -1; } cur = cur->next; } @@ -631,14 +625,9 @@ virNetworkDHCPHostDefParseXML(const char *networkName, name = NULL; if (ip) host->ip = inaddr; - ret = 0; - cleanup: - VIR_FREE(mac); - VIR_FREE(id); - VIR_FREE(name); - VIR_FREE(ip); - return ret; + return 0; + } @@ -676,8 +665,8 @@ virNetworkDHCPDefParseXML(const char *networkName, } else if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) && cur->type == XML_ELEMENT_NODE && virXMLNodeNameEqual(cur, "bootp")) { - char *file; - char *server; + g_autofree char *file = NULL; + g_autofree char *server = NULL; virSocketAddr inaddr; memset(&inaddr, 0, sizeof(inaddr)); @@ -689,14 +678,12 @@ virNetworkDHCPDefParseXML(const char *networkName, if (server && virSocketAddrParse(&inaddr, server, AF_UNSPEC) < 0) { - VIR_FREE(file); - VIR_FREE(server); goto cleanup; } def->bootfile = file; + file = NULL; def->bootserver = inaddr; - VIR_FREE(server); } cur = cur->next; @@ -716,7 +703,7 @@ virNetworkDNSHostDefParseXML(const char *networkName, bool partialOkay) { xmlNodePtr cur; - char *ip; + g_autofree char *ip = NULL; if (!(ip = virXMLPropString(node, "ip")) && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, @@ -729,17 +716,15 @@ virNetworkDNSHostDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_DETAIL, _("Invalid IP address in network '%s' DNS HOST record"), networkName); - VIR_FREE(ip); goto error; } - VIR_FREE(ip); cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && virXMLNodeNameEqual(cur, "hostname")) { if (cur->children != NULL) { - char *name = (char *) xmlNodeGetContent(cur); + g_autofree char *name = (char *) xmlNodeGetContent(cur); if (!name) { virReportError(VIR_ERR_XML_DETAIL, @@ -747,10 +732,8 @@ virNetworkDNSHostDefParseXML(const char *networkName, networkName); goto error; } - if (VIR_APPEND_ELEMENT(def->names, def->nnames, name) < 0) { - VIR_FREE(name); + if (VIR_APPEND_ELEMENT(def->names, def->nnames, name) < 0) goto error; - } } } cur = cur->next; @@ -950,15 +933,14 @@ virNetworkDNSDefParseXML(const char *networkName, xmlXPathContextPtr ctxt, virNetworkDNSDefPtr def) { - xmlNodePtr *hostNodes = NULL; - xmlNodePtr *srvNodes = NULL; - xmlNodePtr *txtNodes = NULL; - xmlNodePtr *fwdNodes = NULL; - char *forwardPlainNames = NULL; - char *enable = NULL; + g_autofree xmlNodePtr *hostNodes = NULL; + g_autofree xmlNodePtr *srvNodes = NULL; + g_autofree xmlNodePtr *txtNodes = NULL; + g_autofree xmlNodePtr *fwdNodes = NULL; + g_autofree char *forwardPlainNames = NULL; + g_autofree char *enable = NULL; int nhosts, nsrvs, ntxts, nfwds; size_t i; - int ret = -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -971,7 +953,7 @@ virNetworkDNSDefParseXML(const char *networkName, _("Invalid dns enable setting '%s' " "in network '%s'"), enable, networkName); - goto cleanup; + return -1; } } @@ -983,7 +965,7 @@ virNetworkDNSDefParseXML(const char *networkName, _("Invalid dns forwardPlainNames setting '%s' " "in network '%s'"), forwardPlainNames, networkName); - goto cleanup; + return -1; } } @@ -992,14 +974,14 @@ virNetworkDNSDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <forwarder> element found in <dns> of network %s"), networkName); - goto cleanup; + return -1; } if (nfwds > 0) { if (VIR_ALLOC_N(def->forwarders, nfwds) < 0) - goto cleanup; + return -1; for (i = 0; i < nfwds; i++) { - char *addr = virXMLPropString(fwdNodes[i], "addr"); + g_autofree char *addr = virXMLPropString(fwdNodes[i], "addr"); if (addr && virSocketAddrParse(&def->forwarders[i].addr, addr, AF_UNSPEC) < 0) { @@ -1007,17 +989,15 @@ virNetworkDNSDefParseXML(const char *networkName, _("Invalid forwarder IP address '%s' " "in network '%s'"), addr, networkName); - VIR_FREE(addr); - goto cleanup; + return -1; } def->forwarders[i].domain = virXMLPropString(fwdNodes[i], "domain"); if (!(addr || def->forwarders[i].domain)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Invalid forwarder element, must contain " "at least one of addr or domain")); - goto cleanup; + return -1; } - VIR_FREE(addr); def->nfwds++; } } @@ -1027,16 +1007,16 @@ virNetworkDNSDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <host> element found in <dns> of network %s"), networkName); - goto cleanup; + return -1; } if (nhosts > 0) { if (VIR_ALLOC_N(def->hosts, nhosts) < 0) - goto cleanup; + return -1; for (i = 0; i < nhosts; i++) { if (virNetworkDNSHostDefParseXML(networkName, hostNodes[i], &def->hosts[def->nhosts], false) < 0) { - goto cleanup; + return -1; } def->nhosts++; } @@ -1047,16 +1027,16 @@ virNetworkDNSDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <srv> element found in <dns> of network %s"), networkName); - goto cleanup; + return -1; } if (nsrvs > 0) { if (VIR_ALLOC_N(def->srvs, nsrvs) < 0) - goto cleanup; + return -1; for (i = 0; i < nsrvs; i++) { if (virNetworkDNSSrvDefParseXML(networkName, srvNodes[i], ctxt, &def->srvs[def->nsrvs], false) < 0) { - goto cleanup; + return -1; } def->nsrvs++; } @@ -1067,16 +1047,16 @@ virNetworkDNSDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <txt> element found in <dns> of network %s"), networkName); - goto cleanup; + return -1; } if (ntxts > 0) { if (VIR_ALLOC_N(def->txts, ntxts) < 0) - goto cleanup; + return -1; for (i = 0; i < ntxts; i++) { if (virNetworkDNSTxtDefParseXML(networkName, txtNodes[i], &def->txts[def->ntxts], false) < 0) { - goto cleanup; + return -1; } def->ntxts++; } @@ -1087,18 +1067,10 @@ virNetworkDNSDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("Extra data in disabled network '%s'"), networkName); - goto cleanup; + return -1; } - ret = 0; - cleanup: - VIR_FREE(enable); - VIR_FREE(forwardPlainNames); - VIR_FREE(fwdNodes); - VIR_FREE(hostNodes); - VIR_FREE(srvNodes); - VIR_FREE(txtNodes); - return ret; + return 0; } @@ -1115,11 +1087,12 @@ virNetworkIPDefParseXML(const char *networkName, VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr dhcp; - char *address = NULL, *netmask = NULL; + g_autofree char *address = NULL; + g_autofree char *netmask = NULL; + g_autofree char *localPtr = NULL; unsigned long prefix = 0; int prefixRc; - int result = -1; - char *localPtr = NULL; + int ret = -1; ctxt->node = node; @@ -1243,16 +1216,13 @@ virNetworkIPDefParseXML(const char *networkName, def->tftproot = virXPathString("string(./tftp[1]/@root)", ctxt); } - result = 0; + ret = 0; cleanup: - if (result < 0) + if (ret < 0) virNetworkIPDefClear(def); - VIR_FREE(address); - VIR_FREE(netmask); - VIR_FREE(localPtr); - return result; + return ret; } @@ -1290,10 +1260,10 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def, xmlNodePtr virtPortNode; xmlNodePtr vlanNode; xmlNodePtr bandwidth_node; - char *isDefault = NULL; - char *trustGuestRxFilters = NULL; + g_autofree char *isDefault = NULL; + g_autofree char *trustGuestRxFilters = NULL; - int result = -1; + int ret = -1; ctxt->node = node; @@ -1335,14 +1305,12 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def, if (vlanNode && virNetDevVlanParse(vlanNode, ctxt, &def->vlan) < 0) goto cleanup; - result = 0; + ret = 0; cleanup: - if (result < 0) + if (ret < 0) virPortGroupDefClear(def); - VIR_FREE(isDefault); - VIR_FREE(trustGuestRxFilters); - return result; + return ret; } @@ -1352,13 +1320,12 @@ virNetworkForwardNatDefParseXML(const char *networkName, xmlXPathContextPtr ctxt, virNetworkForwardDefPtr def) { - int ret = -1; - xmlNodePtr *natAddrNodes = NULL; - xmlNodePtr *natPortNodes = NULL; int nNatAddrs, nNatPorts; - char *addrStart = NULL; - char *addrEnd = NULL; - char *ipv6 = NULL; + g_autofree xmlNodePtr *natAddrNodes = NULL; + g_autofree xmlNodePtr *natPortNodes = NULL; + g_autofree char *addrStart = NULL; + g_autofree char *addrEnd = NULL; + g_autofree char *ipv6 = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -1367,7 +1334,7 @@ virNetworkForwardNatDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("The <nat> element can only be used when <forward> 'mode' is 'nat' in network %s"), networkName); - goto cleanup; + return -1; } ipv6 = virXMLPropString(node, "ipv6"); @@ -1378,10 +1345,9 @@ virNetworkForwardNatDefParseXML(const char *networkName, _("Invalid ipv6 setting '%s' " "in network '%s' NAT"), ipv6, networkName); - goto cleanup; + return -1; } def->natIPv6 = natIPv6; - VIR_FREE(ipv6); } /* addresses for SNAT */ @@ -1390,26 +1356,26 @@ virNetworkForwardNatDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <address> element found in <forward> of " "network %s"), networkName); - goto cleanup; + return -1; } else if (nNatAddrs > 1) { virReportError(VIR_ERR_XML_ERROR, _("Only one <address> element is allowed in <nat> in " "<forward> in network %s"), networkName); - goto cleanup; + return -1; } else if (nNatAddrs == 1) { addrStart = virXMLPropString(*natAddrNodes, "start"); if (addrStart == NULL) { virReportError(VIR_ERR_XML_ERROR, _("missing 'start' attribute in <address> element in <nat> in " "<forward> in network %s"), networkName); - goto cleanup; + return -1; } addrEnd = virXMLPropString(*natAddrNodes, "end"); if (addrEnd == NULL) { virReportError(VIR_ERR_XML_ERROR, _("missing 'end' attribute in <address> element in <nat> in " "<forward> in network %s"), networkName); - goto cleanup; + return -1; } } @@ -1417,34 +1383,34 @@ virNetworkForwardNatDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("Bad ipv4 start address '%s' in <nat> in <forward> in " "network '%s'"), addrStart, networkName); - goto cleanup; + return -1; } if (addrEnd && virSocketAddrParse(&def->addr.end, addrEnd, AF_INET) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Bad ipv4 end address '%s' in <nat> in <forward> in " "network '%s'"), addrEnd, networkName); - goto cleanup; + return -1; } if (addrStart && addrEnd) { /* verify that start <= end */ if (virSocketAddrGetRange(&def->addr.start, &def->addr.end, NULL, 0) < 0) - goto cleanup; + return -1; } else { if (addrStart) { virReportError(VIR_ERR_XML_ERROR, _("Only start address '%s' specified in <nat> in " "<forward> in network '%s'"), addrStart, networkName); - goto cleanup; + return -1; } if (addrEnd) { virReportError(VIR_ERR_XML_ERROR, _("Only end address '%s' specified in <nat> in " "<forward> in network '%s'"), addrEnd, networkName); - goto cleanup; + return -1; } } @@ -1454,12 +1420,12 @@ virNetworkForwardNatDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <port> element found in <forward> of " "network %s"), networkName); - goto cleanup; + return -1; } else if (nNatPorts > 1) { virReportError(VIR_ERR_XML_ERROR, _("Only one <port> element is allowed in <nat> in " "<forward> in network %s"), networkName); - goto cleanup; + return -1; } else if (nNatPorts == 1) { if (virXPathUInt("string(./port[1]/@start)", ctxt, &def->port.start) < 0 || def->port.start > 65535) { @@ -1468,24 +1434,17 @@ virNetworkForwardNatDefParseXML(const char *networkName, _("Missing or invalid 'start' attribute in <port> " "in <nat> in <forward> in network %s"), networkName); - goto cleanup; + return -1; } if (virXPathUInt("string(./port[1]/@end)", ctxt, &def->port.end) < 0 || def->port.end > 65535 || def->port.end < def->port.start) { virReportError(VIR_ERR_XML_DETAIL, _("Missing or invalid 'end' attribute in <port> in " "<nat> in <forward> in network %s"), networkName); - goto cleanup; + return -1; } } - ret = 0; - - cleanup: - VIR_FREE(addrStart); - VIR_FREE(addrEnd); - VIR_FREE(natAddrNodes); - VIR_FREE(natPortNodes); - return ret; + return 0; } @@ -1496,16 +1455,15 @@ virNetworkForwardDefParseXML(const char *networkName, virNetworkForwardDefPtr def) { size_t i, j; - int ret = -1; - xmlNodePtr *forwardIfNodes = NULL; - xmlNodePtr *forwardPfNodes = NULL; - xmlNodePtr *forwardAddrNodes = NULL; - xmlNodePtr *forwardNatNodes = NULL; int nForwardIfs, nForwardAddrs, nForwardPfs, nForwardNats; - char *forwardDev = NULL; - char *forwardManaged = NULL; - char *forwardDriverName = NULL; - char *type = NULL; + g_autofree xmlNodePtr *forwardIfNodes = NULL; + g_autofree xmlNodePtr *forwardPfNodes = NULL; + g_autofree xmlNodePtr *forwardAddrNodes = NULL; + g_autofree xmlNodePtr *forwardNatNodes = NULL; + g_autofree char *forwardDev = NULL; + g_autofree char *forwardManaged = NULL; + g_autofree char *forwardDriverName = NULL; + g_autofree char *type = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node = node; @@ -1516,9 +1474,8 @@ virNetworkForwardDefParseXML(const char *networkName, if ((def->type = virNetworkForwardTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown forwarding type '%s'"), type); - goto cleanup; + return -1; } - VIR_FREE(type); } forwardManaged = virXPathString("string(./@managed)", ctxt); @@ -1537,7 +1494,7 @@ virNetworkForwardDefParseXML(const char *networkName, _("Unknown forward <driver name='%s'/> " "in network %s"), forwardDriverName, networkName); - goto cleanup; + return -1; } def->driverName = driverName; } @@ -1548,7 +1505,7 @@ virNetworkForwardDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <interface> element found in <forward> of network %s"), networkName); - goto cleanup; + return -1; } nForwardAddrs = virXPathNodeSet("./address", ctxt, &forwardAddrNodes); @@ -1556,7 +1513,7 @@ virNetworkForwardDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <address> element found in <forward> of network %s"), networkName); - goto cleanup; + return -1; } nForwardPfs = virXPathNodeSet("./pf", ctxt, &forwardPfNodes); @@ -1564,7 +1521,7 @@ virNetworkForwardDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <pf> element found in <forward> of network %s"), networkName); - goto cleanup; + return -1; } nForwardNats = virXPathNodeSet("./nat", ctxt, &forwardNatNodes); @@ -1572,17 +1529,17 @@ virNetworkForwardDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("invalid <nat> element found in <forward> of network %s"), networkName); - goto cleanup; + return -1; } else if (nForwardNats > 1) { virReportError(VIR_ERR_XML_ERROR, _("Only one <nat> element is allowed in <forward> of network %s"), networkName); - goto cleanup; + return -1; } else if (nForwardNats == 1) { if (virNetworkForwardNatDefParseXML(networkName, *forwardNatNodes, ctxt, def) < 0) - goto cleanup; + return -1; } forwardDev = virXPathString("string(./@dev)", ctxt); @@ -1591,12 +1548,12 @@ virNetworkForwardDefParseXML(const char *networkName, _("the <forward> 'dev' attribute cannot be used when " "<address> or <pf> sub-elements are present " "in network %s")); - goto cleanup; + return -1; } if (nForwardIfs > 0 || forwardDev) { if (VIR_ALLOC_N(def->ifs, MAX(nForwardIfs, 1)) < 0) - goto cleanup; + return -1; if (forwardDev) { def->ifs[0].device.dev = forwardDev; @@ -1607,64 +1564,66 @@ virNetworkForwardDefParseXML(const char *networkName, /* parse each <interface> */ for (i = 0; i < nForwardIfs; i++) { - forwardDev = virXMLPropString(forwardIfNodes[i], "dev"); - if (!forwardDev) { + g_autofree char *forwardDevi = virXMLPropString(forwardIfNodes[i], "dev"); + + if (!forwardDevi) { virReportError(VIR_ERR_XML_ERROR, _("Missing required dev attribute in " "<forward> <interface> element of network %s"), networkName); - goto cleanup; + return -1; } if ((i == 0) && (def->nifs == 1)) { /* both <forward dev='x'> and <interface dev='x'/> are * present. If they don't match, it's an error. */ - if (STRNEQ(forwardDev, def->ifs[0].device.dev)) { + if (STRNEQ(forwardDevi, def->ifs[0].device.dev)) { virReportError(VIR_ERR_XML_ERROR, _("<forward dev='%s'> must match first " "<interface dev='%s'/> in network %s"), def->ifs[0].device.dev, - forwardDev, networkName); - goto cleanup; + forwardDevi, networkName); + return -1; } - VIR_FREE(forwardDev); continue; } for (j = 0; j < i; j++) { - if (STREQ_NULLABLE(def->ifs[j].device.dev, forwardDev)) { + if (STREQ_NULLABLE(def->ifs[j].device.dev, forwardDevi)) { virReportError(VIR_ERR_XML_ERROR, _("interface '%s' can only be " "listed once in network %s"), - forwardDev, networkName); - goto cleanup; + forwardDevi, networkName); + return -1; } } - def->ifs[i].device.dev = forwardDev; - forwardDev = NULL; + def->ifs[i].device.dev = forwardDevi; + forwardDevi = NULL; def->ifs[i].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV; def->nifs++; } } else if (nForwardAddrs > 0) { if (VIR_ALLOC_N(def->ifs, nForwardAddrs) < 0) - goto cleanup; + return -1; for (i = 0; i < nForwardAddrs; i++) { - if (!(type = virXMLPropString(forwardAddrNodes[i], "type"))) { + g_autofree char *addrType = NULL; + + if (!(addrType = virXMLPropString(forwardAddrNodes[i], "type"))) { virReportError(VIR_ERR_XML_ERROR, _("missing address type in network %s"), networkName); - goto cleanup; + return -1; } - if ((def->ifs[i].type = virNetworkForwardHostdevDeviceTypeFromString(type)) < 0) { + if ((def->ifs[i].type = virNetworkForwardHostdevDeviceTypeFromString(addrType)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown address type '%s' in network %s"), - type, networkName); - goto cleanup; + addrType, networkName); + return -1; } switch (def->ifs[i].type) { @@ -1673,7 +1632,7 @@ virNetworkForwardDefParseXML(const char *networkName, virPCIDeviceAddressPtr addr = &def->ifs[i].device.pci; if (virPCIDeviceAddressParseXML(forwardAddrNodes[i], addr) < 0) - goto cleanup; + return -1; for (j = 0; j < i; j++) { if (virPCIDeviceAddressEqual(addr, &def->ifs[j].device.pci)) { @@ -1683,7 +1642,7 @@ virNetworkForwardDefParseXML(const char *networkName, addr->domain, addr->bus, addr->slot, addr->function, networkName); - goto cleanup; + return -1; } } break; @@ -1693,10 +1652,9 @@ virNetworkForwardDefParseXML(const char *networkName, default: virReportError(VIR_ERR_XML_ERROR, _("unsupported address type '%s' in network %s"), - type, networkName); - goto cleanup; + addrType, networkName); + return -1; } - VIR_FREE(type); def->nifs++; } @@ -1704,10 +1662,10 @@ virNetworkForwardDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("Only one <pf> element is allowed in <forward> of network %s"), networkName); - goto cleanup; + return -1; } else if (nForwardPfs == 1) { if (VIR_ALLOC_N(def->pfs, nForwardPfs) < 0) - goto cleanup; + return -1; forwardDev = virXMLPropString(*forwardPfNodes, "dev"); if (!forwardDev) { @@ -1715,7 +1673,7 @@ virNetworkForwardDefParseXML(const char *networkName, _("Missing required dev attribute " "in <pf> element of network '%s'"), networkName); - goto cleanup; + return -1; } def->pfs->dev = forwardDev; @@ -1723,17 +1681,7 @@ virNetworkForwardDefParseXML(const char *networkName, def->npfs++; } - ret = 0; - cleanup: - VIR_FREE(type); - VIR_FREE(forwardDev); - VIR_FREE(forwardManaged); - VIR_FREE(forwardDriverName); - VIR_FREE(forwardPfNodes); - VIR_FREE(forwardIfNodes); - VIR_FREE(forwardAddrNodes); - VIR_FREE(forwardNatNodes); - return ret; + return 0; } @@ -1741,18 +1689,23 @@ virNetworkDefPtr virNetworkDefParseXML(xmlXPathContextPtr ctxt, virNetworkXMLOptionPtr xmlopt) { - virNetworkDefPtr def; - char *tmp = NULL; - char *stp = NULL; - xmlNodePtr *ipNodes = NULL; - xmlNodePtr *routeNodes = NULL; - xmlNodePtr *portGroupNodes = NULL; + g_autoptr(virNetworkDef) def = NULL; + g_autofree char *uuid = NULL; + g_autofree char *localOnly = NULL; + g_autofree char *stp = NULL; + g_autofree char *stpDelay = NULL; + g_autofree char *macTableManager = NULL; + g_autofree char *macAddr = NULL; + g_autofree char *mtuSize = NULL; + g_autofree xmlNodePtr *ipNodes = NULL; + g_autofree xmlNodePtr *routeNodes = NULL; + g_autofree xmlNodePtr *portGroupNodes = NULL; int nips, nPortGroups, nRoutes; xmlNodePtr dnsNode = NULL; xmlNodePtr virtPortNode = NULL; xmlNodePtr forwardNode = NULL; - char *ipv6nogwStr = NULL; - char *trustGuestRxFilters = NULL; + g_autofree char *ipv6nogwStr = NULL; + g_autofree char *trustGuestRxFilters = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr bandwidthNode = NULL; xmlNodePtr vlanNode; @@ -1765,27 +1718,26 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, def->name = virXPathString("string(./name[1])", ctxt); if (!def->name) { virReportError(VIR_ERR_NO_NAME, NULL); - goto error; + return NULL; } if (virXMLCheckIllegalChars("name", def->name, "/") < 0) - goto error; + return NULL; /* Extract network uuid */ - tmp = virXPathString("string(./uuid[1])", ctxt); - if (!tmp) { + uuid = virXPathString("string(./uuid[1])", ctxt); + if (!uuid) { if (virUUIDGenerate(def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate UUID")); - goto error; + return NULL; } } else { - if (virUUIDParse(tmp, def->uuid) < 0) { + if (virUUIDParse(uuid, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed uuid element")); - goto error; + return NULL; } - VIR_FREE(tmp); def->uuid_specified = true; } @@ -1798,9 +1750,8 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_XML_ERROR, _("Invalid ipv6 setting '%s' in network '%s'"), ipv6nogwStr, def->name); - goto error; + return NULL; } - VIR_FREE(ipv6nogwStr); } trustGuestRxFilters @@ -1812,36 +1763,34 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, _("Invalid trustGuestRxFilters setting '%s' " "in network '%s'"), trustGuestRxFilters, def->name); - goto error; + return NULL; } - VIR_FREE(trustGuestRxFilters); } /* Parse network domain information */ def->domain = virXPathString("string(./domain[1]/@name)", ctxt); - tmp = virXPathString("string(./domain[1]/@localOnly)", ctxt); - if (tmp) { - def->domainLocalOnly = virTristateBoolTypeFromString(tmp); + localOnly = virXPathString("string(./domain[1]/@localOnly)", ctxt); + if (localOnly) { + def->domainLocalOnly = virTristateBoolTypeFromString(localOnly); if (def->domainLocalOnly <= 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid domain localOnly setting '%s' " "in network '%s'"), - tmp, def->name); - goto error; + localOnly, def->name); + return NULL; } - VIR_FREE(tmp); } if ((bandwidthNode = virXPathNode("./bandwidth", ctxt)) && virNetDevBandwidthParse(&def->bandwidth, NULL, bandwidthNode, false) < 0) - goto error; + return NULL; vlanNode = virXPathNode("./vlan", ctxt); if (vlanNode && virNetDevVlanParse(vlanNode, ctxt, &def->vlan) < 0) - goto error; + return NULL; if (virNetworkPortOptionsParseXML(ctxt, &def->isolatedPort) < 0) - goto error; + return NULL; /* Parse bridge information */ def->bridge = virXPathString("string(./bridge[1]/@name)", ctxt); @@ -1849,124 +1798,118 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, stp = virXPathString("string(./bridge[1]/@stp)", ctxt); def->stp = (stp && STREQ(stp, "off")) ? false : true; - tmp = virXPathString("string(./bridge[1]/@delay)", ctxt); - if (tmp) { - if (virStrToLong_ulp(tmp, NULL, 10, &def->delay) < 0) { + stpDelay = virXPathString("string(./bridge[1]/@delay)", ctxt); + if (stpDelay) { + if (virStrToLong_ulp(stpDelay, NULL, 10, &def->delay) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid delay value in network '%s'"), def->name); - goto error; + return NULL; } } - VIR_FREE(tmp); - tmp = virXPathString("string(./bridge[1]/@macTableManager)", ctxt); - if (tmp) { + macTableManager = virXPathString("string(./bridge[1]/@macTableManager)", ctxt); + if (macTableManager) { if ((def->macTableManager - = virNetworkBridgeMACTableManagerTypeFromString(tmp)) <= 0) { + = virNetworkBridgeMACTableManagerTypeFromString(macTableManager)) <= 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid macTableManager setting '%s' " - "in network '%s'"), tmp, def->name); - goto error; + "in network '%s'"), macTableManager, def->name); + return NULL; } - VIR_FREE(tmp); } - tmp = virXPathString("string(./mac[1]/@address)", ctxt); - if (tmp) { - if (virMacAddrParse(tmp, &def->mac) < 0) { + macAddr = virXPathString("string(./mac[1]/@address)", ctxt); + if (macAddr) { + if (virMacAddrParse(macAddr, &def->mac) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid bridge mac address '%s' in network '%s'"), - tmp, def->name); - goto error; + macAddr, def->name); + return NULL; } if (virMacAddrIsMulticast(&def->mac)) { virReportError(VIR_ERR_XML_ERROR, _("Invalid multicast bridge mac address '%s' in network '%s'"), - tmp, def->name); - goto error; + macAddr, def->name); + return NULL; } - VIR_FREE(tmp); def->mac_specified = true; } - tmp = virXPathString("string(./mtu/@size)", ctxt); - if (tmp) { - if (virStrToLong_ui(tmp, NULL, 10, &def->mtu) < 0) { + mtuSize = virXPathString("string(./mtu/@size)", ctxt); + if (mtuSize) { + if (virStrToLong_ui(mtuSize, NULL, 10, &def->mtu) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid mtu size '%s' in network '%s'"), - tmp, def->name); - goto error; + mtuSize, def->name); + return NULL; } } - VIR_FREE(tmp); dnsNode = virXPathNode("./dns", ctxt); if (dnsNode != NULL && virNetworkDNSDefParseXML(def->name, dnsNode, ctxt, &def->dns) < 0) { - goto error; + return NULL; } virtPortNode = virXPathNode("./virtualport", ctxt); if (virtPortNode && (!(def->virtPortProfile = virNetDevVPortProfileParse(virtPortNode, VIR_VPORT_XML_REQUIRE_TYPE)))) { - goto error; + return NULL; } nPortGroups = virXPathNodeSet("./portgroup", ctxt, &portGroupNodes); if (nPortGroups < 0) - goto error; + return NULL; if (nPortGroups > 0) { size_t i; /* allocate array to hold all the portgroups */ if (VIR_ALLOC_N(def->portGroups, nPortGroups) < 0) - goto error; + return NULL; /* parse each portgroup */ for (i = 0; i < nPortGroups; i++) { if (virNetworkPortGroupParseXML(&def->portGroups[i], portGroupNodes[i], ctxt) < 0) - goto error; + return NULL; def->nPortGroups++; } } - VIR_FREE(portGroupNodes); nips = virXPathNodeSet("./ip", ctxt, &ipNodes); if (nips < 0) - goto error; + return NULL; if (nips > 0) { size_t i; /* allocate array to hold all the addrs */ if (VIR_ALLOC_N(def->ips, nips) < 0) - goto error; + return NULL; /* parse each addr */ for (i = 0; i < nips; i++) { if (virNetworkIPDefParseXML(def->name, ipNodes[i], ctxt, &def->ips[i]) < 0) - goto error; + return NULL; def->nips++; } } - VIR_FREE(ipNodes); nRoutes = virXPathNodeSet("./route", ctxt, &routeNodes); if (nRoutes < 0) - goto error; + return NULL; if (nRoutes > 0) { size_t i; /* allocate array to hold all the route definitions */ if (VIR_ALLOC_N(def->routes, nRoutes) < 0) - goto error; + return NULL; /* parse each definition */ for (i = 0; i < nRoutes; i++) { virNetDevIPRoutePtr route = NULL; @@ -1974,7 +1917,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, if (!(route = virNetDevIPRouteParseXML(def->name, routeNodes[i], ctxt))) - goto error; + return NULL; def->routes[i] = route; def->nroutes++; } @@ -2011,21 +1954,19 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, } } if (!addrMatch) { - char *gw = virSocketAddrFormat(gateway); + g_autofree char *gw = virSocketAddrFormat(gateway); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unreachable static route gateway '%s' specified for network '%s'"), gw, def->name); - VIR_FREE(gw); - goto error; + return NULL; } } } - VIR_FREE(routeNodes); forwardNode = virXPathNode("./forward", ctxt); if (forwardNode && virNetworkForwardDefParseXML(def->name, forwardNode, ctxt, &def->forward) < 0) { - goto error; + return NULL; } /* Validate some items in the main NetworkDef that need to align @@ -2047,14 +1988,14 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, "but no IP address provided for network '%s'"), virNetworkForwardTypeToString(def->forward.type), def->name); - goto error; + return NULL; } if (def->forward.nifs > 1) { virReportError(VIR_ERR_XML_ERROR, _("multiple forwarding interfaces specified " "for network '%s', only one is supported"), def->name); - goto error; + return NULL; } if (def->forward.type == VIR_NETWORK_FORWARD_OPEN && def->forward.nifs) { @@ -2067,7 +2008,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, "network '%s' with forward mode='%s'"), def->name, virNetworkForwardTypeToString(def->forward.type)); - goto error; + return NULL; } break; @@ -2080,14 +2021,14 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, _("bridge name not allowed in %s mode (network '%s')"), virNetworkForwardTypeToString(def->forward.type), def->name); - goto error; + return NULL; } if (def->bridgeZone) { virReportError(VIR_ERR_XML_ERROR, _("bridge zone not allowed in %s mode (network '%s')"), virNetworkForwardTypeToString(def->forward.type), def->name); - goto error; + return NULL; } if (def->macTableManager) { virReportError(VIR_ERR_XML_ERROR, @@ -2095,7 +2036,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, "in %s mode (network '%s')"), virNetworkForwardTypeToString(def->forward.type), def->name); - goto error; + return NULL; } G_GNUC_FALLTHROUGH; @@ -2107,7 +2048,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, "(network '%s')"), virNetworkForwardTypeToString(def->forward.type), def->name); - goto error; + return NULL; } if (def->bridge && (def->forward.nifs || def->forward.npfs)) { virReportError(VIR_ERR_XML_ERROR, @@ -2116,18 +2057,16 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, "both (network '%s')"), virNetworkForwardTypeToString(def->forward.type), def->name); - goto error; + return NULL; } break; case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, def->forward.type); - goto error; + return NULL; } - VIR_FREE(stp); - if (def->mtu) { switch ((virNetworkForwardType) def->forward.type) { case VIR_NETWORK_FORWARD_NONE: @@ -2146,12 +2085,12 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, "and isolated mode, not in %s (network '%s')"), virNetworkForwardTypeToString(def->forward.type), def->name); - goto error; + return NULL; case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, def->forward.type); - goto error; + return NULL; } } @@ -2165,23 +2104,12 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, def->ns = xmlopt->ns; if (def->ns.parse) { if (virXMLNamespaceRegister(ctxt, &def->ns) < 0) - goto error; + return NULL; if ((def->ns.parse)(ctxt, &def->namespaceData) < 0) - goto error; + return NULL; } - return def; - - error: - VIR_FREE(tmp); - VIR_FREE(routeNodes); - VIR_FREE(stp); - virNetworkDefFree(def); - VIR_FREE(ipNodes); - VIR_FREE(portGroupNodes); - VIR_FREE(ipv6nogwStr); - VIR_FREE(trustGuestRxFilters); - return NULL; + return g_steal_pointer(&def); } @@ -2190,14 +2118,12 @@ virNetworkDefParse(const char *xmlStr, const char *filename, virNetworkXMLOptionPtr xmlopt) { - xmlDocPtr xml; + g_autoptr(xmlDoc) xml = NULL; virNetworkDefPtr def = NULL; int keepBlanksDefault = xmlKeepBlanksDefault(0); - if ((xml = virXMLParse(filename, xmlStr, _("(network_definition)")))) { + if ((xml = virXMLParse(filename, xmlStr, _("(network_definition)")))) def = virNetworkDefParseNode(xml, xmlDocGetRootElement(xml), xmlopt); - xmlFreeDoc(xml); - } xmlKeepBlanksDefault(keepBlanksDefault); return def; @@ -2292,13 +2218,12 @@ virNetworkDNSDefFormat(virBufferPtr buf, def->forwarders[i].domain); } if (VIR_SOCKET_ADDR_VALID(&def->forwarders[i].addr)) { - char *addr = virSocketAddrFormat(&def->forwarders[i].addr); + g_autofree char *addr = virSocketAddrFormat(&def->forwarders[i].addr); - if (!addr) - return -1; + if (!addr) + return -1; - virBufferAsprintf(buf, " addr='%s'", addr); - VIR_FREE(addr); + virBufferAsprintf(buf, " addr='%s'", addr); } virBufferAddLit(buf, "/>\n"); } @@ -2331,7 +2256,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, if (def->nhosts) { for (i = 0; i < def->nhosts; i++) { - char *ip = virSocketAddrFormat(&def->hosts[i].ip); + g_autofree char *ip = virSocketAddrFormat(&def->hosts[i].ip); virBufferAsprintf(buf, "<host ip='%s'>\n", ip); virBufferAdjustIndent(buf, 2); @@ -2341,7 +2266,6 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</host>\n"); - VIR_FREE(ip); } } virBufferAdjustIndent(buf, -2); @@ -2359,18 +2283,16 @@ virNetworkIPDefFormat(virBufferPtr buf, if (def->family) virBufferAsprintf(buf, " family='%s'", def->family); if (VIR_SOCKET_ADDR_VALID(&def->address)) { - char *addr = virSocketAddrFormat(&def->address); + g_autofree char *addr = virSocketAddrFormat(&def->address); if (!addr) return -1; virBufferAsprintf(buf, " address='%s'", addr); - VIR_FREE(addr); } if (VIR_SOCKET_ADDR_VALID(&def->netmask)) { - char *addr = virSocketAddrFormat(&def->netmask); + g_autofree char *addr = virSocketAddrFormat(&def->netmask); if (!addr) return -1; virBufferAsprintf(buf, " netmask='%s'", addr); - VIR_FREE(addr); } if (def->prefix > 0) virBufferAsprintf(buf, " prefix='%u'", def->prefix); @@ -2395,15 +2317,15 @@ virNetworkIPDefFormat(virBufferPtr buf, for (i = 0; i < def->nranges; i++) { virSocketAddrRange addr = def->ranges[i].addr; virNetworkDHCPLeaseTimeDefPtr lease = def->ranges[i].lease; + g_autofree char *saddr = NULL; + g_autofree char *eaddr = NULL; - char *saddr = virSocketAddrFormat(&addr.start); - if (!saddr) + if (!(saddr = virSocketAddrFormat(&addr.start))) return -1; - char *eaddr = virSocketAddrFormat(&addr.end); - if (!eaddr) { - VIR_FREE(saddr); + + if (!(eaddr = virSocketAddrFormat(&addr.end))) return -1; - } + virBufferAsprintf(buf, "<range start='%s' end='%s'", saddr, eaddr); if (lease) { @@ -2421,8 +2343,6 @@ virNetworkIPDefFormat(virBufferPtr buf, } else { virBufferAddLit(buf, "/>\n"); } - VIR_FREE(saddr); - VIR_FREE(eaddr); } for (i = 0; i < def->nhosts; i++) { virNetworkDHCPLeaseTimeDefPtr lease = def->hosts[i].lease; @@ -2434,11 +2354,11 @@ virNetworkIPDefFormat(virBufferPtr buf, if (def->hosts[i].name) virBufferAsprintf(buf, " name='%s'", def->hosts[i].name); if (VIR_SOCKET_ADDR_VALID(&def->hosts[i].ip)) { - char *ipaddr = virSocketAddrFormat(&def->hosts[i].ip); + g_autofree char *ipaddr = virSocketAddrFormat(&def->hosts[i].ip); if (!ipaddr) return -1; + virBufferAsprintf(buf, " ip='%s'", ipaddr); - VIR_FREE(ipaddr); } if (lease) { virBufferAddLit(buf, ">\n"); @@ -2460,11 +2380,11 @@ virNetworkIPDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "<bootp file='%s'", def->bootfile); if (VIR_SOCKET_ADDR_VALID(&def->bootserver)) { - char *ipaddr = virSocketAddrFormat(&def->bootserver); + g_autofree char *ipaddr = virSocketAddrFormat(&def->bootserver); if (!ipaddr) return -1; + virBufferEscapeString(buf, " server='%s'", ipaddr); - VIR_FREE(ipaddr); } virBufferAddLit(buf, "/>\n"); @@ -2515,20 +2435,19 @@ static int virNetworkForwardNatDefFormat(virBufferPtr buf, const virNetworkForwardDef *fwd) { - char *addrStart = NULL; - char *addrEnd = NULL; - int ret = -1; + g_autofree char *addrStart = NULL; + g_autofree char *addrEnd = NULL; if (VIR_SOCKET_ADDR_VALID(&fwd->addr.start)) { addrStart = virSocketAddrFormat(&fwd->addr.start); if (!addrStart) - goto cleanup; + return -1; } if (VIR_SOCKET_ADDR_VALID(&fwd->addr.end)) { addrEnd = virSocketAddrFormat(&fwd->addr.end); if (!addrEnd) - goto cleanup; + return -1; } if (!addrEnd && !addrStart && !fwd->port.start && !fwd->port.end && !fwd->natIPv6) @@ -2561,12 +2480,7 @@ virNetworkForwardNatDefFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</nat>\n"); - ret = 0; - - cleanup: - VIR_FREE(addrStart); - VIR_FREE(addrEnd); - return ret; + return 0; } @@ -2856,27 +2770,22 @@ virNetworkSaveXML(const char *configDir, const char *xml) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *configFile = NULL; - int ret = -1; + g_autofree char *configFile = NULL; if ((configFile = virNetworkConfigFile(configDir, def->name)) == NULL) - goto cleanup; + return -1; if (virFileMakePath(configDir) < 0) { virReportSystemError(errno, _("cannot create config directory '%s'"), configDir); - goto cleanup; + return -1; } virUUIDFormat(def->uuid, uuidstr); - ret = virXMLSaveFile(configFile, - virXMLPickShellSafeComment(def->name, uuidstr), - "net-edit", xml); - - cleanup: - VIR_FREE(configFile); - return ret; + return virXMLSaveFile(configFile, + virXMLPickShellSafeComment(def->name, uuidstr), + "net-edit", xml); } @@ -2885,19 +2794,15 @@ virNetworkSaveConfig(const char *configDir, virNetworkDefPtr def, virNetworkXMLOptionPtr xmlopt) { - int ret = -1; - char *xml; + g_autofree char *xml = NULL; if (!(xml = virNetworkDefFormat(def, xmlopt, VIR_NETWORK_XML_INACTIVE))) - goto cleanup; + return -1; if (virNetworkSaveXML(configDir, def, xml)) - goto cleanup; + return -1; - ret = 0; - cleanup: - VIR_FREE(xml); - return ret; + return 0; } @@ -3113,14 +3018,13 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, } if (i == ipdef->nhosts) { - char *ip = virSocketAddrFormat(&host.ip); + g_autofree char *ip = virSocketAddrFormat(&host.ip); virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate an existing dhcp host entry with " "\"mac='%s'\" \"name='%s'\" \"ip='%s'\" in" " network '%s'"), host.mac ? host.mac : _("unknown"), host.name, ip ? ip : _("unknown"), def->name); - VIR_FREE(ip); goto cleanup; } @@ -3146,7 +3050,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, STREQ_NULLABLE(host.name, ipdef->hosts[i].name)) || (VIR_SOCKET_ADDR_VALID(&host.ip) && virSocketAddrEqual(&host.ip, &ipdef->hosts[i].ip))) { - char *ip = virSocketAddrFormat(&host.ip); + g_autofree char *ip = virSocketAddrFormat(&host.ip); virReportError(VIR_ERR_OPERATION_INVALID, _("there is an existing dhcp host entry in " @@ -3154,7 +3058,6 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, "\"<host mac='%s' name='%s' ip='%s'/>\""), def->name, host.mac ? host.mac : _("unknown"), host.name, ip ? ip : _("unknown")); - VIR_FREE(ip); goto cleanup; } } @@ -3258,8 +3161,8 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, return -1; if (i < ipdef->nranges) { - char *startip = virSocketAddrFormat(&range.addr.start); - char *endip = virSocketAddrFormat(&range.addr.end); + g_autofree char *startip = virSocketAddrFormat(&range.addr.start); + g_autofree char *endip = virSocketAddrFormat(&range.addr.end); virReportError(VIR_ERR_OPERATION_INVALID, _("there is an existing dhcp range entry in " @@ -3268,8 +3171,6 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, def->name, startip ? startip : "unknown", endip ? endip : "unknown"); - VIR_FREE(startip); - VIR_FREE(endip); return -1; } diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index e3a61c62ea..34b9aa9505 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -321,6 +321,7 @@ typedef enum { } virNetworkTaintFlags; void virNetworkDefFree(virNetworkDefPtr def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkDef, virNetworkDefFree); enum { VIR_NETWORK_OBJ_LIST_ADD_LIVE = (1 << 0), diff --git a/src/util/virxml.h b/src/util/virxml.h index 26ab9f9c2d..ed178105f6 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -247,6 +247,7 @@ G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virXPathContextNodeSave, virXPathContextNodeRes G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlDoc, xmlFreeDoc); G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlXPathContext, xmlXPathFreeContext); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(xmlBuffer, xmlBufferFree); typedef int (*virXMLNamespaceParse)(xmlXPathContextPtr ctxt, void **nsdata); typedef void (*virXMLNamespaceFree)(void *nsdata); -- 2.25.4

2 4

Re: Libvirt compile issues
by K. Kahurani 11 Jun '20

11 Jun '20

On Wed, Jun 03, 2020 at 12:24:27PM +0100, Daniel P. BerrangÃ© wrote: > On Tue, Jun 02, 2020 at 03:30:00PM +0300, K. Kahurani wrote: > > ---------- Forwarded message --------- > > From: K. Kahurani <k.kahurani(a)gmail.com> > > Date: Sun, May 31, 2020 at 2:26 PM > > Subject: Hello > > To: <eblake(a)redhat.com> > > > > > > Hello, > > > > Hopefully this finds you well. > > > > This is not a bug report but more or less an inquiry as based on the > > information acquired from Jim Fehlig a while back, it is possible you would > > have some important information regarding this. > > > > It is currently not possible for me to compile libvirt right from the word > > go while configuring with the error [1]. From the look of it and a bit of > > searching on the internet, it does look like the package portablexdr is > > obsolete. > > > > Could it be that this is a known issue? Could it be there already is a > > workaround this? Do you suppose this should go into the mailing list? > > > > [1] > > checking for WIRESHARK_DISSECTOR... no > > checking for xdrmem_create in -lportablexdr... no > > checking for library containing xdrmem_create... no > > configure: error: Cannot find a XDR library > > You're missing a build pre-requisite library for XDR. On Linux distros > this is provided by "tirpc" these days, try libtirpc-devel RPM or > libtirpc-dev Debian package. Thanks a lot! My distribution/distro is openSUSE. Posting this here, for list purposes as someone might find it worthwhile. $zypper in libpciaccess-devel device-mapper-devel rst2html5 libtirpc-devel rpcgen Other packages were probably already installed. $zypper addrepo https://download.opensuse.org/repositories/Publishing/openSUSE_Tumbleweed/P… Had to add the above repo for package rst2html5 Sincerely, David > > > 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 :| >

1 0

[PATCH 0/7] More cleanups of unused and uninitialized variables
by Peter Krempa 11 Jun '20

11 Jun '20

Recent commit showed that compilers are not able to detect unused variables when passed to VIR_FREE, so I fixed all the other instances the patch didn't fix. Peter Krempa (7): libxlDomainMigrationDstPrepareDef: remove use of temporary variable testVirFindSCSIHostByPCI: Remove unused 'path_addr' cputest: Avoid use of temporary variable in DO_TEST macro virTPMEmulatorInit: Don't use temporary variable to free path remoteDispatchDomainMigratePrepare: Don't pass uninitialized variable to VIR_FREE vboxDomainScreenshot: Don't pass uninitialized 'screenData' to VIR_FREE Remove use of variables passed only to 'VIR_FREE' src/libxl/libxl_migration.c | 4 +--- src/locking/sanlock_helper.c | 2 -- src/logging/log_daemon.c | 2 -- src/nwfilter/nwfilter_ebiptables_driver.c | 2 -- src/openvz/openvz_driver.c | 2 -- src/remote/remote_daemon_dispatch.c | 2 +- src/security/security_selinux.c | 2 -- src/test/test_driver.c | 2 -- src/util/virstorageencryption.c | 4 ---- src/util/virsysinfo.c | 2 -- src/util/virtpm.c | 5 +---- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_conf.c | 4 ---- src/vmware/vmware_driver.c | 4 ---- tests/cputest.c | 4 +--- tests/networkxml2firewalltest.c | 2 -- tests/scsihosttest.c | 4 ---- tests/xmconfigtest.c | 2 -- tools/virsh-checkpoint.c | 2 -- 19 files changed, 5 insertions(+), 48 deletions(-) -- 2.26.2

2 16

[libvirt PATCH v3 0/4] ci: Use GitLab container registry
by Andrea Bolognani 11 Jun '20

11 Jun '20

Changes from [v2]: * use $CI_COMMIT_REF_SLUG instead of 'master' as tag name, so that it's possible to test changes to the Dockerfiles that affect the subsequent build jobs in a feature branch; * add CentOS Stream; * rename 'preliminary_checks' stage to 'sanity_checks'. Changes from [v1]: * only build containers necessary for extra jobs when said jobs are actually going to run; * rename container build jobs to '$arch-$os-container'; * rename 'other' stage to 'preliminary_checks' and move it before native builds; * simplify build system integration. [v1] https://www.redhat.com/archives/libvir-list/2020-May/msg01183.html [v2] https://www.redhat.com/archives/libvir-list/2020-June/msg00067.html Andrea Bolognani (4): ci: Use variables to build image names ci: Add 'sanity_checks' stage ci: Use GitLab container registry ci: Update build system integration .gitlab-ci.yml | 333 ++++++++++++++++-- ci/Makefile | 10 +- ci/containers/README.rst | 14 + ci/containers/ci-centos-7.Dockerfile | 137 +++++++ ci/containers/ci-centos-8.Dockerfile | 108 ++++++ ci/containers/ci-centos-stream.Dockerfile | 109 ++++++ .../ci-debian-10-cross-aarch64.Dockerfile | 122 +++++++ .../ci-debian-10-cross-armv6l.Dockerfile | 120 +++++++ .../ci-debian-10-cross-armv7l.Dockerfile | 121 +++++++ .../ci-debian-10-cross-i686.Dockerfile | 121 +++++++ .../ci-debian-10-cross-mips.Dockerfile | 121 +++++++ .../ci-debian-10-cross-mips64el.Dockerfile | 121 +++++++ .../ci-debian-10-cross-mipsel.Dockerfile | 121 +++++++ .../ci-debian-10-cross-ppc64le.Dockerfile | 121 +++++++ .../ci-debian-10-cross-s390x.Dockerfile | 121 +++++++ ci/containers/ci-debian-10.Dockerfile | 112 ++++++ .../ci-debian-9-cross-aarch64.Dockerfile | 126 +++++++ .../ci-debian-9-cross-armv6l.Dockerfile | 124 +++++++ .../ci-debian-9-cross-armv7l.Dockerfile | 125 +++++++ .../ci-debian-9-cross-mips.Dockerfile | 125 +++++++ .../ci-debian-9-cross-mips64el.Dockerfile | 125 +++++++ .../ci-debian-9-cross-mipsel.Dockerfile | 125 +++++++ .../ci-debian-9-cross-ppc64le.Dockerfile | 125 +++++++ .../ci-debian-9-cross-s390x.Dockerfile | 125 +++++++ ci/containers/ci-debian-9.Dockerfile | 116 ++++++ .../ci-debian-sid-cross-aarch64.Dockerfile | 122 +++++++ .../ci-debian-sid-cross-armv6l.Dockerfile | 120 +++++++ .../ci-debian-sid-cross-armv7l.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-i686.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-mips.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-mips64el.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-mipsel.Dockerfile | 120 +++++++ .../ci-debian-sid-cross-ppc64le.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-s390x.Dockerfile | 121 +++++++ ci/containers/ci-debian-sid.Dockerfile | 112 ++++++ ci/containers/ci-fedora-31.Dockerfile | 109 ++++++ ci/containers/ci-fedora-32.Dockerfile | 109 ++++++ ...ci-fedora-rawhide-cross-mingw32.Dockerfile | 130 +++++++ ...ci-fedora-rawhide-cross-mingw64.Dockerfile | 130 +++++++ ci/containers/ci-fedora-rawhide.Dockerfile | 110 ++++++ ci/containers/ci-opensuse-151.Dockerfile | 109 ++++++ ci/containers/ci-ubuntu-1804.Dockerfile | 117 ++++++ ci/containers/ci-ubuntu-2004.Dockerfile | 113 ++++++ ci/containers/refresh | 43 +++ ci/list-images.sh | 24 +- 45 files changed, 5173 insertions(+), 49 deletions(-) create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/ci-centos-7.Dockerfile create mode 100644 ci/containers/ci-centos-8.Dockerfile create mode 100644 ci/containers/ci-centos-stream.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-aarch64.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-armv6l.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-armv7l.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-i686.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-mips.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-mips64el.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-mipsel.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-ppc64le.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-s390x.Dockerfile create mode 100644 ci/containers/ci-debian-10.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-aarch64.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-armv6l.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-armv7l.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-mips.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-mips64el.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-mipsel.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-ppc64le.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-s390x.Dockerfile create mode 100644 ci/containers/ci-debian-9.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-aarch64.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-armv6l.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-armv7l.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-i686.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-mips.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-mips64el.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-mipsel.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-s390x.Dockerfile create mode 100644 ci/containers/ci-debian-sid.Dockerfile create mode 100644 ci/containers/ci-fedora-31.Dockerfile create mode 100644 ci/containers/ci-fedora-32.Dockerfile create mode 100644 ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile create mode 100644 ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile create mode 100644 ci/containers/ci-fedora-rawhide.Dockerfile create mode 100644 ci/containers/ci-opensuse-151.Dockerfile create mode 100644 ci/containers/ci-ubuntu-1804.Dockerfile create mode 100644 ci/containers/ci-ubuntu-2004.Dockerfile create mode 100755 ci/containers/refresh -- 2.25.4

2 8

[libvirt PATCH v2] docs: Document CIRRUS_GITHUB_REPO variable
by Andrea Bolognani 11 Jun '20

11 Jun '20

This needs to be set for every repository for Cirrus CI integration to work. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/newreposetup.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/newreposetup.rst b/docs/newreposetup.rst index f81e26747b..ac2e6a15f1 100644 --- a/docs/newreposetup.rst +++ b/docs/newreposetup.rst @@ -83,6 +83,22 @@ required under the **Settings** page: * *Shared runners*: Enable shared runners + * **Variables** + + * *Key*: ``CIRRUS_GITHUB_REPO`` + + * *Value*: ``libvirt/$repo`` + + * *Protect variable*: enabled + + * *Mask variable*: disabled + + * *Key*: ``CIRRUS_API_TOKEN`` + + * No need to set this at the project level: it's already set for the + libvirt organization and will be inherited from there. + + GitHub configuration ==================== -- 2.25.4

2 1

[PATCH] conf: remove unused variable
by Yi Li 11 Jun '20

11 Jun '20

Signed-off-by: Yi Li <yili(a)winhong.com> --- src/conf/snapshot_conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 857d04c476..f73eeb06c7 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -231,7 +231,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, xmlNodePtr inactiveDomNode = NULL; size_t i; int n; - char *creation = NULL, *state = NULL; + char *state = NULL; int active; char *tmp; char *memorySnapshot = NULL; @@ -404,7 +404,6 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, ret = g_steal_pointer(&def); cleanup: - VIR_FREE(creation); VIR_FREE(state); VIR_FREE(nodes); VIR_FREE(memorySnapshot); -- 2.25.3

2 1

[libvirt PATCH] ci: Reduce number of stages
by Andrea Bolognani 10 Jun '20

10 Jun '20

Right now we're dividing the jobs into three stages: prebuild, which includes DCO checking as well as building artifacts such as the website, and native_build/cross_build, which do exactly what you'd expect based on their names. This organization is nice from the logical point of view, but results in poor utilization of the available CI resources: in particular, the fact that cross_build jobs can only start after all native_build jobs have finished means that if even a single one of the latter takes a bit longer the pipeline will stall, and with native builds taking anywhere from less than 10 minutes to more than 20, this happens all the time. Building artifacts in a separate pipeline stage also doesn't have any advantages, and only delays further stages by a couple of minutes. The only job that really makes sense in its own stage is the DCO check, because it's extremely fast (less than 1 minute) and, if that fails, we can avoid kicking off all other jobs. Reducing the number of stages results in significant speedups: specifically, going from three stages to two stages reduces the overall completion time for a full CI pipeline from ~45 minutes[1] to ~30 minutes[2]. [1] https://gitlab.com/abologna/libvirt/-/pipelines/154751893 [2] https://gitlab.com/abologna/libvirt/-/pipelines/154771173 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab-ci.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a8142b506..8d9313e415 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,9 +2,8 @@ variables: GIT_DEPTH: 100 stages: - - prebuild - - native_build - - cross_build + - sanity_checks + - builds .script_variables: &script_variables | export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)" @@ -17,7 +16,7 @@ stages: # Default native build jobs that are always run .native_build_default_job_template: &native_build_default_job_definition - stage: native_build + stage: builds cache: paths: - ccache/ @@ -42,7 +41,7 @@ stages: # system other than Linux. These jobs will only run if the required # setup has been performed on the GitLab account (see ci/README.rst). .cirrus_build_default_job_template: &cirrus_build_default_job_definition - stage: native_build + stage: builds image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master script: - cirrus-run ci/cirrus/$NAME.yml.j2 @@ -64,7 +63,7 @@ stages: # Default cross build jobs that are always run .cross_build_default_job_template: &cross_build_default_job_definition - stage: cross_build + stage: builds cache: paths: - ccache/ @@ -194,7 +193,7 @@ mingw64-fedora-rawhide: # be deployed to the web root: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=web… website: - stage: prebuild + stage: builds before_script: - *script_variables script: @@ -216,7 +215,7 @@ website: codestyle: - stage: prebuild + stage: builds before_script: - *script_variables script: @@ -231,7 +230,7 @@ codestyle: # for translation usage: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=pot… potfile: - stage: prebuild + stage: builds only: - master before_script: @@ -259,7 +258,7 @@ potfile: # this test on developer's personal forks from which # merge requests are submitted check-dco: - stage: prebuild + stage: sanity_checks image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master script: - /check-dco -- 2.25.4

4 8

[libvirt PATCH] docs: Document CIRRUS_GITHUB_REPO variable
by Andrea Bolognani 10 Jun '20

10 Jun '20

This needs to be set for every repository for Cirrus CI integration to work. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/newreposetup.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/newreposetup.rst b/docs/newreposetup.rst index f81e26747b..dd86535c9a 100644 --- a/docs/newreposetup.rst +++ b/docs/newreposetup.rst @@ -83,6 +83,17 @@ required under the **Settings** page: * *Shared runners*: Enable shared runners + * **Variables** + + * *Key*: ``CIRRUS_GITHUB_REPO`` + + * *Value*: ``libvirt/$repo`` + + * *Protect variable*: enabled + + * *Mask variable*: disabled + + GitHub configuration ==================== -- 2.25.4

2 1

Multiple video elements lead to erratic mouse behavior through spice
by Christian Ehrhardt 10 Jun '20

10 Jun '20

Hi, with a guest set up as in the following example mouse behavior breaks: <graphics type='spice' port='5901' autoport='no' listen='0.0.0.0'> <listen type='address' address='0.0.0.0'/> <gl enable='no'/> </graphics> <video> <model type='qxl' ram='65536' vram='16384' vgamem='16384' heads='1' primary='yes'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </video> <video> <model type='qxl' ram='65536' vram='16384' vgamem='16384' heads='1'/> <address type='pci' domain='0x0000' bus='0x08' slot='0x01' function='0x0'/> </video> Please note that this is for illustration purposes as this everyone can easily retry. I originally had QXL + GPU as mediated device, where the behavior is the same. If I know connect to that via spice, spice is smart and opens both displays: $ virt-viewer --connect qemu+ssh://ubuntu@10.246.115.255/system guestname But while with one display mouse integration (to move in/out smoothly) and positioning of the mouse pointer is fine. It is broken with this double display setup. What I see is: - no mouse integration anymore (falls back to capture the mouse) - often the mouse can not move upwards anymore - sometimes "left" also doesn't work Let me know if someone wants a video in case the description is still too odd. I have tried spice-client-gtk and virt-viewer, but both behave the same way. If I take away one of the displays it works well again. So I'm wondering how virtual-multi-monitor is supposed to work, are there known bugs or tweaks that would apply here? In my original case I wanted to take away the QXL device, to jst keep the Mdev as one screen (and the one I really want). But due to [1] the video section is re-added automatically. Maybe this comes down to not re-adding that default video entry if a hostdev has display=on set? I'd appreciate any pointers if this rings a bell or a discussion on not-auto-adding-video if display=on is present. Kind Regards, Christian P.S. I tried VNC but that just has "other" issues. It only shows 1 of 2 displays and on the one I see over amplifies the mouse movement by the amount the other display adds to ther overall desktop size. P.P.S. Sorry for cross posting, at least I avoided cross posting even further (spice-devel / qemu-devel) hoping that libvirt & virt-tools would be involved enough that if someone recognizes this he can point me to the right place. [1]: https://bugzilla.redhat.com/show_bug.cgi?id=707439

4 3

[libvirt PATCH v2 0/2] ci: Enable Cirrus CI integration
by Andrea Bolognani 10 Jun '20

10 Jun '20

Changes from [v1]: * skip Cirrus CI jobs if the necessary variables are not set. [v1] https://www.redhat.com/archives/libvir-list/2020-June/msg00249.html Andrea Bolognani (2): ci: Enable Cirrus CI integration ci: Remove Travis CI .gitlab-ci.yml | 38 +++++++++++++++++++ .travis.yml | 58 ----------------------------- ci/README.rst | 59 ++++++++++++++++++++++++++++++ ci/cirrus/freebsd-11.yml.j2 | 73 +++++++++++++++++++++++++++++++++++++ ci/cirrus/freebsd-12.yml.j2 | 73 +++++++++++++++++++++++++++++++++++++ ci/cirrus/macos-1015.yml.j2 | 38 +++++++++++++++++++ 6 files changed, 281 insertions(+), 58 deletions(-) delete mode 100644 .travis.yml create mode 100644 ci/README.rst create mode 100644 ci/cirrus/freebsd-11.yml.j2 create mode 100644 ci/cirrus/freebsd-12.yml.j2 create mode 100644 ci/cirrus/macos-1015.yml.j2 -- 2.25.4

3 7

[libvirt PATCH v2 0/4] ci: Use GitLab container registry
by Andrea Bolognani 10 Jun '20

10 Jun '20

Changes from [v1]: * only build containers necessary for extra jobs when said jobs are actually going to run; * rename container build jobs to '$arch-$os-container'; * rename 'other' stage to 'preliminary_checks' and move it before native builds; * simplify build system integration. [v1] https://www.redhat.com/archives/libvir-list/2020-May/msg01183.html Andrea Bolognani (4): ci: Use variables to build image names ci: Add 'preliminary_checks' stage ci: Use GitLab container registry ci: Update build system integration .gitlab-ci.yml | 325 ++++++++++++++++-- ci/Makefile | 6 +- ci/containers/README.rst | 14 + ci/containers/ci-centos-7.Dockerfile | 137 ++++++++ ci/containers/ci-centos-8.Dockerfile | 108 ++++++ .../ci-debian-10-cross-aarch64.Dockerfile | 122 +++++++ .../ci-debian-10-cross-armv6l.Dockerfile | 120 +++++++ .../ci-debian-10-cross-armv7l.Dockerfile | 121 +++++++ .../ci-debian-10-cross-i686.Dockerfile | 121 +++++++ .../ci-debian-10-cross-mips.Dockerfile | 121 +++++++ .../ci-debian-10-cross-mips64el.Dockerfile | 121 +++++++ .../ci-debian-10-cross-mipsel.Dockerfile | 121 +++++++ .../ci-debian-10-cross-ppc64le.Dockerfile | 121 +++++++ .../ci-debian-10-cross-s390x.Dockerfile | 121 +++++++ ci/containers/ci-debian-10.Dockerfile | 112 ++++++ .../ci-debian-9-cross-aarch64.Dockerfile | 126 +++++++ .../ci-debian-9-cross-armv6l.Dockerfile | 124 +++++++ .../ci-debian-9-cross-armv7l.Dockerfile | 125 +++++++ .../ci-debian-9-cross-mips.Dockerfile | 125 +++++++ .../ci-debian-9-cross-mips64el.Dockerfile | 125 +++++++ .../ci-debian-9-cross-mipsel.Dockerfile | 125 +++++++ .../ci-debian-9-cross-ppc64le.Dockerfile | 125 +++++++ .../ci-debian-9-cross-s390x.Dockerfile | 125 +++++++ ci/containers/ci-debian-9.Dockerfile | 116 +++++++ .../ci-debian-sid-cross-aarch64.Dockerfile | 122 +++++++ .../ci-debian-sid-cross-armv6l.Dockerfile | 120 +++++++ .../ci-debian-sid-cross-armv7l.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-i686.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-mips.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-mips64el.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-mipsel.Dockerfile | 120 +++++++ .../ci-debian-sid-cross-ppc64le.Dockerfile | 121 +++++++ .../ci-debian-sid-cross-s390x.Dockerfile | 121 +++++++ ci/containers/ci-debian-sid.Dockerfile | 112 ++++++ ci/containers/ci-fedora-31.Dockerfile | 109 ++++++ ci/containers/ci-fedora-32.Dockerfile | 109 ++++++ ...ci-fedora-rawhide-cross-mingw32.Dockerfile | 129 +++++++ ...ci-fedora-rawhide-cross-mingw64.Dockerfile | 129 +++++++ ci/containers/ci-fedora-rawhide.Dockerfile | 110 ++++++ ci/containers/ci-opensuse-151.Dockerfile | 109 ++++++ ci/containers/ci-ubuntu-1804.Dockerfile | 117 +++++++ ci/containers/ci-ubuntu-2004.Dockerfile | 113 ++++++ ci/containers/refresh | 43 +++ ci/list-images.sh | 24 +- 44 files changed, 5051 insertions(+), 48 deletions(-) create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/ci-centos-7.Dockerfile create mode 100644 ci/containers/ci-centos-8.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-aarch64.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-armv6l.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-armv7l.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-i686.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-mips.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-mips64el.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-mipsel.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-ppc64le.Dockerfile create mode 100644 ci/containers/ci-debian-10-cross-s390x.Dockerfile create mode 100644 ci/containers/ci-debian-10.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-aarch64.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-armv6l.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-armv7l.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-mips.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-mips64el.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-mipsel.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-ppc64le.Dockerfile create mode 100644 ci/containers/ci-debian-9-cross-s390x.Dockerfile create mode 100644 ci/containers/ci-debian-9.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-aarch64.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-armv6l.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-armv7l.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-i686.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-mips.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-mips64el.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-mipsel.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile create mode 100644 ci/containers/ci-debian-sid-cross-s390x.Dockerfile create mode 100644 ci/containers/ci-debian-sid.Dockerfile create mode 100644 ci/containers/ci-fedora-31.Dockerfile create mode 100644 ci/containers/ci-fedora-32.Dockerfile create mode 100644 ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile create mode 100644 ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile create mode 100644 ci/containers/ci-fedora-rawhide.Dockerfile create mode 100644 ci/containers/ci-opensuse-151.Dockerfile create mode 100644 ci/containers/ci-ubuntu-1804.Dockerfile create mode 100644 ci/containers/ci-ubuntu-2004.Dockerfile create mode 100755 ci/containers/refresh -- 2.25.4

2 6

[PATCH v2 0/7] virsysinfo: Parse OEM strings
by Michal Privoznik 10 Jun '20

10 Jun '20

v2 of: https://www.redhat.com/archives/libvir-list/2020-June/msg00038.html diff to v1: - cleaned up sysinfotest so that it can use virCommandSetDryRun() - Handle multiline strings (per Dan's suggestion in review of v1) Michal Prívozník (7): virSysinfoReadDMI: Use more g_auto*() virSysinfoReadDMI: Drop needless virFindFileInPath() testSysinfo: Use more g_auto*() sysinfotest: Dissolve sysinfotest_run() in testSysinfo() sysinfotest: Move from custom dmidecode scripts to virCommandSetDryRun() virsysinfo: Drop global @sysinfoDmidecode virsysinfo: Parse OEM strings src/util/virsysinfo.c | 151 +++++++++++++----- src/util/virsysinfopriv.h | 3 +- .../sysinfodata/aarch64-gigabytedmidecode.sh | 3 - tests/sysinfodata/x86dmidecode.sh | 3 - tests/sysinfodata/x86sysinfo.data | 6 + tests/sysinfodata/x86sysinfo.expect | 8 + tests/sysinfotest.c | 144 +++++++++-------- 7 files changed, 203 insertions(+), 115 deletions(-) delete mode 100755 tests/sysinfodata/aarch64-gigabytedmidecode.sh delete mode 100755 tests/sysinfodata/x86dmidecode.sh -- 2.26.2

2 8

[PATCH v3 0/6] Expose QEMU's -fw_cfg
by Michal Privoznik 10 Jun '20

10 Jun '20

v3 of: https://www.redhat.com/archives/libvir-list/2020-June/msg00167.html diff to v2: - pushed first two patches from v2 because they are independent. - rebased onto latest mater (there were new capabilities introduced meanwhile) - changed accepted XML per Dan's suggestion - dropped check for filename length, which turned out to be invalid anyways (the limit applies to @name and not @file) - Changed news from news.xml to NEWS.rst Michal Prívozník (6): conf: Add firmware blob configuration qemu: Validate firmware blob configuration qemu: Introduce fw_cfg capability secdrivers: Relabel firmware config files qemu: Generate command line for -fw_cfg news: Document -fw_cfg NEWS.rst | 8 + docs/formatdomain.html.in | 32 +++ docs/schemas/domaincommon.rng | 145 +++++++------ src/conf/domain_conf.c | 193 ++++++++++++++---- src/conf/domain_conf.h | 4 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 54 ++++- src/qemu/qemu_validate.c | 32 +++ src/security/security_dac.c | 50 +++++ src/security/security_selinux.c | 50 +++++ src/security/virt-aa-helper.c | 12 ++ src/util/virsysinfo.c | 52 ++++- src/util/virsysinfo.h | 16 +- .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_2.4.0.x86_64.xml | 1 + .../caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + .../caps_2.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../caps_2.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../caps_2.8.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../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 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + tests/qemuxml2argvdata/smbios-type-fwcfg.args | 38 ++++ tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 63 ++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmloutdata/smbios-type-fwcfg.xml | 1 + tests/qemuxml2xmltest.c | 1 + 64 files changed, 686 insertions(+), 114 deletions(-) create mode 100644 tests/qemuxml2argvdata/smbios-type-fwcfg.args create mode 100644 tests/qemuxml2argvdata/smbios-type-fwcfg.xml create mode 120000 tests/qemuxml2xmloutdata/smbios-type-fwcfg.xml -- 2.26.2

2 8

[PATCH v5] numa: forbid '-numa node, mem' for 5.1 and newer machine types
by Igor Mammedov 10 Jun '20

10 Jun '20

Deprecation period is run out and it's a time to flip the switch introduced by cd5ff8333a. Disable legacy option for new machine types (since 5.1) and amend documentation. '-numa node,memdev' shall be used instead of disabled option with new machine types. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Reviewed-by: Greg Kurz <groug(a)kaod.org> --- v1: - rebased on top of current master - move compat mode from 4.2 to 5.0 v2: - move deprecation text to recently removed section v3: - increase title line length for (deprecated.rst) '``-numa node,mem=``\ *size* (removed in 5.1)' v4: - use error_append_hint() for suggesting valid CLI v5: - add "\n" at the end of error_append_hint() - fix gramar/spelling in moved deprecation text CC: peter.maydell(a)linaro.org CC: ehabkost(a)redhat.com CC: marcel.apfelbaum(a)gmail.com CC: mst(a)redhat.com CC: pbonzini(a)redhat.com CC: rth(a)twiddle.net CC: david(a)gibson.dropbear.id.au CC: libvir-list(a)redhat.com CC: qemu-arm(a)nongnu.org CC: qemu-ppc(a)nongnu.org CC: eblake(a)redhat.com CC: groug(a)kaod.org --- docs/system/deprecated.rst | 37 ++++++++++++++++++++----------------- hw/arm/virt.c | 2 +- hw/core/numa.c | 7 +++++++ hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 2 +- qemu-options.hx | 9 +++++---- 8 files changed, 36 insertions(+), 24 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 544ece0a45..72666ac764 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -101,23 +101,6 @@ error in the future. The ``-realtime mlock=on|off`` argument has been replaced by the ``-overcommit mem-lock=on|off`` argument. -``-numa node,mem=``\ *size* (since 4.1) -''''''''''''''''''''''''''''''''''''''' - -The parameter ``mem`` of ``-numa node`` is used to assign a part of -guest RAM to a NUMA node. But when using it, it's impossible to manage specified -RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), -so guest end-ups with the fake NUMA configuration with suboptiomal performance. -However since 2014 there is an alternative way to assign RAM to a NUMA node -using parameter ``memdev``, which does the same as ``mem`` and adds -means to actualy manage node RAM on the host side. Use parameter ``memdev`` -with *memory-backend-ram* backend as an replacement for parameter ``mem`` -to achieve the same fake NUMA effect or a properly configured -*memory-backend-file* backend to actually benefit from NUMA configuration. -In future new machine versions will not accept the option but it will still -work with old machine types. User can check QAPI schema to see if the legacy -option is supported by looking at MachineInfo::numa-mem-supported property. - ``-numa`` node (without memory specified) (since 4.1) ''''''''''''''''''''''''''''''''''''''''''''''''''''' @@ -516,3 +499,23 @@ long starting at 1MiB, the old command:: can be rewritten as:: qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.file.driver=file,file.file.filename=file.qcow2 + +Command line options +-------------------- + +``-numa node,mem=``\ *size* (removed in 5.1) +'''''''''''''''''''''''''''''''''''''''''''' + +The parameter ``mem`` of ``-numa node`` was used to assign a part of +guest RAM to a NUMA node. But when using it, it's impossible to manage a specified +RAM chunk on the host side (like bind it to a host node, setting bind policy, ...), +so the guest ends up with the fake NUMA configuration with suboptiomal performance. +However since 2014 there is an alternative way to assign RAM to a NUMA node +using parameter ``memdev``, which does the same as ``mem`` and adds +means to actually manage node RAM on the host side. Use parameter ``memdev`` +with *memory-backend-ram* backend as replacement for parameter ``mem`` +to achieve the same fake NUMA effect or a properly configured +*memory-backend-file* backend to actually benefit from NUMA configuration. +New machine versions (since 5.1) will not accept the option but it will still +work with old machine types. User can check the QAPI schema to see if the legacy +option is supported by looking at MachineInfo::numa-mem-supported property. diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 37462a6f78..063d4703f7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2262,7 +2262,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) hc->pre_plug = virt_machine_device_pre_plug_cb; hc->plug = virt_machine_device_plug_cb; hc->unplug_request = virt_machine_device_unplug_request_cb; - mc->numa_mem_supported = true; mc->nvdimm_supported = true; mc->auto_enable_numa_with_memhp = true; mc->default_ram_id = "mach-virt.ram"; @@ -2375,6 +2374,7 @@ DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) static void virt_machine_5_0_options(MachineClass *mc) { virt_machine_5_1_options(mc); + mc->numa_mem_supported = true; } DEFINE_VIRT_MACHINE(5, 0) diff --git a/hw/core/numa.c b/hw/core/numa.c index 316bc50d75..a935640962 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -117,6 +117,13 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, } if (node->has_mem) { + if (!mc->numa_mem_supported) { + error_setg(errp, "Parameter -numa node,mem is not supported by this" + " machine type"); + error_append_hint(errp, "Use -numa node,memdev instead\n"); + return; + } + numa_info[nodenr].node_mem = node->mem; if (!qtest_enabled()) { warn_report("Parameter -numa node,mem is deprecated," diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2128f3d6fe..a86136069c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1960,7 +1960,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) hc->unplug = pc_machine_device_unplug_cb; mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; mc->nvdimm_supported = true; - mc->numa_mem_supported = true; mc->default_ram_id = "pc.ram"; object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int", diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f66e1d73ce..8955436efa 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -438,6 +438,7 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) pc_i440fx_5_1_machine_options(m); m->alias = NULL; m->is_default = false; + m->numa_mem_supported = true; compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len); compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 4ba8ac8774..af6b32adb7 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -366,6 +366,7 @@ static void pc_q35_5_0_machine_options(MachineClass *m) { pc_q35_5_1_machine_options(m); m->alias = NULL; + m->numa_mem_supported = true; compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len); compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len); } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3b1a5ed865..210d61d1b3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4511,7 +4511,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) * in which LMBs are represented and hot-added */ mc->numa_mem_align_shift = 28; - mc->numa_mem_supported = true; mc->auto_enable_numa = true; smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF; @@ -4599,6 +4598,7 @@ static void spapr_machine_5_0_class_options(MachineClass *mc) { spapr_machine_5_1_class_options(mc); compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); + mc->numa_mem_supported = true; } DEFINE_SPAPR_MACHINE(5_0, "5.0", false); diff --git a/qemu-options.hx b/qemu-options.hx index 93bde2bbc8..196f468786 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -239,10 +239,11 @@ SRST -numa node,nodeid=0 -numa node,nodeid=1 \ -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 - '\ ``mem``\ ' assigns a given RAM amount to a node. '\ ``memdev``\ ' - assigns RAM from a given memory backend device to a node. If - '\ ``mem``\ ' and '\ ``memdev``\ ' are omitted in all nodes, RAM is - split equally between them. + Legacy '\ ``mem``\ ' assigns a given RAM amount to a node (not supported + for 5.1 and newer machine types). '\ ``memdev``\ ' assigns RAM from + a given memory backend device to a node. If '\ ``mem``\ ' and + '\ ``memdev``\ ' are omitted in all nodes, RAM is split equally between them. + '\ ``mem``\ ' and '\ ``memdev``\ ' are mutually exclusive. Furthermore, if one node uses '\ ``memdev``\ ', all of them have to -- 2.26.2

2 1

[libvirt PATCH 0/3] network: support NAT with IPv6
by Daniel P. Berrangé 09 Jun '20

09 Jun '20

The virtual network has never supported NAT with IPv6 since this feature didn't exist at the time. NAT has been available since RHEL-7 vintage though, and it is desirable to be able to use it. This series enables it with <forward mode=3D"nat"> <nat ipv6=3D"yes"/> </forward> Note that I do NOT actually change the default.xml to enable use of IPv6 because that will cause failure if the user has force disabled IPv6 on their host kernel. Of course our current default.xml is already broken if someone has done the reverse and force disabled IPv4. We've also long had a problem with guests bringing up the default network with the same subnet as the host. We'll have this same issue with IPv6 too. On my prompting Laine proposed a way to deal with the clash by tearing down a network, if we see a real host NIC get assigned the same subnet. Meanwhile we also have complaints about the fact that libvirt does anything todo with networking in the %post of the RPM. I'm thinking that we can do something entirely different by introducing a concept of "automatic subnet selection" into the virtual network. Consider if we made default.xml be able to contain only: <network> <name>default</name> <forward/> <ip family=3D"ipv4" autoaddr=3D"yes"> <dhcp/> </ip> <ip family=3D"ipv6" autoaddr=3D"yes"/> </network> Conceptually this means - Try to gimme a subnet with IPv4 and DHCP - Try to gimme a subnet with IPv6 and RAs Now when we start the virtual network - If IPv4 is not enabled on host, don't assign addr - Else - Iterate N=3D1..254 to find a free range for IPv4 - Use 192.168.N.0/24 for subnet - Use 192.168.N.1 for host IP - Use 192.168.N.2 -> 192.168.N.254 for guest DHCP - If IPv6 is not enabled on host, don't assign addr - Else - Generate NNNN:NNNN as 4 random bytes - Use fd00:add:f00d:NNNN:NNNN::0/64 for IPv6 subnet - Use fd00:add:f00d:NNNN:NNNN::1 for host IP - Use route advertizement for IPv6 zero-conf With NNNN:NNNN, even with 1000 guests running, we have just a 0.02% chance of clashing with a guest for IPv6. The "live" XML would always reflect the currently assigned addresses Proactively monitor the address allocations of the host. If we see a conflicting address appear, take down the dnsmasq intance, generate a new subnet, bring dnsmasq back online. Ideally we would have to bring the guest network links offline and then online again to force DHCP re-assignment immediately. Daniel P. Berrang=C3=A9 (3): util: add support for IPv6 masquerade rules conf: add an attribute to turn on NAT for IPv6 virtual networks network: wire up support for IPv6 NAT rules docs/formatnetwork.html.in | 14 ++ docs/schemas/network.rng | 8 + src/conf/network_conf.c | 26 +- src/conf/network_conf.h | 2 + src/network/bridge_driver_linux.c | 23 +- src/util/viriptables.c | 33 +-- .../nat-ipv6-masquerade-linux.args | 228 ++++++++++++++++++ .../nat-ipv6-masquerade.xml | 17 ++ tests/networkxml2firewalltest.c | 1 + .../nat-network-forward-nat-ipv6.xml | 10 + .../nat-network-forward-nat-ipv6.xml | 11 + tests/networkxml2xmltest.c | 1 + 12 files changed, 343 insertions(+), 31 deletions(-) create mode 100644 tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.a= rgs create mode 100644 tests/networkxml2firewalldata/nat-ipv6-masquerade.xml create mode 100644 tests/networkxml2xmlin/nat-network-forward-nat-ipv6.xml create mode 100644 tests/networkxml2xmlout/nat-network-forward-nat-ipv6.xml --=20 2.26.2

2 7

[libvirt PATCH 0/9] qemu: Add support for -cpu host, migratable=on|off
by Jiri Denemark 09 Jun '20

09 Jun '20

Jiri Denemark (9): conf: Use g_auto* in virCPUDefParseXML qemu: Probe for .migratable property of a CPU qemu: Probe for migrtability support in CPU expansion qemu: Avoid probing unsupported migratable CPU expansion conf: Introduce migratable attribute for the <cpu> element conf: Advertise migratable attribute for CPU in domcaps qemu: Advertise migratable attribute for CPU in domcaps qemu: Fill default value in //cpu/@migratable attribute qemu: Pass migratable=on|off property for -cpu host docs/formatdomain.html.in | 14 +- docs/formatdomaincaps.html.in | 13 +- docs/schemas/domaincaps.rng | 3 + docs/schemas/domaincommon.rng | 5 + src/conf/cpu_conf.c | 157 +++++++++--------- src/conf/cpu_conf.h | 1 + src/conf/domain_capabilities.c | 13 +- src/conf/domain_capabilities.h | 1 + src/qemu/qemu_capabilities.c | 28 +++- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 15 ++ src/qemu/qemu_domain.c | 14 +- .../domaincapsdata/qemu_1.5.3-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_1.5.3.x86_64.xml | 6 +- .../domaincapsdata/qemu_1.6.0-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_1.6.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_1.7.0-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_1.7.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_2.1.1-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_2.1.1.x86_64.xml | 6 +- .../domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 6 +- .../qemu_2.10.0-virt.aarch64.xml | 6 +- tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 6 +- tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_2.10.0.s390x.xml | 6 +- tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_2.11.0.s390x.xml | 6 +- tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 7 +- .../qemu_2.12.0-virt.aarch64.xml | 6 +- tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 6 +- tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_2.12.0.s390x.xml | 6 +- tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 6 +- .../qemu_2.6.0-virt.aarch64.xml | 6 +- tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 6 +- tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_2.7.0.s390x.xml | 6 +- tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_2.8.0.s390x.xml | 6 +- tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 6 +- tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_2.9.0.s390x.xml | 6 +- tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 6 +- .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 7 +- tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_3.0.0.s390x.xml | 6 +- tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 7 +- tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 7 +- .../qemu_4.0.0-virt.aarch64.xml | 6 +- tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 6 +- tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_4.0.0.s390x.xml | 6 +- tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 7 +- tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 7 +- .../qemu_4.2.0-virt.aarch64.xml | 6 +- tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 6 +- tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 6 +- tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 7 +- .../qemu_5.0.0-virt.aarch64.xml | 6 +- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 6 +- tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 6 +- tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 7 +- .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 7 +- tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 7 +- .../caps_2.10.0.s390x.replies | 22 --- .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.replies | 22 --- .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.s390x.replies | 22 --- .../caps_2.12.0.x86_64.xml | 2 + .../caps_2.8.0.s390x.replies | 22 --- .../caps_2.9.0.s390x.replies | 22 --- .../caps_2.9.0.x86_64.xml | 1 + .../caps_3.0.0.s390x.replies | 22 --- .../caps_3.0.0.x86_64.xml | 2 + .../caps_3.1.0.x86_64.xml | 2 + .../caps_4.0.0.s390x.replies | 48 +----- .../caps_4.0.0.x86_64.xml | 2 + .../caps_4.1.0.x86_64.xml | 2 + .../caps_4.2.0.aarch64.replies | 48 +----- .../caps_4.2.0.s390x.replies | 48 +----- .../caps_4.2.0.x86_64.xml | 2 + .../caps_5.0.0.aarch64.replies | 48 +----- .../caps_5.0.0.x86_64.xml | 2 + .../caps_5.1.0.x86_64.xml | 2 + .../migration-in-params-in.xml | 2 +- .../migration-out-params-in.xml | 2 +- .../cpu-check-default-none.xml | 2 +- .../qemuxml2xmloutdata/cpu-host-kvmclock.xml | 2 +- .../cpu-host-passthrough-features.xml | 2 +- tests/qemuxml2xmloutdata/kvm-features.xml | 2 +- 109 files changed, 578 insertions(+), 481 deletions(-) -- 2.27.0

2 11

[libvirt-dockerfiles PATCH] Drop libosinfo images
by Andrea Bolognani 09 Jun '20

09 Jun '20

As of https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/c185dd44ea6d8bfb9cb77… https://gitlab.com/libosinfo/osinfo-db/-/commit/84be97d141a5989589dfb5c4f14… https://gitlab.com/libosinfo/libosinfo/-/commit/ff1812e0c538f15bc192403782e… all projects under the libosinfo umbrella use the GitLab container registry for their CI, so we no longer need to build these on Quay. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. buildenv-libosinfo-centos-7.zip | Bin 1795 -> 0 bytes buildenv-libosinfo-centos-8.zip | Bin 726 -> 0 bytes buildenv-libosinfo-debian-10.zip | Bin 792 -> 0 bytes buildenv-libosinfo-debian-9.zip | Bin 814 -> 0 bytes buildenv-libosinfo-debian-sid.zip | Bin 792 -> 0 bytes buildenv-libosinfo-fedora-31.zip | Bin 680 -> 0 bytes buildenv-libosinfo-fedora-32.zip | Bin 680 -> 0 bytes ...nv-libosinfo-fedora-rawhide-cross-mingw32.zip | Bin 783 -> 0 bytes ...nv-libosinfo-fedora-rawhide-cross-mingw64.zip | Bin 789 -> 0 bytes buildenv-libosinfo-fedora-rawhide.zip | Bin 699 -> 0 bytes buildenv-libosinfo-opensuse-151.zip | Bin 704 -> 0 bytes buildenv-libosinfo-ubuntu-1804.zip | Bin 818 -> 0 bytes buildenv-libosinfo-ubuntu-2004.zip | Bin 795 -> 0 bytes 13 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 buildenv-libosinfo-centos-7.zip delete mode 100644 buildenv-libosinfo-centos-8.zip delete mode 100644 buildenv-libosinfo-debian-10.zip delete mode 100644 buildenv-libosinfo-debian-9.zip delete mode 100644 buildenv-libosinfo-debian-sid.zip delete mode 100644 buildenv-libosinfo-fedora-31.zip delete mode 100644 buildenv-libosinfo-fedora-32.zip delete mode 100644 buildenv-libosinfo-fedora-rawhide-cross-mingw32.zip delete mode 100644 buildenv-libosinfo-fedora-rawhide-cross-mingw64.zip delete mode 100644 buildenv-libosinfo-fedora-rawhide.zip delete mode 100644 buildenv-libosinfo-opensuse-151.zip delete mode 100644 buildenv-libosinfo-ubuntu-1804.zip delete mode 100644 buildenv-libosinfo-ubuntu-2004.zip -- 2.25.4

1 0

[PATCH v2 0/8] Expose QEMU's -fw_cfg
by Michal Privoznik 09 Jun '20

09 Jun '20

v2 of: https://www.redhat.com/archives/libvir-list/2020-June/msg00139.html diff to v1: - Changed domain XML, pre Dan's suggestion - Documented the feature in news Michal Prívozník (8): domain_conf: Format NS always last virSysinfoParseXML: Mangle ctxt inside virSysinfoParseXML() conf: Add firmware blob configuration qemu: Validate firmware blob configuration qemu: Introduce fw_cfg capability secdrivers: Relabel firmware config files qemu: Generate command line for -fw_cfg news: Document -fw_cfg docs/formatdomain.html.in | 32 +++ docs/news.xml | 12 ++ docs/schemas/domaincommon.rng | 143 +++++++------ src/conf/domain_conf.c | 195 +++++++++++++----- src/conf/domain_conf.h | 4 +- src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 54 ++++- src/qemu/qemu_validate.c | 40 ++++ src/security/security_dac.c | 50 +++++ src/security/security_selinux.c | 50 +++++ src/security/virt-aa-helper.c | 12 ++ src/util/virsysinfo.c | 54 ++++- src/util/virsysinfo.h | 16 +- .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_2.4.0.x86_64.xml | 1 + .../caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + .../caps_2.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../caps_2.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../caps_2.8.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../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 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + tests/qemuxml2argvdata/smbios-type-fwcfg.args | 38 ++++ tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 63 ++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmloutdata/smbios-type-fwcfg.xml | 1 + tests/qemuxml2xmltest.c | 1 + 64 files changed, 700 insertions(+), 118 deletions(-) create mode 100644 tests/qemuxml2argvdata/smbios-type-fwcfg.args create mode 100644 tests/qemuxml2argvdata/smbios-type-fwcfg.xml create mode 120000 tests/qemuxml2xmloutdata/smbios-type-fwcfg.xml -- 2.26.2

2 18

[libvirt-tck PATCH] gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
by Erik Skultety 09 Jun '20

09 Jun '20

With the introduction of automated CI pipelines, we are now ready to switch to using merge requests for the project. With this switch we no longer wish to have patches sent to the mailing list, and thus the git-publish config is removed. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- I was notified by jtomko, that we still haven't officially made the switch in TCK, but I was already submitting merge requests. .gitpublish | 4 ---- CONTRIBUTING.rst | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst diff --git a/.gitpublish b/.gitpublish deleted file mode 100644 index 1cebab1..0000000 --- a/.gitpublish +++ /dev/null @@ -1,4 +0,0 @@ -[gitpublishprofile "default"] -base = master -to = libvir-list(a)redhat.com -prefix = libvirt-tck PATCH diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..ed8ee44 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,28 @@ +=========================== +Contributing to libvirt-tck +=========================== + +The libvirt TCK project accepts code contributions via merge requests +on the GitLab project: + +https://gitlab.com/libvirt/libvirt-tck/-/merge_requests + +It is required that automated CI pipelines succeed before a merge request +will be accepted. The global pipeline status for the ``master`` branch is +visible at: + +https://gitlab.com/libvirt/libvirt-tck/pipelines + +CI pipeline results for merge requests will be visible via the contributors' +own private repository fork: + +https://gitlab.com/yourusername/libvirt-tck/pipelines + +Contributions submitted to the project must be in compliance with the +Developer Certificate of Origin Version 1.1. This is documented at: + +https://developercertificate.org/ + +To indicate compliance, each commit in a series must have a "Signed-off-by" +tag with the submitter's name and email address. This can be added by passing +the ``-s`` flag to ``git commit`` when creating the patches. -- 2.26.2

2 4

[libvirt-tck PATCH] gitlab: add CI jobs for validating build across platforms
by Daniel P. Berrangé 09 Jun '20

09 Jun '20

This introduces CI jobs that replace the current jobs used on Jenkins for every platform except FreeBSD. A merge request workflow requires the user to fork the primary git repo into their personal namespace. In general the changes need to be tested against the current libvirt git master. If the user has a fork of the main libvirt repo, we don't want to use that by default as it may be out of date. The general goal is that the CI jobs are self-contained and don't depend on the build artifacts from the libvirt repo. We also want to avoid having an explicit dependency on the libvirt-ci repo, or on the Quay.io service. Contributors to the PHP module need to be able to make code changes which imply CI environment changes and be able to test them in isolation. Thus, the dockerfile recipes for each distro are added in the ci/ sub-directory. The first stage of the CI jobs is to use these recipes to build and publish a container image. These images are then used in the second stage to perform the actual build. The container image build is cached, inheriting from both the primary libvirt project namespace, and the user's private project namespace. Thus the performance hit of building container images will only be felt the first time the project is forked, or when the parent Docker images are rebuilt. The dockerfiles were originally generated using lcitool, but if the user makes a change that introduces new build dependencies, the corresponding packages can be added to the dockerfile recipes directly in the same commit. The change can be propagated back into the libvirt-ci.git repo asynchronously. The build job will do a minimal(-ish) build of libvirt git master and then build the rest of the code against that. Ideally the main libvirt configure script would have a way to request a minimal build of just the API and test driver, but for now we settle for just --without-libvirtd which culls a large number of the drivers fairly easily. Neither CentOS nor Ubuntu have the required perl deps to run the TCK so those platforms are currently skipped. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- See example pipeline run: https://gitlab.com/berrange/libvirt-tck/-/pipelines/153948849 .gitlab-ci.yml | 115 +++++++++++++++++++++++++++ ci/libvirt-debian-10.Dockerfile | 82 +++++++++++++++++++ ci/libvirt-debian-9.Dockerfile | 86 ++++++++++++++++++++ ci/libvirt-debian-sid.Dockerfile | 82 +++++++++++++++++++ ci/libvirt-fedora-31.Dockerfile | 81 +++++++++++++++++++ ci/libvirt-fedora-32.Dockerfile | 81 +++++++++++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 82 +++++++++++++++++++ ci/refresh | 22 +++++ 8 files changed, 631 insertions(+) create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100755 ci/refresh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50dae92..3d4d7db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,60 @@ stages: - prebuild + - containers + - builds + +.container_job_template: &container_job_definition + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt-perl/ci-$NAME:latest" + - docker info + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + script: + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/libvirt-$NAME.Dockerfile" ci + - docker push "$TAG" + after_script: + - docker logout + +.git_build_job_template: &git_build_job_definition + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + stage: builds + before_script: + - export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)" + - export SCRATCH_DIR="/tmp/scratch" + - export VROOT="$SCRATCH_DIR/vroot" + - export LD_LIBRARY_PATH="$VROOT/lib" + - export PATH="$VROOT/bin:$PATH" + - export PKG_CONFIG_PATH="$VROOT/lib/pkgconfig" + - export TEST_MAINTAINER=1 + - eval `perl -V:archname` + - export PERL5LIB="$VROOT/lib/perl5/$archname" + script: + - pushd "$PWD" + - mkdir -p "$SCRATCH_DIR" + - cd "$SCRATCH_DIR" + - git clone --depth 1 https://gitlab.com/libvirt/libvirt.git + - git clone --depth 1 https://gitlab.com/libvirt/libvirt-perl.git + - mkdir libvirt/build + - cd libvirt/build + - ../autogen.sh --prefix="$VROOT" --without-libvirtd + - $MAKE install + - cd ../../libvirt-perl + - perl Build.PL install_base=$VROOT + - perl Build + - perl Build install + - popd + - perl Build.PL + - perl Build + - perl Build test + - perl Build install + - perl Build dist + - if test -x /usr/bin/rpmbuild ; then rpmbuild --nodeps -ta Sys-Virt-TCK*.tar.gz ; fi # Check that all commits are signed-off for the DCO. # Skip on "libvirt" namespace, since we only need to run @@ -14,3 +68,64 @@ check-dco: except: variables: - $CI_PROJECT_NAMESPACE == 'libvirt' + +debian-9-container: + <<: *container_job_definition + variables: + NAME: debian-9 + +debian-10-container: + <<: *container_job_definition + variables: + NAME: debian-10 + +debian-sid-container: + <<: *container_job_definition + variables: + NAME: debian-sid + +fedora-31-container: + <<: *container_job_definition + variables: + NAME: fedora-31 + +fedora-32-container: + <<: *container_job_definition + variables: + NAME: fedora-32 + +fedora-rawhide-container: + <<: *container_job_definition + variables: + NAME: fedora-rawhide + + +debian-9-git-build: + <<: *git_build_job_definition + variables: + NAME: debian-9 + +debian-10-git-build: + <<: *git_build_job_definition + variables: + NAME: debian-10 + +debian-sid-git-build: + <<: *git_build_job_definition + variables: + NAME: debian-sid + +fedora-31-git-build: + <<: *git_build_job_definition + variables: + NAME: fedora-31 + +fedora-32-git-build: + <<: *git_build_job_definition + variables: + NAME: fedora-32 + +fedora-rawhide-git-build: + <<: *git_build_job_definition + variables: + NAME: fedora-rawhide diff --git a/ci/libvirt-debian-10.Dockerfile b/ci/libvirt-debian-10.Dockerfile new file mode 100644 index 0000000..f881069 --- /dev/null +++ b/ci/libvirt-debian-10.Dockerfile @@ -0,0 +1,82 @@ +FROM debian:10 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + libaccessors-perl \ + libc-dev-bin \ + libc6-dev \ + libconfig-record-perl \ + libcpan-changes-perl \ + libdigest-perl-md5-perl \ + libfile-slurp-perl \ + libglib2.0-dev \ + libgnutls28-dev \ + libio-compress-perl \ + libio-string-perl \ + libmodule-build-perl \ + libnl-3-dev \ + libnl-route-3-dev \ + libsub-uplevel-perl \ + libtap-formatter-html-perl \ + libtap-formatter-junit-perl \ + libtap-harness-archive-perl \ + libtest-exception-perl \ + libtest-lwp-useragent-perl \ + libtest-pod-coverage-perl \ + libtest-pod-perl \ + libtime-hr-perl \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libxml-twig-perl \ + libxml-writer-perl \ + libxml-xpath-perl \ + libxml2-dev \ + libxml2-utils \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + xsltproc && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-debian-9.Dockerfile b/ci/libvirt-debian-9.Dockerfile new file mode 100644 index 0000000..3a161fe --- /dev/null +++ b/ci/libvirt-debian-9.Dockerfile @@ -0,0 +1,86 @@ +FROM debian:9 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + libaccessors-perl \ + libc-dev-bin \ + libc6-dev \ + libconfig-record-perl \ + libcpan-changes-perl \ + libdigest-perl \ + libdigest-perl-md5-perl \ + libfile-slurp-perl \ + libglib2.0-dev \ + libgnutls28-dev \ + libio-compress-perl \ + libio-string-perl \ + libmodule-build-perl \ + libnl-3-dev \ + libnl-route-3-dev \ + libsub-uplevel-perl \ + libtap-formatter-html-perl \ + libtap-formatter-junit-perl \ + libtap-harness-archive-perl \ + libtest-exception-perl \ + libtest-lwp-useragent-perl \ + libtest-pod-coverage-perl \ + libtest-pod-perl \ + libtime-hr-perl \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libxml-twig-perl \ + libxml-writer-perl \ + libxml-xpath-perl \ + libxml2-dev \ + libxml2-utils \ + locales \ + lsof \ + make \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-docutils \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + xsltproc && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +RUN pip3 install \ + meson==0.49.0 + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-debian-sid.Dockerfile b/ci/libvirt-debian-sid.Dockerfile new file mode 100644 index 0000000..bed01a0 --- /dev/null +++ b/ci/libvirt-debian-sid.Dockerfile @@ -0,0 +1,82 @@ +FROM debian:sid + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + autopoint \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + gcc \ + gdb \ + gettext \ + git \ + libaccessors-perl \ + libc-dev-bin \ + libc6-dev \ + libconfig-record-perl \ + libcpan-changes-perl \ + libdigest-perl-md5-perl \ + libfile-slurp-perl \ + libglib2.0-dev \ + libgnutls28-dev \ + libio-compress-perl \ + libio-string-perl \ + libmodule-build-perl \ + libnl-3-dev \ + libnl-route-3-dev \ + libsub-uplevel-perl \ + libtap-formatter-html-perl \ + libtap-formatter-junit-perl \ + libtap-harness-archive-perl \ + libtest-exception-perl \ + libtest-lwp-useragent-perl \ + libtest-pod-coverage-perl \ + libtest-pod-perl \ + libtime-hr-perl \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libxml-twig-perl \ + libxml-writer-perl \ + libxml-xpath-perl \ + libxml2-dev \ + libxml2-utils \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + xsltproc && \ + apt-get autoremove -y && \ + apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-fedora-31.Dockerfile b/ci/libvirt-fedora-31.Dockerfile new file mode 100644 index 0000000..e72682c --- /dev/null +++ b/ci/libvirt-fedora-31.Dockerfile @@ -0,0 +1,81 @@ +FROM fedora:31 + +RUN dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-langpack-en \ + gnutls-devel \ + libnl3-devel \ + libtirpc-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + perl-Archive-Tar \ + perl-CPAN-Changes \ + perl-Config-Record \ + perl-Digest \ + perl-Digest-MD5 \ + perl-File-Slurp \ + perl-IO-Compress-Bzip2 \ + perl-IO-String \ + perl-Module-Build \ + perl-Sub-Uplevel \ + perl-TAP-Formatter-HTML \ + perl-TAP-Formatter-JUnit \ + perl-TAP-Harness-Archive \ + perl-Test-Exception \ + perl-Test-LWP-UserAgent \ + perl-Test-Pod \ + perl-Test-Pod-Coverage \ + perl-Time-HiRes \ + perl-XML-Twig \ + perl-XML-Writer \ + perl-XML-XPath \ + perl-accessors \ + perl-generators \ + pkgconfig \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-fedora-32.Dockerfile b/ci/libvirt-fedora-32.Dockerfile new file mode 100644 index 0000000..9770d53 --- /dev/null +++ b/ci/libvirt-fedora-32.Dockerfile @@ -0,0 +1,81 @@ +FROM fedora:32 + +RUN dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-langpack-en \ + gnutls-devel \ + libnl3-devel \ + libtirpc-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + perl-Archive-Tar \ + perl-CPAN-Changes \ + perl-Config-Record \ + perl-Digest \ + perl-Digest-MD5 \ + perl-File-Slurp \ + perl-IO-Compress-Bzip2 \ + perl-IO-String \ + perl-Module-Build \ + perl-Sub-Uplevel \ + perl-TAP-Formatter-HTML \ + perl-TAP-Formatter-JUnit \ + perl-TAP-Harness-Archive \ + perl-Test-Exception \ + perl-Test-LWP-UserAgent \ + perl-Test-Pod \ + perl-Test-Pod-Coverage \ + perl-Time-HiRes \ + perl-XML-Twig \ + perl-XML-Writer \ + perl-XML-XPath \ + perl-accessors \ + perl-generators \ + pkgconfig \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/libvirt-fedora-rawhide.Dockerfile b/ci/libvirt-fedora-rawhide.Dockerfile new file mode 100644 index 0000000..4fd8b1e --- /dev/null +++ b/ci/libvirt-fedora-rawhide.Dockerfile @@ -0,0 +1,82 @@ +FROM fedora:rawhide + +RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ + dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-langpack-en \ + gnutls-devel \ + libnl3-devel \ + libtirpc-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + perl-Archive-Tar \ + perl-CPAN-Changes \ + perl-Config-Record \ + perl-Digest \ + perl-Digest-MD5 \ + perl-File-Slurp \ + perl-IO-Compress-Bzip2 \ + perl-IO-String \ + perl-Module-Build \ + perl-Sub-Uplevel \ + perl-TAP-Formatter-HTML \ + perl-TAP-Formatter-JUnit \ + perl-TAP-Harness-Archive \ + perl-Test-Exception \ + perl-Test-LWP-UserAgent \ + perl-Test-Pod \ + perl-Test-Pod-Coverage \ + perl-Time-HiRes \ + perl-XML-Twig \ + perl-XML-Writer \ + perl-XML-XPath \ + perl-accessors \ + perl-generators \ + pkgconfig \ + python3 \ + python3-docutils \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/refresh b/ci/refresh new file mode 100755 index 0000000..657f4d0 --- /dev/null +++ b/ci/refresh @@ -0,0 +1,22 @@ +#!/bin/sh + +if test -z "$1" +then + echo "syntax: $0 PATH-TO-LCITOOL" + exit 1 +fi + +LCITOOL=$1 + +if ! test -x "$LCITOOL" +then + echo "$LCITOOL is not executable" + exit 1 +fi + +HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|ubuntu|suse|centos)') + +for host in $HOSTS +do + $LCITOOL dockerfile $host libvirt+minimal,libvirt-perl,libvirt-tck > $host.Dockerfile +done -- 2.26.2

2 1

[libvirt PATCH 0/2] ci: Enable Cirrus CI integration
by Andrea Bolognani 09 Jun '20

09 Jun '20

This is an alternative approach to the one proposed by Erik[1]. Advantages of this approach: * we don't have to build and maintain our own FreeBSD runners; * we make it possible, after some straightforward one-time setup, for any contributor to have their branches build on FreeBSD and macOS, again without having to build and maintain their own runners; * we reduce the number of services external of GitLab that we depend on by having FreeBSD and macOS build happen on the same platform instead of separate ones. Drawbacks of this approach: * requires signing up for yet another online service. To see this in action, check out the https://gitlab.com/abologna/libvirt/-/pipelines/153963978 pipeline, and in particular the https://gitlab.com/abologna/libvirt/-/jobs/585678408 https://gitlab.com/abologna/libvirt/-/jobs/585678413 jobs. libvirt-ci merge request: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/16 [1] https://www.redhat.com/archives/libvir-list/2020-June/msg00188.html Andrea Bolognani (2): ci: Enable Cirrus CI integration ci: Remove Travis CI .gitlab-ci.yml | 36 ++++++++++++++++++ .travis.yml | 58 ----------------------------- ci/README.rst | 59 ++++++++++++++++++++++++++++++ ci/cirrus/freebsd-11.yml.j2 | 73 +++++++++++++++++++++++++++++++++++++ ci/cirrus/freebsd-12.yml.j2 | 73 +++++++++++++++++++++++++++++++++++++ ci/cirrus/macos-1015.yml.j2 | 38 +++++++++++++++++++ 6 files changed, 279 insertions(+), 58 deletions(-) delete mode 100644 .travis.yml create mode 100644 ci/README.rst create mode 100644 ci/cirrus/freebsd-11.yml.j2 create mode 100644 ci/cirrus/freebsd-12.yml.j2 create mode 100644 ci/cirrus/macos-1015.yml.j2 -- 2.25.4

3 10

bugifx: fix some wrong usage of ATTRIBUTE_NONNULL
by Bihong Yu 09 Jun '20

09 Jun '20

There are some wrong usage of ATTRIBUTE_NONNULL, which may cause the compilation fail. The ATTRIBUTE_NONNULL is the define of __attribute__((__nonnull__(m))), which declares that the input pointer parameter of funciton should not be NULL. If we declare some input pointer parameter of the function is ATTRIBUTE_NONNULL, the function should not redundancy check of the pointer parameter. And the ATTRIBUTE_NONNULL can only be using to pointer. >From 55cd85345b2dc50f44c1e382563482d40142382b Mon Sep 17 00:00:00 2001 From: yubihong <yubihong(a)huawei.com> Date: Fri, 24 Apr 2020 17:44:43 +0800 Subject: [PATCH] qemu: fix code format problem Signed-off-by:Yu Bihong <yubihong(a)huawei.com> --- src/libvirt-domain.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a12809c..d659f1b 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8194,11 +8194,11 @@ virDomainAttachDevice(virDomainPtr domain, const char *xml) virCheckReadOnlyGoto(conn->flags, error); if (conn->driver->domainAttachDevice) { - int ret; - ret = conn->driver->domainAttachDevice(domain, xml); - if (ret < 0) - goto error; - return ret; + int ret; + ret = conn->driver->domainAttachDevice(domain, xml); + if (ret < 0) + goto error; + return ret; } virReportUnsupportedError(); @@ -8299,9 +8299,9 @@ virDomainDetachDevice(virDomainPtr domain, const char *xml) if (conn->driver->domainDetachDevice) { int ret; ret = conn->driver->domainDetachDevice(domain, xml); - if (ret < 0) - goto error; - return ret; + if (ret < 0) + goto error; + return ret; } virReportUnsupportedError(); -- 1.8.3.1

3 5

[PATCH 1/1] formatdomain.html.in: link to firewall page
by Daniel Henrique Barboza 09 Jun '20

09 Jun '20

Put a link to the firewall page in the "Virtual network" section, mentioning that the forward types 'nat', 'route' and 'isolated' will change firewall settings in the host. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/formatdomain.html.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 33cec1e6dd..e2db031276 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5635,6 +5635,13 @@ mode='bridge|private|vepa|passthrough'/></code> Since 0.9.4) + + Forward modes <code>nat</code>, <code>route</code> and isolated + (no <code>forward</code> element) will change host firewall + configurations. More info in + <a href="firewall.html#fw-virtual-network-driver">firewall and filtering + for virtual networks</a>. + For networks with a forward mode of bridge, private, vepa, and passthrough, it is assumed that the host has any necessary DNS -- 2.26.2

2 1

[libvirt PATCH] network: add private chains only if there are networks adding iptables rules
by Laine Stump 08 Jun '20

08 Jun '20

Juan Quintela noticed that when he restarted libvirt he was getting extra iptables rules added by libvirt even though he didn't have any libvirt networks that used iptables rules. It turns out this also happens if the firewalld service is restarted. The extra rules are just the private chains, and they're sometimes being added unnecessarily because they are added separately in a global networkPreReloadFirewallRules() that does the init if there are any active networks, regardless of whether or not any of those networks will actually add rules to the host firewall. The fix is to change the check for "any active networks" to instead check for "any active networks that add firewall rules". (NB: although the timing seems suspicious, this isn't a new regression caused by the recently pushed f5418b427 (which forces recreation of private chains when firewalld is restarted); it was an existing bug since iptables rules were first put into private chains, even after commit c6cbe18771 delayed creation of the private chains. The implication is that any downstream based on v5.1.0 or later that cares about these extraneous (but harmless) private chains would want to backport this patch (along with the other two if they aren't already there)) Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/network/bridge_driver_linux.c | 49 ++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c index b0bd207250..4145411b4b 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -91,28 +91,55 @@ static void networkSetupPrivateChains(void) static int -networkHasRunningNetworksHelper(virNetworkObjPtr obj, +networkHasRunningNetworksWithFWHelper(virNetworkObjPtr obj, void *opaque) { - bool *running = opaque; + bool *activeWithFW = opaque; virObjectLock(obj); - if (virNetworkObjIsActive(obj)) - *running = true; + if (virNetworkObjIsActive(obj)) { + virNetworkDefPtr def = virNetworkObjGetDef(obj); + + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + *activeWithFW = true; + break; + + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + case VIR_NETWORK_FORWARD_LAST: + break; + } + } + virObjectUnlock(obj); + /* + * terminate ForEach early once we find an active network that + * adds Firewall rules (return status is ignored) + */ + if (*activeWithFW) + return -1; + return 0; } static bool -networkHasRunningNetworks(virNetworkDriverStatePtr driver) +networkHasRunningNetworksWithFW(virNetworkDriverStatePtr driver) { - bool running = false; + bool activeWithFW = false; + virNetworkObjListForEach(driver->networks, - networkHasRunningNetworksHelper, - &running); - return running; + networkHasRunningNetworksWithFWHelper, + &activeWithFW); + return activeWithFW; } @@ -150,8 +177,8 @@ networkPreReloadFirewallRules(virNetworkDriverStatePtr driver, networkSetupPrivateChains(); } else { - if (!networkHasRunningNetworks(driver)) { - VIR_DEBUG("Delayed global rule setup as no networks are running"); + if (!networkHasRunningNetworksWithFW(driver)) { + VIR_DEBUG("Delayed global rule setup as no networks with firewall rules are running"); return; } -- 2.25.4

3 4

[libvirt PATCH] rpm: adapt docs filelist to NEWS -> NEWS.rst rename
by Daniel P. Berrangé 08 Jun '20

08 Jun '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI fix libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6abf97df85..262e66f3cc 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1505,7 +1505,7 @@ exit 0 %files %files docs -%doc AUTHORS ChangeLog NEWS README README.rst +%doc AUTHORS ChangeLog NEWS.rst README README.rst %doc %{_vpath_builddir}/libvirt-docs/* %files daemon -- 2.26.2

1 0

[PATCH 0/5] NUMA CPUs 'auto-fill' for incomplete topologies
by Daniel Henrique Barboza 08 Jun '20

08 Jun '20

Hi, This series implements a convenience feature for the case where the user defines an incomplete NUMA topology in the domain, when the sum of all cpus in each NUMA cell is less than the maximum vcpus count of the domain. This is an implementation based on Peter Krempa's suggestion in [1]. The documentation patch (04), aside from documentating this new behavior, while also letting the user know that using incomplete NUMA topologies are not advised. This feature does not break migration ABI. I tested it in a migration using an incomplete NUMA topology domain to migrate to another host with a patched Libvirt. A guest with this NUMA topology, declaring 9 vcpus and short of 7 vcpus to complete the total of 16: <vcpu placement='auto'>16</vcpu> [...] <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> <numa> <cell id='0' cpus='0-1,6' memory='3906250' unit='KiB'/> <cell id='1' cpus='2-4' memory='3906250' unit='KiB'/> <cell id='2' cpus='10,12' memory='3906250' unit='KiB'/> <cell id='3' cpus='14' memory='3906250' unit='KiB'/> </numa> </cpu> Successfully migrates to a patched Libvirt, ending up with this topology where the missing VCPUs were added to node 0: <vcpu placement='auto'>16</vcpu> [...] <cpu mode='custom' match='exact' check='none'> <model fallback='forbid'>POWER9</model> <numa> <cell id='0' cpus='0-1,5-9,11,13,15' memory='3932160' unit='KiB'/> <cell id='1' cpus='2-4' memory='3932160' unit='KiB'/> <cell id='2' cpus='10,12' memory='3932160' unit='KiB'/> <cell id='3' cpus='14' memory='3932160' unit='KiB'/> </numa> </cpu> [1] https://www.redhat.com/archives/libvir-list/2019-June/msg00263.html Daniel Henrique Barboza (5): numa_conf.c: add helper functions for cpumap operations qemu_domain.c: NUMA CPUs auto-fill for incomplete topologies qemuxml2xmltest.c: add NUMA vcpus auto fill tests formatdomain.html.in: document the NUMA cpus auto fill feature qemu_validate.c: revert NUMA CPU range user warning docs/formatdomain.html.in | 11 ++++- src/conf/numa_conf.c | 46 ++++++++++++++++++ src/conf/numa_conf.h | 3 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 47 +++++++++++++++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 9 ++++ src/qemu/qemu_validate.c | 19 ++------ .../numavcpus-topology-mismatch.xml | 37 +++++++++++++++ ...avcpus-topology-mismatch.x86_64-latest.xml | 38 +++++++++++++++ tests/qemuxml2xmltest.c | 1 + 11 files changed, 201 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/numavcpus-topology-mismatch.xml create mode 100644 tests/qemuxml2xmloutdata/numavcpus-topology-mismatch.x86_64-latest.xml -- 2.26.2

3 10

[PATCH v6 00/10] Introducing TPM Proxy device support for PPC64
by Daniel Henrique Barboza 08 Jun '20

08 Jun '20

No functional changes made from the previous version. Just a rebase and a trivial conflict fix in news.xml after Libvirt 6.4.0 release. changes in v6: - fixed news.xml conflict after 6.4.0 release, moved the change to 6.5.0 - added Stefan's r-b on patches 4, 5 and 6 - added Satheesh's tested-by tag on all patches Gitlab tree: https://gitlab.com/danielhb/libvirt/tree/spapr_tpm_proxy_v6 v5 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00997.html v4 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00814.html v3 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00642.html v2 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00604.html v1 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00351.html Daniel Henrique Barboza (10): docs: documentation and schema for the new TPM Proxy model qemu: Extend QEMU capabilities with 'spapr-tpm-proxy' qemu_extdevice.c: remove unneeded 'ret' variable qemu_tpm, security, tests: change 'switch' clauses for 'if' conf, qemu, security, tests: introducing 'def->tpms' array qemu: add validations after TPM Proxy model introduction tests: add XML schema tests for the TPM Proxy device qemu: build command line for the TPM Proxy device tests/qemuxml2argvtest.c: add TPM Proxy command line tests docs/news.xml: update for the new TPM Proxy device docs/formatdomain.html.in | 19 ++++- docs/news.xml | 17 +++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 50 +++++++----- src/conf/domain_conf.h | 6 +- src/qemu/qemu_alias.c | 9 ++- src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_cgroup.c | 10 ++- src/qemu/qemu_command.c | 59 +++++++++++--- src/qemu/qemu_domain.c | 68 ++++++++++++++--- src/qemu/qemu_domain_address.c | 11 ++- src/qemu/qemu_extdevice.c | 24 +++--- src/qemu/qemu_tpm.c | 76 +++++++++---------- src/qemu/qemu_validate.c | 19 +++++ src/security/security_dac.c | 8 +- src/security/security_selinux.c | 44 +++++------ src/security/virt-aa-helper.c | 14 ++-- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemuxml2argvdata/ppc64-tpm-double.xml | 34 +++++++++ .../ppc64-tpmproxy-double.xml | 38 ++++++++++ .../ppc64-tpmproxy-single.ppc64-latest.args | 34 +++++++++ .../ppc64-tpmproxy-single.xml | 33 ++++++++ .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 37 +++++++++ .../ppc64-tpmproxy-with-tpm.xml | 36 +++++++++ tests/qemuxml2argvtest.c | 33 +++++--- .../ppc64-tpmproxy-single.ppc64-latest.xml | 42 ++++++++++ .../ppc64-tpmproxy-with-tpm.ppc64-latest.xml | 46 +++++++++++ tests/qemuxml2xmltest.c | 2 + 31 files changed, 631 insertions(+), 152 deletions(-) create mode 100644 tests/qemuxml2argvdata/ppc64-tpm-double.xml create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-double.xml create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-single.xml create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-tpmproxy-single.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml -- 2.26.2

1 11

[PATCH] qemu: blockcommit: Fix placement of qemuDomainDiskBlockJobIsSupported
by Peter Krempa 08 Jun '20

08 Jun '20

Commit b50a8354f6d added call to qemuDomainDiskBlockJobIsSupported prior to filling the 'disk' variable resulting in a crash when attempting a block commit. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dd9ae30bb5..88517ba6a7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18504,9 +18504,6 @@ qemuDomainBlockCommit(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (!qemuDomainDiskBlockJobIsSupported(vm, disk)) - goto endjob; - blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); /* Convert bandwidth MiB to bytes, if necessary */ @@ -18523,6 +18520,9 @@ qemuDomainBlockCommit(virDomainPtr dom, if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; + if (!qemuDomainDiskBlockJobIsSupported(vm, disk)) + goto endjob; + if (virStorageSourceIsEmpty(disk->src)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk %s has no source file to be committed"), -- 2.26.2

2 1

[libvirt PATCH 0/4] po: misc fixes after conversion to weblate
by Daniel P. Berrangé 08 Jun '20

08 Jun '20

A bunch of random stuff that was missed in my first series converting to weblate. Daniel P. Berrangé (4): po: update docs to refer to Weblate instead of Zanata po: remove obsolete zanata push/pull rules po: remove obsolete zanata config file po: fix update-po target to take account of libvirt.pot in srcdir README.rst | 3 ++ docs/contribute.html.in | 4 +- docs/hacking.rst | 10 ++-- po/Makefile.am | 23 ++------- po/README.rst | 111 +++++++++++----------------------------- po/zanata.xml | 7 --- 6 files changed, 46 insertions(+), 112 deletions(-) delete mode 100644 po/zanata.xml -- 2.26.2

2 5

[libvirt PATCH] gitlab-ci: Enable FreeBSD native builds
by Erik Skultety 05 Jun '20

05 Jun '20

The runners have already been registered to the libvirt gitlab CI, we just need to enable building on them. Apart from adding respective CI job labels, the native job had to be tweaked so that the build dir inside the git repo is deleted before the build runs to always star with a clean environment, this results in a NOP on in the container workloads. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7113a1283c..33b83b0bb3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ stages: before_script: - *script_variables script: + - rm -rf build - mkdir build - cd build - ../autogen.sh || (cat config.log && exit 1) @@ -109,6 +110,16 @@ x64-ubuntu-2004: <<: *native_build_default_job_definition image: quay.io/libvirt/buildenv-libvirt-ubuntu-2004:latest +x64-freebsd-11: + <<: *native_build_default_job_definition + tags: + - freebsd-11 + +x64-freebsd-12: + <<: *native_build_default_job_definition + tags: + - freebsd-12 + # Cross compiled build jobs -- 2.26.2

1 0

Minor typo on https://libvirt.org/kbase/backing_chains.html
by Roland Clobus 05 Jun '20

05 Jun '20

Hello all, I've found a minor typo on https://libvirt.org/kbase/backing_chains.html In the section 'Manual image creation' the word 'create' was missing from the command line: Current: qemu-img -f qcow2 -F qcow2 -b $BACKING_IMAGE_PATH $IMAGE_PATH Corrected: qemu-img create -f qcow2 -F qcow2 -b $BACKING_IMAGE_PATH $IMAGE_PATH With kind regards, Roland Clobus

3 2

[libvirt PATCH] docs: backing chains: fix qemu-img invocation
by Ján Tomko 05 Jun '20

05 Jun '20

The example was missing the 'create' command. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: Roland Clobus <rclobus(a)rclobus.nl> --- Pushed as trivial. docs/kbase/backing_chains.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/backing_chains.rst b/docs/kbase/backing_chains.rst index c112f2bc82..c3de37f4d1 100644 --- a/docs/kbase/backing_chains.rst +++ b/docs/kbase/backing_chains.rst @@ -120,7 +120,7 @@ means that the **-F** parameter of ``qemu-img`` must always be used. :: - qemu-img -f qcow2 -F qcow2 -b $BACKING_IMAGE_PATH $IMAGE_PATH + qemu-img create -f qcow2 -F qcow2 -b $BACKING_IMAGE_PATH $IMAGE_PATH Note that if ``$BACKING_IMAGE_PATH`` is relative the path is considered relative to the location of ``$IMAGE_PATH``. -- 2.25.4

1 0

[libvirt PATCH v2 0/3] news: Convert to reStructuredText
by Andrea Bolognani 05 Jun '20

05 Jun '20

browse: https://gitlab.com/abologna/libvirt/-/tree/news-convert-cleanup git fetch: https://gitlab.com/abologna/libvirt.git news-convert-cleanup Changes since [v1] * use '*' for all bullet points, regardless of how deep they're nested; * patches 1/5 and 2/5 have been pushed. [v1] https://www.redhat.com/archives/libvir-list/2020-June/msg00061.html Andrea Bolognani (3): news: Output reStructuredText for the ASCII version news: Convert to reStructuredText news: Add information about old releases Makefile.am | 22 +- NEWS.rst | 4077 ++++++++++++++++++++++++++++ docs/Makefile.am | 27 +- docs/libvirt.css | 15 - docs/news-2005.html.in | 28 - docs/news-2006.html.in | 354 --- docs/news-2007.html.in | 534 ---- docs/news-2008.html.in | 580 ---- docs/news-2009.html.in | 1603 ----------- docs/news-2010.html.in | 2218 --------------- docs/news-2011.html.in | 3314 ----------------------- docs/news-2012.html.in | 3012 --------------------- docs/news-2013.html.in | 3675 ------------------------- docs/news-2014.html.in | 3418 ------------------------ docs/news-2015.html.in | 2864 -------------------- docs/news-2016.html.in | 3740 -------------------------- docs/news-ascii.xsl | 69 - docs/news-html.xsl | 106 - docs/news.rng | 72 - docs/news.xml | 5473 -------------------------------------- scripts/reformat-news.py | 102 - tests/virschematest.c | 2 - 22 files changed, 4089 insertions(+), 31216 deletions(-) create mode 100644 NEWS.rst delete mode 100644 docs/news-2005.html.in delete mode 100644 docs/news-2006.html.in delete mode 100644 docs/news-2007.html.in delete mode 100644 docs/news-2008.html.in delete mode 100644 docs/news-2009.html.in delete mode 100644 docs/news-2010.html.in delete mode 100644 docs/news-2011.html.in delete mode 100644 docs/news-2012.html.in delete mode 100644 docs/news-2013.html.in delete mode 100644 docs/news-2014.html.in delete mode 100644 docs/news-2015.html.in delete mode 100644 docs/news-2016.html.in delete mode 100644 docs/news-ascii.xsl delete mode 100644 docs/news-html.xsl delete mode 100644 docs/news.rng delete mode 100644 docs/news.xml delete mode 100755 scripts/reformat-news.py -- 2.25.4

2 4

Handling merge requests from Weblate translation
by Daniel P. Berrangé 05 Jun '20

05 Jun '20

The libvirt project is now converted to use Weblate for translation. Weblate has its own fork of libvirt git repos. With weblate managing translations, NEVER, under any circumstances should anyone change the .po files in libvirt.git directly. This will result in merge conflicts with Weblate that need tedious manual resolution. Any .po file changes must always be done via the Weblate UI. Changes made in the weblate UI are not committed to its fork immediately. Weblate will wait upto 24 hours before committing. It will keep changes by each translator as separate commits, and will add SoB lines to them. When it has commits ready, it opens a merge request in GitLab. If it has more commits later and the merge request is still open, it will just push to the pre-existing merge request instead of opening a new one. What this means is that if we immediately approve & merge a weblate merge request, it'll likely open a new one the very next day. I don't think we want to be opening & closing 30 merge requests a month for translations. Thus I'm suggesting that we leave weblate merge requests open to accumulate new commits. Only approve & merge them during the freeze period. Any time we update the libvirt.pot, weblate will msgmerge all the .po files and submit them back to libvirt. These are going to be quite large commits. My intention is to only update the libvirt.pot at the time that we start the release freeze period. This leaves a week to receive new translations, during which time libvirt strings shouldn't be changing much anyway, since we're in bugfix only mode. 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 :|

1 0

[libvirt PATCH] qemu: fix typo s/readaehad/readahead/
by Daniel P. Berrangé 05 Jun '20

05 Jun '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial typo fix src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 10f16e9b3b..3239ac1a52 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5281,7 +5281,7 @@ qemuDomainValidateStorageSource(virStorageSourcePtr src, src->protocol != VIR_STORAGE_NET_PROTOCOL_FTP && src->protocol != VIR_STORAGE_NET_PROTOCOL_FTPS)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("readaehad is supported only with HTTP(S)/FTP(s) protocols")); + _("readahead is supported only with HTTP(S)/FTP(s) protocols")); return -1; } -- 2.26.2

1 0