- Devel - libvirt List Archives

[libvirt PATCH v3 0/1] cirrus: Add templates and refresh script
by Andrea Bolognani 01 Jul '20

01 Jul '20

This makes the Cirrus CI configurations as maintainable as the Dockerfiles, by shifting the responsability of keeping the list of dependencies and other details up to date to lcitool. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/161289292 For the refresh script to work, your copy of lcitool needs to include these patches: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/30 Changes from [v2]: * 'lcitool dockerfile --variables' has been replaced with 'lcitool variables'. Changes from [v1]: * reduce duplication by only storing variables in the git repository and instantiating the template at runtime. [v2] https://www.redhat.com/archives/libvir-list/2020-June/msg01318.html [v1] https://www.redhat.com/archives/libvir-list/2020-June/msg01305.html Andrea Bolognani (1): cirrus: Generate jobs dynamically .gitlab-ci.yml | 36 ++++++++++++++- ci/cirrus/build.yml | 26 +++++++++++ ci/cirrus/freebsd-12.yml.j2 | 73 ------------------------------- ci/cirrus/libvirt-freebsd-12.vars | 7 +++ ci/cirrus/libvirt-macos-1015.vars | 7 +++ ci/cirrus/macos-1015.yml.j2 | 38 ---------------- ci/cirrus/refresh | 22 ++++++++++ 7 files changed, 97 insertions(+), 112 deletions(-) create mode 100644 ci/cirrus/build.yml delete mode 100644 ci/cirrus/freebsd-12.yml.j2 create mode 100644 ci/cirrus/libvirt-freebsd-12.vars create mode 100644 ci/cirrus/libvirt-macos-1015.vars delete mode 100644 ci/cirrus/macos-1015.yml.j2 create mode 100755 ci/cirrus/refresh -- 2.25.4

2 2

[PATCH 1/1] migration.html.in: fix 'Offline migration' description
by Daniel Henrique Barboza 01 Jul '20

01 Jul '20

'transfers inactive the definition of a domain' seems odd. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/migration.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index 355f0e89af..e95ee9de6f 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -141,7 +141,7 @@ <h2><a id="offline">Offline migration</a></h2> <p> - Offline migration transfers inactive the definition of a domain + Offline migration transfers the inactive definition of a domain (which may or may not be active). After successful completion, the domain remains in its current state on the source host and is defined but inactive on the destination host. It's a bit more clever than -- 2.26.2

2 1

[PATCH 1/1] domain_conf.c: skip checking ZPCI address is incomplete if not present
by Daniel Henrique Barboza 01 Jul '20

01 Jul '20

Commit 076591009ad1 ("conf: fix zPCI address auto-generation on s390") is doing a check for virZPCIDeviceAddressIsIncomplete() prior to checking if the device has a ZPCI address at all. This results in errors like these when starting Libvirt: error : virDomainDeviceInfoFormat:7527 : internal error: Missing uid or fid attribute of zPCI address Fix it by moving virZPCIDeviceAddressIsIncomplete() after the check done by virZPCIDeviceAddressIsPresent(). Fixes: 076591009ad11ec108521b52a4945d0f895fa160 CC: Bjoern Walk <bwalk(a)linux.ibm.com> CC: Boris Fiuczynski <fiuczy(a)linux.ibm.com> CC: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> CC: Andrea Bolognani <abologna(a)redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/conf/domain_conf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 31ba78b950..33f177b16f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7522,11 +7522,11 @@ virDomainDeviceInfoFormat(virBufferPtr buf, virTristateSwitchTypeToString(info->addr.pci.multi)); } - if (virZPCIDeviceAddressIsIncomplete(&info->addr.pci.zpci)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing uid or fid attribute of zPCI address")); - } if (virZPCIDeviceAddressIsPresent(&info->addr.pci.zpci)) { + if (virZPCIDeviceAddressIsIncomplete(&info->addr.pci.zpci)) + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing uid or fid attribute of zPCI address")); + virBufferAsprintf(&childBuf, "<zpci uid='0x%.4x' fid='0x%.8x'/>\n", info->addr.pci.zpci.uid.value, -- 2.26.2

3 8

[libvirt PATCH v2 0/1] cirrus: Add templates and refresh script
by Andrea Bolognani 30 Jun '20

30 Jun '20

This makes the Cirrus CI configurations as maintainable as the Dockerfiles, by shifting the responsability of keeping the list of dependencies and other details up to date to lcitool. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/161289292 For the refresh script to work, your copy of lcitool needs to include these patches: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/30 Changes from [v1]: * reduce duplication by only storing variables in the git repository and instantiating the template at runtime. [v1] https://www.redhat.com/archives/libvir-list/2020-June/msg01305.html Andrea Bolognani (1): cirrus: Generate jobs dynamically .gitlab-ci.yml | 36 ++++++++++++++- ci/cirrus/build.yml | 26 +++++++++++ ci/cirrus/freebsd-12.yml.j2 | 73 ------------------------------- ci/cirrus/libvirt-freebsd-12.vars | 7 +++ ci/cirrus/libvirt-macos-1015.vars | 7 +++ ci/cirrus/macos-1015.yml.j2 | 38 ---------------- ci/cirrus/refresh | 22 ++++++++++ 7 files changed, 97 insertions(+), 112 deletions(-) create mode 100644 ci/cirrus/build.yml delete mode 100644 ci/cirrus/freebsd-12.yml.j2 create mode 100644 ci/cirrus/libvirt-freebsd-12.vars create mode 100644 ci/cirrus/libvirt-macos-1015.vars delete mode 100644 ci/cirrus/macos-1015.yml.j2 create mode 100755 ci/cirrus/refresh -- 2.25.4

2 3

[libvirt PATCH] tools: fix misleading comments about command names
by Daniel P. Berrangé 30 Jun '20

30 Jun '20

The srv-XXX commands were renamed to server-XXX, with the old name being a undocumented back compat alias only. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tools/virt-admin.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 6ff9729f66..fef0332a0d 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -315,9 +315,9 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) } -/* --------------- - * Command srv-list - * --------------- +/* ------------------- + * Command server-list + * ------------------- */ static const vshCmdInfo info_srv_list[] = { @@ -380,9 +380,9 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) } -/* --------------------------- - * Command srv-threadpool-info - * --------------------------- +/* ------------------------------ + * Command server-threadpool-info + * ------------------------------ */ static const vshCmdInfo info_srv_threadpool_info[] = { @@ -441,9 +441,9 @@ cmdSrvThreadpoolInfo(vshControl *ctl, const vshCmd *cmd) return ret; } -/* -------------------------- - * Command srv-threadpool-set - * -------------------------- +/* ----------------------------- + * Command server-threadpool-set + * ----------------------------- */ static const vshCmdInfo info_srv_threadpool_set[] = { @@ -550,9 +550,9 @@ cmdSrvThreadpoolSet(vshControl *ctl, const vshCmd *cmd) goto cleanup; } -/* ------------------------ - * Command srv-clients-list - * ------------------------ +/* --------------------------- + * Command server-clients-list + * --------------------------- */ static const vshCmdInfo info_srv_clients_list[] = { @@ -793,9 +793,9 @@ cmdClientDisconnect(vshControl *ctl, const vshCmd *cmd) return ret; } -/* ------------------------ - * Command srv-clients-info - * ------------------------ +/* --------------------------- + * Command server-clients-info + * --------------------------- */ static const vshCmdInfo info_srv_clients_info[] = { @@ -852,9 +852,9 @@ cmdSrvClientsInfo(vshControl *ctl, const vshCmd *cmd) return ret; } -/* ----------------------- - * Command srv-clients-set - * ----------------------- +/* -------------------------- + * Command server-clients-set + * -------------------------- */ static const vshCmdInfo info_srv_clients_set[] = { @@ -957,9 +957,9 @@ cmdSrvClientsSet(vshControl *ctl, const vshCmd *cmd) goto cleanup; } -/* ------------------------ - * Command srv-update-tls - * ------------------------ +/* -------------------------- + * Command server-update-tls + * -------------------------- */ static const vshCmdInfo info_srv_update_tls_file[] = { {.name = "help", -- 2.26.2

2 1

[libvirt PATCH 0/3] cirrus: Add templates and refresh script
by Andrea Bolognani 29 Jun '20

29 Jun '20

This makes the Cirrus CI configurations as maintainable as the Dockerfiles, by shifting the responsability of keeping the list of dependencies and other details up to date to lcitool. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/161179474 The important job is the macOS one. For the refresh script to work, your copy of lcitool needs to include these patches: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/30 https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/31 Andrea Bolognani (3): cirrus: Tweak configurations cirrus: Add templates and refresh script cirrus: Refresh configurations ci/cirrus/freebsd-12.yml.j2 | 62 ++++-------------------------- ci/cirrus/macos-1015.yml.j2 | 29 +++++--------- ci/cirrus/refresh | 32 +++++++++++++++ ci/cirrus/templates/freebsd-12.yml | 25 ++++++++++++ ci/cirrus/templates/macos-1015.yml | 27 +++++++++++++ 5 files changed, 100 insertions(+), 75 deletions(-) create mode 100755 ci/cirrus/refresh create mode 100644 ci/cirrus/templates/freebsd-12.yml create mode 100644 ci/cirrus/templates/macos-1015.yml -- 2.25.4

3 9

[PATCH] virConnectGetAllDomainStats: Document two vcpu stats
by Michal Privoznik 29 Jun '20

29 Jun '20

When introducing vcpu.<num>.wait (v1.3.2-rc1~301) and vcpu.<num>.halted (v2.4.0-rc1~36) the documentation was not written. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 60b5e65fc3..52ce3ef798 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11493,6 +11493,11 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * from virVcpuState enum. * "vcpu.<num>.time" - virtual cpu time spent by virtual CPU <num> * as unsigned long long. + * "vcpu.<num>.wait" - time the vCPU <num> wants to run, but the host + * scheduler has something else running ahead of it. + * "vcpu.<num>.halted" - virtual CPU <num> is halted, may indicate the + * processor is idle or even disabled, depending + * on the architecture) * * VIR_DOMAIN_STATS_INTERFACE: * Return network interface statistics (from domain point of view). -- 2.26.2

2 1

[PATCH v2 for 6.5.0] domain_conf: Remove zPCI validation from formatter
by Michal Privoznik 29 Jun '20

29 Jun '20

In 076591009ad a validation code was added to virDomainDeviceInfoFormat() which reports an error if zPCI address entered in was incomplete. But, there are two problems with this approach. The first problem is the placement of the code - it doesn't belong into XML formatter rather than XML validator. The second one is that at the point of formatting XML the post parse callback has run and thus filled in required info. Therefore this check can never do something useful and instead of moving it into validator, it's removed completely. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This is v2 of: https://www.redhat.com/archives/libvir-list/2020-June/msg01279.html diff to v1: - Instead of moving the check to validator remove it completely (per discussion in v1) src/conf/domain_conf.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 33f177b16f..0c883cd834 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7523,10 +7523,6 @@ virDomainDeviceInfoFormat(virBufferPtr buf, } if (virZPCIDeviceAddressIsPresent(&info->addr.pci.zpci)) { - if (virZPCIDeviceAddressIsIncomplete(&info->addr.pci.zpci)) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing uid or fid attribute of zPCI address")); - virBufferAsprintf(&childBuf, "<zpci uid='0x%.4x' fid='0x%.8x'/>\n", info->addr.pci.zpci.uid.value, -- 2.26.2

2 1

[PATCH for 6.5.0 0/3] Move zPCI validation from formatter to validator
by Michal Privoznik 29 Jun '20

29 Jun '20

*** BLURB HERE *** Michal Prívozník (3): qemuhotplugtest: Free monitor iff successfully initialized domain_conf: Move zPCI validation from formatter to validator qemu_validate: Fix how qemuValidateDomainDeviceDefZPCIAddress() is called src/conf/domain_conf.c | 4 ---- src/qemu/qemu_validate.c | 9 ++++++++- tests/qemuhotplugtest.c | 8 +++++--- 3 files changed, 13 insertions(+), 8 deletions(-) -- 2.26.2

2 8

[libvirt PATCH] ci: Run all jobs, for all branches, all the time
by Andrea Bolognani 29 Jun '20

29 Jun '20

After recent changes (increasing the parallelism of the pipeline by reducing the number of stages, introducing FreeBSD builds that take longer than any other job), the difference between running the full pipeline or a reduced one has basically disappeared: in both cases, the completion time is around 25-35 minutes depending on whether containers need to be rebuilt and how many shared runners are available. Reduce the complexity of our .gitlab-ci.yml and make things simpler for contributors by simply always running all jobs. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab-ci.yml | 143 ++++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 90 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6cb910b0fa..e6eb2f9905 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,8 +15,7 @@ stages: # Common templates -# Containers that are necessary for the default pipeline -.container_default_job_template: &container_default_job_definition +.container_job_template: &container_job_definition image: docker:stable stage: containers services: @@ -33,23 +32,15 @@ stages: after_script: - docker logout -# Containers that are only needed for the full pipeline -.container_extra_job_template: &container_extra_job_definition - <<: *container_default_job_definition - only: - - master - - /^ci-full-.*$/ - # We build many containers which can be useful to debug problems but are not # needed for the pipeline itself to complete: those sometimes fail, and when # that happens it's mostly because of temporary issues with Debian sid. We # don't want those failures to affect the overall pipeline status .container_optional_job_template: &container_optional_job_definition - <<: *container_extra_job_definition + <<: *container_job_definition allow_failure: true -# Default native build jobs that are always run -.native_build_default_job_template: &native_build_default_job_definition +.native_build_job_template: &native_build_job_definition stage: builds image: $CI_REGISTRY_IMAGE/ci-$NAME:latest cache: @@ -64,18 +55,10 @@ stages: - ../autogen.sh || (cat config.log && exit 1) - $MAKE distcheck -# Extra native build jobs that are only run post-merge, or -# when code is pushed to a branch with "ci-full-" name prefix -.native_build_extra_job_template: &native_build_extra_job_definition - <<: *native_build_default_job_definition - only: - - master - - /^ci-full-.*$/ - # Jobs that we delegate to Cirrus CI because they require an operating # 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 +.cirrus_build_job_template: &cirrus_build_job_definition stage: builds image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master script: @@ -85,19 +68,7 @@ stages: - $CIRRUS_GITHUB_REPO - $CIRRUS_API_TOKEN -.cirrus_build_extra_job_template: &cirrus_build_extra_job_definition - <<: *cirrus_build_default_job_definition - only: - variables: - - $CIRRUS_GITHUB_REPO - - $CIRRUS_API_TOKEN - refs: - - master - - /^ci-full-.*$/ - - -# Default cross build jobs that are always run -.cross_build_default_job_template: &cross_build_default_job_definition +.cross_build_default_job_template: &cross_build_job_definition stage: builds image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest cache: @@ -112,74 +83,66 @@ stages: - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1) - $MAKE -# Extra cross build jobs that are only run post-merge, or -# when code is pushed to a branch with "ci-full-" name prefix -.cross_build_extra_job_template: &cross_build_extra_job_definition - <<: *cross_build_default_job_definition - only: - - master - - /^ci-full-.*$/ - # Native container build jobs x64-centos-7-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: centos-7 x64-centos-8-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: centos-8 x64-centos-stream-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: centos-stream x64-debian-9-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-9 x64-debian-10-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: debian-10 x64-debian-sid-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-sid x64-fedora-31-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: fedora-31 x64-fedora-32-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: fedora-32 x64-fedora-rawhide-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: fedora-rawhide x64-opensuse-151-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: opensuse-151 x64-ubuntu-1804-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: ubuntu-1804 x64-ubuntu-2004-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: ubuntu-2004 @@ -192,7 +155,7 @@ aarch64-debian-9-container: NAME: debian-9-cross-aarch64 armv6l-debian-9-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-9-cross-armv6l @@ -202,12 +165,12 @@ armv7l-debian-9-container: NAME: debian-9-cross-armv7l mips-debian-9-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-9-cross-mips mips64el-debian-9-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-9-cross-mips64el @@ -227,7 +190,7 @@ s390x-debian-9-container: NAME: debian-9-cross-s390x aarch64-debian-10-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-10-cross-aarch64 @@ -257,7 +220,7 @@ mips64el-debian-10-container: NAME: debian-10-cross-mips64el mipsel-debian-10-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-10-cross-mipsel @@ -267,7 +230,7 @@ ppc64le-debian-10-container: NAME: debian-10-cross-ppc64le s390x-debian-10-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: debian-10-cross-s390x @@ -282,12 +245,12 @@ armv6l-debian-sid-container: NAME: debian-sid-cross-armv6l armv7-ldebian-sid-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: debian-sid-cross-armv7l i686-debian-sid-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-sid-cross-i686 @@ -302,7 +265,7 @@ mipsel-debian-sid-container: NAME: debian-sid-cross-mipsel ppc64le-debian-sid-container: - <<: *container_extra_job_definition + <<: *container_job_definition variables: NAME: debian-sid-cross-ppc64le @@ -312,12 +275,12 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x mingw32-fedora-rawhide-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: fedora-rawhide-cross-mingw32 mingw64-fedora-rawhide-container: - <<: *container_default_job_definition + <<: *container_job_definition variables: NAME: fedora-rawhide-cross-mingw64 @@ -325,72 +288,72 @@ mingw64-fedora-rawhide-container: # Native architecture build + test jobs x64-debian-9: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: debian-9 x64-debian-10: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: debian-10 x64-debian-sid: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: debian-sid x64-centos-7: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: centos-7 x64-centos-8: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: centos-8 x64-centos-stream: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: centos-stream x64-fedora-31: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: fedora-31 x64-fedora-32: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: fedora-32 x64-fedora-rawhide: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: fedora-rawhide x64-opensuse-151: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: opensuse-151 x64-ubuntu-1804: - <<: *native_build_extra_job_definition + <<: *native_build_job_definition variables: NAME: ubuntu-1804 x64-ubuntu-2004: - <<: *native_build_default_job_definition + <<: *native_build_job_definition variables: NAME: ubuntu-2004 x64-freebsd-12-build: - <<: *cirrus_build_default_job_definition + <<: *cirrus_build_job_definition variables: NAME: freebsd-12 x64-macos-1015-build: - <<: *cirrus_build_default_job_definition + <<: *cirrus_build_job_definition variables: NAME: macos-1015 @@ -398,67 +361,67 @@ x64-macos-1015-build: # Cross compiled build jobs armv6l-debian-9: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-9 CROSS: armv6l mips64el-debian-9: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-9 CROSS: mips64el mips-debian-9: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-9 CROSS: mips aarch64-debian-10: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-10 CROSS: aarch64 mipsel-debian-10: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-10 CROSS: mipsel s390x-debian-10: - <<: *cross_build_default_job_definition + <<: *cross_build_job_definition variables: NAME: debian-10 CROSS: s390x armv7l-debian-sid: - <<: *cross_build_default_job_definition + <<: *cross_build_job_definition variables: NAME: debian-sid CROSS: armv7l i686-debian-sid: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-sid CROSS: i686 ppc64le-debian-sid: - <<: *cross_build_extra_job_definition + <<: *cross_build_job_definition variables: NAME: debian-sid CROSS: ppc64le mingw32-fedora-rawhide: - <<: *cross_build_default_job_definition + <<: *cross_build_job_definition variables: NAME: fedora-rawhide CROSS: mingw32 mingw64-fedora-rawhide: - <<: *cross_build_default_job_definition + <<: *cross_build_job_definition variables: NAME: fedora-rawhide CROSS: mingw64 -- 2.25.4

2 2

[PATCH 00/25] Several g_auto* conversion and related small bugfixes
by Laine Stump 27 Jun '20

27 Jun '20

This started out with me noticing a memory leak in a patch that led to the realization that domain_conf.c hadn't been converted to use g_autofree yet, and each step of the way uncovered some other annoyance that I wanted to get rid of. Most of the changes are related to converting code to use g_auto*, g_new0, and g_free, but there is also a some of elimination of labels, fixing actual or theoretical memory leaks, modifications for style, etc. None of it should have any functional effect (except the fixing one or two memory leaks). Laine Stump (25): conf, vmx: check for OOM after calling xmlBufferCreate() use g_autoptr for all xmlBuffers conf: refactor virDomainBlkioDeviceParseXML to remove possible NULL dereference util: validate return from xmlNodeGetContent before use util: remove OOM error log from virGetHostnameImpl() conf: eliminate useless error label in virDomainFeaturesDefParse() util: eliminate error label in virDomainDefFormatInternalSetRootName() network: fix memory leak in networkBuildDhcpDaemonCommandLine() util: add g_autoptr cleanup function for virFirewall objects network: convert local pointers to g_auto* network: use g_free() in place of remaining VIR_FREE() network: make networkDnsmasqXmlNsDef private to bridge_driver.c define g_autoptr cleanup function for virNetworkDHCPLease network: replace VIR_ALLOC/REALLOC with g_new0/g_renew network: use proper arg type when calling virNetDevSetOnline() squash into 'network: convert local pointers to g_auto*' use g_autoptr() for all usages of virFirewallNew/Free nwfilter: define a typedef for struct ebtablesSubChainInst nwfilter replace VIR_ALLOC with g_new0 nwfilter: remove unnecessary code from ebtablesGetSubChainInsts() nwfilter: convert local pointers to use g_auto* nwfilter: convert remaining VIR_FREE() to g_free() nwfilter: transform logic in virNWFilterRuleInstSort to eliminate label nwfilter: use standard label names when reasonable replace g_new() with g_new0() for consistency src/conf/domain_conf.c | 254 +++++----- src/conf/network_conf.c | 10 +- src/datatypes.h | 2 + src/network/bridge_driver.c | 585 +++++++++------------- src/network/bridge_driver.h | 9 - src/network/bridge_driver_linux.c | 58 +-- src/network/leaseshelper.c | 16 +- src/nwfilter/nwfilter_dhcpsnoop.c | 150 +++--- src/nwfilter/nwfilter_driver.c | 13 +- src/nwfilter/nwfilter_ebiptables_driver.c | 277 ++++------ src/nwfilter/nwfilter_gentech_driver.c | 60 +-- src/nwfilter/nwfilter_learnipaddr.c | 45 +- src/qemu/qemu_backup.c | 2 +- src/util/virdnsmasq.h | 4 + src/util/virebtables.c | 24 +- src/util/virfirewall.h | 1 + src/util/viriptables.c | 14 +- src/util/virutil.c | 12 +- src/util/virxml.c | 12 +- src/vmx/vmx.c | 17 +- tests/qemuhotplugmock.c | 2 +- tests/virfirewalltest.c | 50 +- 22 files changed, 640 insertions(+), 977 deletions(-) -- 2.25.4

4 49

[PATCH libvirt v2 0/5] Fix zPCI address auto-generation on s390
by Shalini Chellathurai Saroja 26 Jun '20

26 Jun '20

The zPCI address validation or autogeneration does not work as expected in the following scenarios 1. uid = 0 and fid = 0 2. uid = 0 and fid > 0 3. uid = 0 and fid not specified 4. uid not specified and fid > 0 5. 2 zPCI devices with uid > 0 and fid not specified. This is because of the following reasons 1. If uid = 0 or fid = 0 the code assumes that user has not specified the corresponding address 2. If either uid or fid is provided, the code assumes that both uid and fid addresses are specified by the user. This patch fixes these issues. --- v2: - Call same function to reserve zPCI address when zPCI address is fully/partially/not specified by the user. - Redefine structure of zPCI address. - Add tests to verify the auto-generated xml(qemuxml2xmltest.c). - Separate/merge patches. - Minor changes based on review feedback. v1: https://www.redhat.com/archives/libvir-list/2020-April/msg00479.html Shalini Chellathurai Saroja (5): conf: use g_autofree to ensure automatic cleanup conf: fix zPCI address auto-generation on s390 qemu: move ZPCI uid validation into device validation tests: qemu: add more tests for ZPCI on S390 tests: add test with PCI and CCW device src/conf/device_conf.c | 45 +++++------ src/conf/domain_addr.c | 77 ++++++------------- src/conf/domain_conf.c | 10 ++- src/libvirt_private.syms | 4 +- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_validate.c | 18 ++++- src/util/virpci.c | 23 ++---- src/util/virpci.h | 15 +++- .../hostdev-vfio-zpci-autogenerate-fids.args | 31 ++++++++ .../hostdev-vfio-zpci-autogenerate-fids.xml | 29 +++++++ .../hostdev-vfio-zpci-autogenerate-uids.args | 31 ++++++++ .../hostdev-vfio-zpci-autogenerate-uids.xml | 29 +++++++ .../hostdev-vfio-zpci-ccw-memballoon.args | 28 +++++++ .../hostdev-vfio-zpci-ccw-memballoon.xml | 17 ++++ .../hostdev-vfio-zpci-duplicate.xml | 30 ++++++++ ...ostdev-vfio-zpci-invalid-uid-valid-fid.xml | 21 +++++ .../hostdev-vfio-zpci-set-zero.xml | 21 +++++ .../hostdev-vfio-zpci-uid-set-zero.xml | 20 +++++ tests/qemuxml2argvtest.c | 25 ++++++ .../hostdev-vfio-zpci-autogenerate-fids.xml | 43 +++++++++++ .../hostdev-vfio-zpci-autogenerate-uids.xml | 43 +++++++++++ .../hostdev-vfio-zpci-ccw-memballoon.xml | 32 ++++++++ tests/qemuxml2xmltest.c | 10 +++ 24 files changed, 498 insertions(+), 112 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml -- 2.25.4

5 20

[libvirt PATCH v2] ci: Use openSUSE image for code style checking
by Jonathon Jongsma 26 Jun '20

26 Jun '20

CentOS does not have the cppi package, so some code style checks are skipped. Switch to a openSUSE image to do the code style checks. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfb66a652d..5fbc82b3dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -496,7 +496,7 @@ website: codestyle: stage: builds - image: $CI_REGISTRY_IMAGE/ci-centos-8:latest + image: $CI_REGISTRY_IMAGE/ci-opensuse-151:latest before_script: - *script_variables script: -- 2.21.3

3 3

[libvirt PATCH v3 0/2] Refuse PCI Address for ramfb device definition
by Jonathon Jongsma 26 Jun '20

26 Jun '20

Changes in this version: - Add the test case input file - modify the test itself to properly fail when an input file is missing. Jonathon Jongsma (2): qemu: ramfb video device doesn't support PCI address tests: ensure failure if input file doesn't exist src/qemu/qemu_validate.c | 8 +++++ ...video-ramfb-display-device-pci-address.xml | 30 +++++++++++++++++++ tests/qemuxml2argvtest.c | 7 +++++ 3 files changed, 45 insertions(+) create mode 100644 tests/qemuxml2argvdata/video-ramfb-display-device-pci-address.xml -- 2.21.3

2 3

[PATCH libvirt-dbus v3 0/3] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 25 Jun '20

25 Jun '20

This introduces CI build coverage and then documents the switch to use merge requests. Daniel P. Berrangé (3): src: fix double free of virDomain object gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 218 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++ ci/containers/README.rst | 14 ++ ci/containers/libvirt-centos-7.Dockerfile | 90 ++++++++ ci/containers/libvirt-centos-8.Dockerfile | 68 ++++++ .../libvirt-centos-stream.Dockerfile | 69 ++++++ ci/containers/libvirt-debian-10.Dockerfile | 61 +++++ ci/containers/libvirt-debian-9.Dockerfile | 64 +++++ ci/containers/libvirt-debian-sid.Dockerfile | 61 +++++ ci/containers/libvirt-fedora-31.Dockerfile | 58 +++++ ci/containers/libvirt-fedora-32.Dockerfile | 58 +++++ .../libvirt-fedora-rawhide.Dockerfile | 59 +++++ ci/containers/libvirt-opensuse-151.Dockerfile | 60 +++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 64 +++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 61 +++++ ci/containers/refresh | 37 +++ src/domainsnapshot.c | 4 +- 18 files changed, 1072 insertions(+), 6 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst 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.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.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.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.26.2

2 4

[libvirt PATCH v2] qemu: ramfb video device doesn't support PCI address
by Jonathon Jongsma 25 Jun '20

25 Jun '20

Although a ramfb video device is not a PCI device, we don't currently report an error for ramfb device definitions containing a PCI address. However, a guest configured with such a device will fail to start: # virsh start test1 error: Failed to start domain test1 error: internal error: qemu unexpectedly closed the monitor: 2020-06-16T05:23:02.759221Z qemu-kvm: -device ramfb,id=video0,bus=pcie.0,addr=0x1: Device 'ramfb' can't go on PCIE bus A better approach is to reject any device definitions that contain PCI addresses. While this is a change in behavior, any existing configurations were non-functional. https://bugzilla.redhat.com/show_bug.cgi?id=1847259 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- changes in v2: - move validation to qemu-specific validation function as suggested by Laine src/qemu/qemu_validate.c | 8 ++++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 9 insertions(+) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 5082a29dc7..b13c03759e 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1925,6 +1925,14 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, if (qemuValidateDomainVirtioOptions(video->virtio, qemuCaps) < 0) return -1; + if (video->type == VIR_DOMAIN_VIDEO_TYPE_RAMFB && + video->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'address' is not supported for 'ramfb' video devices")); + return -1; + } + + return 0; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1195f9c982..f2522fa530 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2276,6 +2276,7 @@ mymain(void) QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS); DO_TEST_CAPS_LATEST("video-bochs-display-device"); DO_TEST_CAPS_LATEST("video-ramfb-display-device"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("video-ramfb-display-device-pci-address"); DO_TEST("video-none-device", QEMU_CAPS_VNC); DO_TEST_PARSE_ERROR("video-invalid-multiple-devices", NONE); -- 2.21.3

2 3

[PATCH] qemuxml2xmltest: Set dummy non-hypervisor drivers
by Michal Privoznik 25 Jun '20

25 Jun '20

When parsing domain XML post parse callbacks are run and one of them might try and call API from a non-hypervisor driver (e.g. just like qemuDomainDeviceNetDefPostParse() is doing - it calls a network API). To avoid this in the test suite, set dummy drivers, which renders all non-hypervisor APIs return error. This mimics what qemuxml2argvtest does. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemuxml2xmltest.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 5a124853b4..11ff17d83c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -135,6 +135,7 @@ mymain(void) char *fakerootdir; virQEMUDriverConfigPtr cfg = NULL; virHashTablePtr capslatest = NULL; + g_autoptr(virConnect) conn = NULL; capslatest = testQemuGetLatestCaps(); if (!capslatest) @@ -164,6 +165,16 @@ mymain(void) cfg = virQEMUDriverGetConfig(&driver); driver.privileged = true; + if (!(conn = virGetConnect())) + goto cleanup; + + virSetConnectInterface(conn); + virSetConnectNetwork(conn); + virSetConnectNWFilter(conn); + virSetConnectNodeDev(conn); + virSetConnectSecret(conn); + virSetConnectStorage(conn); + # define DO_TEST_INTERNAL(_name, suffix, when, ...) \ do { \ static struct testQemuInfo info = { \ @@ -1471,6 +1482,7 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-9p-multidevs"); DO_TEST("downscript", NONE); + cleanup: if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- 2.26.2

2 1

[PATCH libvirt-dbus v2 0/3] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 25 Jun '20

25 Jun '20

This introduces CI build coverage and then documents the switch to use merge requests. Daniel P. Berrangé (3): src: fix double free of virDomain object gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 218 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++ ci/containers/README.rst | 14 ++ ci/containers/libvirt-centos-7.Dockerfile | 90 ++++++++ ci/containers/libvirt-centos-8.Dockerfile | 68 ++++++ .../libvirt-centos-stream.Dockerfile | 69 ++++++ ci/containers/libvirt-debian-10.Dockerfile | 61 +++++ ci/containers/libvirt-debian-9.Dockerfile | 64 +++++ ci/containers/libvirt-debian-sid.Dockerfile | 61 +++++ ci/containers/libvirt-fedora-31.Dockerfile | 58 +++++ ci/containers/libvirt-fedora-32.Dockerfile | 58 +++++ .../libvirt-fedora-rawhide.Dockerfile | 59 +++++ ci/containers/libvirt-opensuse-151.Dockerfile | 60 +++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 64 +++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 61 +++++ ci/containers/refresh | 32 +++ src/domainsnapshot.c | 4 +- 18 files changed, 1067 insertions(+), 6 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst 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.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.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.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.26.2

2 10

[libvirt PATCH] ci: Refresh Dockerfiles
by Andrea Bolognani 25 Jun '20

25 Jun '20

All targets get pip3, which is now part of the base system, and the number of native packages included in the MinGW containers is significantly reduced. The corresponding libvirt-ci commit is 4ff697ba0b5d. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. ci/containers/libvirt-centos-8.Dockerfile | 1 + .../libvirt-centos-stream.Dockerfile | 1 + ...libvirt-debian-10-cross-aarch64.Dockerfile | 1 + .../libvirt-debian-10-cross-armv6l.Dockerfile | 1 + .../libvirt-debian-10-cross-armv7l.Dockerfile | 1 + .../libvirt-debian-10-cross-i686.Dockerfile | 1 + .../libvirt-debian-10-cross-mips.Dockerfile | 1 + ...ibvirt-debian-10-cross-mips64el.Dockerfile | 1 + .../libvirt-debian-10-cross-mipsel.Dockerfile | 1 + ...libvirt-debian-10-cross-ppc64le.Dockerfile | 1 + .../libvirt-debian-10-cross-s390x.Dockerfile | 1 + ci/containers/libvirt-debian-10.Dockerfile | 1 + ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 1 + ...libvirt-debian-sid-cross-armv6l.Dockerfile | 1 + ...libvirt-debian-sid-cross-armv7l.Dockerfile | 1 + .../libvirt-debian-sid-cross-i686.Dockerfile | 1 + ...bvirt-debian-sid-cross-mips64el.Dockerfile | 1 + ...libvirt-debian-sid-cross-mipsel.Dockerfile | 1 + ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 1 + .../libvirt-debian-sid-cross-s390x.Dockerfile | 1 + ci/containers/libvirt-debian-sid.Dockerfile | 1 + ci/containers/libvirt-fedora-31.Dockerfile | 1 + ci/containers/libvirt-fedora-32.Dockerfile | 1 + ...rt-fedora-rawhide-cross-mingw32.Dockerfile | 42 +------------------ ...rt-fedora-rawhide-cross-mingw64.Dockerfile | 42 +------------------ .../libvirt-fedora-rawhide.Dockerfile | 1 + ci/containers/libvirt-ubuntu-2004.Dockerfile | 1 + 27 files changed, 29 insertions(+), 80 deletions(-) diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libvirt-centos-8.Dockerfile index b6510834de..f376126d93 100644 --- a/ci/containers/libvirt-centos-8.Dockerfile +++ b/ci/containers/libvirt-centos-8.Dockerfile @@ -76,6 +76,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers/libvirt-centos-stream.Dockerfile index f65580b67d..bc75c95193 100644 --- a/ci/containers/libvirt-centos-stream.Dockerfile +++ b/ci/containers/libvirt-centos-stream.Dockerfile @@ -77,6 +77,7 @@ RUN dnf install -y centos-release-stream && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile index 3620bbdf7f..a03a7fd26a 100644 --- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile index 5d390d0160..4f673cb3e2 100644 --- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile index 2fdbe99bff..fa5fae4399 100644 --- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile index 6517a4cb2e..a3bc96ac7a 100644 --- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile index 48a45dbb7a..14844307c0 100644 --- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile index 1d997185e4..6f27e462b9 100644 --- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile index 332f2b13ed..4da9d1cb6e 100644 --- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile index ec116175fc..841706bab8 100644 --- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile index b8cd02ae69..01a5bb5a77 100644 --- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile index de795d386c..2b1c1b9855 100644 --- a/ci/containers/libvirt-debian-10.Dockerfile +++ b/ci/containers/libvirt-debian-10.Dockerfile @@ -81,6 +81,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile index a5d9a1d655..f573b8475a 100644 --- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile index 9af186743f..2a9f81a15b 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile index 7e00d6c320..3e37184069 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile index d30468e8c6..e167a43b56 100644 --- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile index 23399cb0f5..57ef04771e 100644 --- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile index c4f70dbace..a174fb57fd 100644 --- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile index 6c093efea8..d1c412c452 100644 --- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile index e536587bc7..2dffc08895 100644 --- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile @@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile index 4e60303356..5b7b980419 100644 --- a/ci/containers/libvirt-debian-sid.Dockerfile +++ b/ci/containers/libvirt-debian-sid.Dockerfile @@ -81,6 +81,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/libvirt-fedora-31.Dockerfile index 40288a2d03..06bd1435d3 100644 --- a/ci/containers/libvirt-fedora-31.Dockerfile +++ b/ci/containers/libvirt-fedora-31.Dockerfile @@ -74,6 +74,7 @@ RUN dnf update -y && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile index ddb6378350..7b8a3fff44 100644 --- a/ci/containers/libvirt-fedora-32.Dockerfile +++ b/ci/containers/libvirt-fedora-32.Dockerfile @@ -74,6 +74,7 @@ RUN dnf update -y && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile index cdf61fe845..ac5ecc2958 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile @@ -3,97 +3,59 @@ FROM fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ - audit-libs-devel \ augeas \ autoconf \ automake \ - avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ chrony \ cppi \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ dnsmasq \ dwarves \ ebtables \ - fuse-devel \ gcc \ gdb \ - gettext \ gettext-devel \ git \ - glib2-devel \ - glibc-devel \ glibc-langpack-en \ - glusterfs-api-devel \ - gnutls-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ libtool \ - libudev-devel \ libwsman-devel \ libxml2 \ - libxml2-devel \ libxslt \ lsof \ lvm2 \ make \ meson \ - ncurses-devel \ net-tools \ - netcf-devel \ nfs-utils \ ninja-build \ - numactl-devel \ numad \ parted \ - parted-devel \ patch \ perl \ - pkgconfig \ polkit \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ radvd \ - readline-devel \ rpcgen \ rpm-build \ - sanlock-devel \ screen \ scrub \ sheepdog \ strace \ sudo \ - systemtap-sdt-devel \ vim \ - wireshark-devel \ - xen-devel \ - xfsprogs-devel \ - yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ dnf clean all -y && \ @@ -109,9 +71,9 @@ RUN dnf install -y \ mingw32-gettext \ mingw32-glib2 \ mingw32-gnutls \ + mingw32-headers \ mingw32-libssh2 \ mingw32-libxml2 \ - mingw32-openssl \ mingw32-pkg-config \ mingw32-portablexdr \ mingw32-readline && \ diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile index 2b7f9eeac1..e52e2fed04 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile @@ -3,97 +3,59 @@ FROM fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ - audit-libs-devel \ augeas \ autoconf \ automake \ - avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ chrony \ cppi \ - cyrus-sasl-devel \ - dbus-devel \ - device-mapper-devel \ dnsmasq \ dwarves \ ebtables \ - fuse-devel \ gcc \ gdb \ - gettext \ gettext-devel \ git \ - glib2-devel \ - glibc-devel \ glibc-langpack-en \ - glusterfs-api-devel \ - gnutls-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libiscsi-devel \ - libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ libtool \ - libudev-devel \ libwsman-devel \ libxml2 \ - libxml2-devel \ libxslt \ lsof \ lvm2 \ make \ meson \ - ncurses-devel \ net-tools \ - netcf-devel \ nfs-utils \ ninja-build \ - numactl-devel \ numad \ parted \ - parted-devel \ patch \ perl \ - pkgconfig \ polkit \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ radvd \ - readline-devel \ rpcgen \ rpm-build \ - sanlock-devel \ screen \ scrub \ sheepdog \ strace \ sudo \ - systemtap-sdt-devel \ vim \ - wireshark-devel \ - xen-devel \ - xfsprogs-devel \ - yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ dnf clean all -y && \ @@ -109,9 +71,9 @@ RUN dnf install -y \ mingw64-gettext \ mingw64-glib2 \ mingw64-gnutls \ + mingw64-headers \ mingw64-libssh2 \ mingw64-libxml2 \ - mingw64-openssl \ mingw64-pkg-config \ mingw64-portablexdr \ mingw64-readline && \ diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile index 28400a4e53..d3c97ddda0 100644 --- a/ci/containers/libvirt-fedora-rawhide.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile @@ -75,6 +75,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ python3 \ python3-docutils \ python3-flake8 \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-img \ diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile index 98178b1591..855b673f87 100644 --- a/ci/containers/libvirt-ubuntu-2004.Dockerfile +++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile @@ -82,6 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ policykit-1 \ python3 \ python3-docutils \ + python3-pip \ python3-setuptools \ python3-wheel \ qemu-utils \ -- 2.25.4

2 2

[libvirt PATCH] qemu: ramfb video device doesn't support PCI address
by Jonathon Jongsma 25 Jun '20

25 Jun '20

Although a ramfb video device is not a PCI device, we don't currently report an error for ramfb device definitions containing a PCI address. However, a guest configured with such a device will fail to start: # virsh start test1 error: Failed to start domain test1 error: internal error: qemu unexpectedly closed the monitor: 2020-06-16T05:23:02.759221Z qemu-kvm: -device ramfb,id=video0,bus=pcie.0,addr=0x1: Device 'ramfb' can't go on PCIE bus A better approach is to reject any device definitions that contain PCI addresses. While this is a change in behavior, any existing configurations were non-functional. https://bugzilla.redhat.com/show_bug.cgi?id=1847259 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/domain_conf.c | 7 +++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fc7fcfb0c6..1a06cb3f4b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6608,6 +6608,13 @@ virDomainVideoDefValidate(const virDomainVideoDef *video, return -1; } + if (video->type == VIR_DOMAIN_VIDEO_TYPE_RAMFB && + video->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'address' is not supported for 'ramfb' video devices")); + return -1; + } + /* it doesn't make sense to pair video device type 'none' with any other * types, there can be only a single video device in such case */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1195f9c982..f2522fa530 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2276,6 +2276,7 @@ mymain(void) QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS); DO_TEST_CAPS_LATEST("video-bochs-display-device"); DO_TEST_CAPS_LATEST("video-ramfb-display-device"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("video-ramfb-display-device-pci-address"); DO_TEST("video-none-device", QEMU_CAPS_VNC); DO_TEST_PARSE_ERROR("video-invalid-multiple-devices", NONE); -- 2.21.3

3 3

[PATCH] qemuDomainDeviceNetDefPostParse: Switch order of conditions
by Michal Privoznik 25 Jun '20

25 Jun '20

A few commits back (in v6.4.0-131-gbdb8f2e418) the post parse function for domain interface was changed so that it doesn't fill in model for hostdev types of interfaces (including network type interfaces which would end up hostdevs). While the idea is sound, the execution can be a bit better: virDomainNetResolveActualType() which is used to determine runtime type of given interface is heavy gun - it connects to network driver, fetches network XML, parses it. This all is followed by check whether the interface doesn't already have model set (from domain XML). If we switch the order of these two checks then the short circuit evaluation will ensure the expensive check is done only if really needed. This commit in fact fixes qemuxml2xmltest which due to lacking fake network driver tries to connect to network:///session and start the virtnetworkd. Fortunately, because of v6.3.0-25-gf28fbb05d3 it fails to do so and virDomainNetResolveActualType() returns -1. The only reason we don't see the test failing is because our input XMLs have model and thus we are saved by the latter (now former) check. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- While this patch is technically correct (the best way to be correct), it can also be viewed as papering over the real issue. Question is, how to address that. Nor xml2xml test nor xml2argv test are creating fake network driver. Is mocking virDomainNetResolveActualType() the way to go then? Or should we create the fake network driver with networks and everything? src/qemu/qemu_domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2efbf1a4b3..c5b8d91f9a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5230,8 +5230,8 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net, virQEMUCapsPtr qemuCaps) { if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && - virDomainNetResolveActualType(net) != VIR_DOMAIN_NET_TYPE_HOSTDEV && - !virDomainNetGetModelString(net)) + !virDomainNetGetModelString(net) && + virDomainNetResolveActualType(net) != VIR_DOMAIN_NET_TYPE_HOSTDEV) net->model = qemuDomainDefaultNetModel(def, qemuCaps); return 0; -- 2.26.2

3 4

[libvirt-cim PATCH v2 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 25 Jun '20

25 Jun '20

Daniel P. Berrangé (2): gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 114 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/containers/README.rst | 14 +++ ci/containers/libvirt-centos-7.Dockerfile | 96 +++++++++++++++ ci/containers/libvirt-fedora-31.Dockerfile | 56 +++++++++ ci/containers/libvirt-fedora-32.Dockerfile | 56 +++++++++ .../libvirt-fedora-rawhide.Dockerfile | 57 +++++++++ ci/containers/refresh | 27 +++++ 9 files changed, 448 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.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.Dockerfile create mode 100755 ci/containers/refresh -- 2.26.2

2 3

[RFC PATCH] docs: backup: Convert XML documentation to RST
by Peter Krempa 25 Jun '20

25 Jun '20

Switch to the new format for easier extension. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This was a surprisingly easy conversion done using: pandoc --from html --to rst --toc --columns 80 --standalone formatbackup.html.in -o formatbackup.rst The file generated by pandoc required following manual tweaks: 1) table of contents command needed to be moved after the first heading 2) definition list entries were not separated by an empty line 3) XML examples had one extra line with spaces only (Faithfully ported from html) Here both versions can be compared: https://pipo.sk.gitlab.io/-/libvirt/-/jobs/611434730/artifacts/website/form… https://libvirt.org/formatbackup.html docs/formatbackup.html.in | 191 -------------------------------------- docs/formatbackup.rst | 149 +++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 191 deletions(-) delete mode 100644 docs/formatbackup.html.in create mode 100644 docs/formatbackup.rst diff --git a/docs/formatbackup.html.in b/docs/formatbackup.html.in deleted file mode 100644 index 9e69d8f7d3..0000000000 --- a/docs/formatbackup.html.in +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml"> - <body> - <h1>Backup XML format</h1> - - <ul id="toc"></ul> - - <h2><a id="BackupAttributes">Backup XML</a></h2> - - <p> - Creating a backup, whether full or incremental, is done - via <code>virDomainBackupBegin()</code>, which takes an XML - description of the actions to perform, as well as an optional - second XML document <a href="formatcheckpoint.html">describing a - checkpoint</a> to create at the same point in time. See - also <a href="kbase/domainstatecapture.html">a comparison</a> between - the various state capture APIs. - </p> - <p> - There are two general modes for backups: a push mode (where the - hypervisor writes out the data to the destination file, which - may be local or remote), and a pull mode (where the hypervisor - creates an NBD server that a third-party client can then read as - needed, and which requires the use of temporary storage, - typically local, until the backup is complete). - </p> - <p> - The instructions for beginning a backup job are provided as - attributes and elements of the - top-level <code>domainbackup</code> element. This element - includes an optional attribute <code>mode</code> which can be - either "push" or "pull" (default - push). <code>virDomainBackupGetXMLDesc()</code> can be used to - see the actual values selected for elements omitted during - creation (for example, learning which port the NBD server is - using in the pull model or what file names libvirt generated - when none were supplied). The following child elements and attributes - are supported: - </p> - <dl> - <dt><code>incremental</code></dt> - <dd>An optional element giving the name of an existing - checkpoint of the domain, which will be used to make this - backup an incremental one. In the push model, only changes - since the named checkpoint are written to the destination. In - the pull model, the NBD server uses the - NBD_OPT_SET_META_CONTEXT extension to advertise to the client - which portions of the export contain changes since the named - checkpoint. If omitted, a full backup is performed. - </dd> - <dt><code>server</code></dt> - <dd>Present only for a pull mode backup. Contains the same - attributes as - the <a href="formatdomain.html#elementsDisks"><code>protocol</code> - element of a disk</a> attached via NBD in the domain (such as - transport, socket, name, port, or tls), necessary to set up an - NBD server that exposes the content of each disk at the time - the backup is started. - </dd> - <dt><code>disks</code></dt> - <dd>An optional listing of instructions for disks participating - in the backup (if omitted, all disks participate and libvirt - attempts to generate filenames by appending the current - timestamp as a suffix). If the entire element was omitted on - input, then all disks participate in the backup, otherwise, - only the disks explicitly listed which do not also - use <code>backup='no'</code> will participate. On output, this - is the state of each of the domain's disk in relation to the - backup operation. - <dl> - <dt><code>disk</code></dt> - <dd>This sub-element describes the backup properties of a - specific disk, with the following attributes and child - elements: - <dl> - <dt><code>name</code></dt> - <dd>A mandatory attribute which must match - the <code><target dev='name'/></code> - of one of - the <a href="formatdomain.html#elementsDisks">disk - devices</a> specified for the domain at the time of - the checkpoint.</dd> - <dt><code>backup</code></dt> - <dd>Setting this attribute to <code>yes</code>(default) specifies - that the disk should take part in the backup and using - <code>no</code> excludes the disk from the backup.</dd> - <dt><code>exportname</code></dt> - <dd>Allows modification of the NBD export name for the given disk. - By default equal to disk target. - Valid only for pull mode backups.</dd> - <dt><code>exportbitmap</code></dt> - <dd>Allows modification of the name of the bitmap describing dirty - blocks for an incremental backup exported via NBD export name - for the given disk. - Valid only for pull mode backups.</dd> - <dt><code>type</code></dt> - <dd>A mandatory attribute to describe the type of the - disk, except when <code>backup='no'</code> is - used. Valid values include <code>file</code>, or - <code>block</code>. - Similar to a disk declaration for a domain, the choice of type - controls what additional sub-elements are needed to describe - the destination.</dd> - <dt><code>target</code></dt> - <dd>Valid only for push mode backups, this is the - primary sub-element that describes the file name of - the backup destination, similar to - the <code>source</code> sub-element of a domain - disk. An optional sub-element <code>driver</code> can - also be used, with an attribute <code>type</code> to - specify a destination format different from - qcow2. See documentation for <code>scratch</code> below for - additional configuration.</dd> - <dt><code>scratch</code></dt> - <dd>Valid only for pull mode backups, this is the - primary sub-element that describes the file name of - the local scratch file to be used in facilitating the - backup, and is similar to the <code>source</code> - sub-element of a domain disk. Currently only <code>file</code> - and <code>block</code> scratch storage is supported. The - <code>file</code> scratch file is created and deleted by - libvirt in the given location. A <code>block</code> scratch - device must exist prior to starting the backup and is formatted. - The block device must have enough space for the corresponding - disk data including format overhead. - - If <code>VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL</code> flag is - used the file for a scratch of <code>file</code> type must - exist with the correct format and size to hold the copy and is - used without modification. The file is not deleted after the - backup but the contents of the file don't make sense outside - of the backup. The same applies for the block device which - must be formatted appropriately. - - Similarly to the domain - <a href="formatdomain.html#elementsDisks"><code>disk</code></a> - definition <code>scratch</code> and <code>target</code> can - contain <code>seclabel</code> and/or <code>encryption</code> - subelements to configure the corresponding properties. - </dd> - </dl> - </dd> - </dl> - </dd> - </dl> - - <h2><a id="example">Examples</a></h2> - - <p>Use <code>virDomainBackupBegin()</code> to perform a full - backup using push mode. The example lets libvirt pick the - destination and format for 'vda', fully specifies that we want a - raw backup of 'vdb', and omits 'vdc' from the operation. - </p> - <pre> -<domainbackup> - <disks> - <disk name='vda' backup='yes'/> - <disk name='vdb' type='file'> - <target file='/path/to/vdb.backup'/> - <driver type='raw'/> - </disk> - <disk name='vdc' backup='no'/> - </disks> -</domainbackup> - </pre> - - <p>If the previous full backup also passed a parameter describing - <a href="formatcheckpoint.html">checkpoint XML</a> that resulted - in a checkpoint named <code>1525889631</code>, we can make - another call to <code>virDomainBackupBegin()</code> to perform - an incremental backup of just the data changed since that - checkpoint, this time using the following XML to start a pull - model export of the 'vda' and 'vdb' disks, where a third-party - NBD client connecting to '/path/to/server' completes the backup - (omitting 'vdc' from the explicit list has the same effect as - the backup='no' from the previous example): - </p> - <pre> -<domainbackup mode="pull"> - <incremental>1525889631</incremental> - <server transport="unix" socket="/path/to/server"/> - <disks> - <disk name='vda' backup='yes' type='file'> - <scratch file='/path/to/file1.scratch'/> - </disk> - </disks> -</domainbackup> - </pre> - </body> -</html> diff --git a/docs/formatbackup.rst b/docs/formatbackup.rst new file mode 100644 index 0000000000..66583f562b --- /dev/null +++ b/docs/formatbackup.rst @@ -0,0 +1,149 @@ +Backup XML format +================= + +.. contents:: + +Backup XML +---------- + +Creating a backup, whether full or incremental, is done via +``virDomainBackupBegin()``, which takes an XML description of the actions to +perform, as well as an optional second XML document `describing a +checkpoint <formatcheckpoint.html>`__ to create at the same point in time. See +also `a comparison <kbase/domainstatecapture.html>`__ between the various state +capture APIs. + +There are two general modes for backups: a push mode (where the hypervisor +writes out the data to the destination file, which may be local or remote), and +a pull mode (where the hypervisor creates an NBD server that a third-party +client can then read as needed, and which requires the use of temporary storage, +typically local, until the backup is complete). + +The instructions for beginning a backup job are provided as attributes and +elements of the top-level ``domainbackup`` element. This element includes an +optional attribute ``mode`` which can be either "push" or "pull" (default push). +``virDomainBackupGetXMLDesc()`` can be used to see the actual values selected +for elements omitted during creation (for example, learning which port the NBD +server is using in the pull model or what file names libvirt generated when none +were supplied). The following child elements and attributes are supported: + +``incremental`` + An optional element giving the name of an existing checkpoint of the domain, + which will be used to make this backup an incremental one. In the push model, + only changes since the named checkpoint are written to the destination. In + the pull model, the NBD server uses the NBD_OPT_SET_META_CONTEXT extension to + advertise to the client which portions of the export contain changes since + the named checkpoint. If omitted, a full backup is performed. + +``server`` + Present only for a pull mode backup. Contains the same attributes as the + ```protocol`` element of a disk <formatdomain.html#elementsDisks>`__ attached + via NBD in the domain (such as transport, socket, name, port, or tls), + necessary to set up an NBD server that exposes the content of each disk at + the time the backup is started. + +``disks`` + An optional listing of instructions for disks participating in the backup (if + omitted, all disks participate and libvirt attempts to generate filenames by + appending the current timestamp as a suffix). If the entire element was + omitted on input, then all disks participate in the backup, otherwise, only + the disks explicitly listed which do not also use ``backup='no'`` will + participate. On output, this is the state of each of the domain's disk in + relation to the backup operation. + + ``disk`` + This sub-element describes the backup properties of a specific disk, with + the following attributes and child elements: + + ``name`` + A mandatory attribute which must match the ``<target dev='name'/>`` of + one of the `disk devices <formatdomain.html#elementsDisks>`__ specified + for the domain at the time of the checkpoint. + + ``backup`` + Setting this attribute to ``yes``\ (default) specifies that the disk + should take part in the backup and using ``no`` excludes the disk from + the backup. + + ``exportname`` + Allows modification of the NBD export name for the given disk. By + default equal to disk target. Valid only for pull mode backups. + + ``exportbitmap`` + Allows modification of the name of the bitmap describing dirty blocks + for an incremental backup exported via NBD export name for the given + disk. Valid only for pull mode backups. + + ``type`` + A mandatory attribute to describe the type of the disk, except when + ``backup='no'`` is used. Valid values include ``file``, or ``block``. + Similar to a disk declaration for a domain, the choice of type controls + what additional sub-elements are needed to describe the destination. + + ``target`` + Valid only for push mode backups, this is the primary sub-element that + describes the file name of the backup destination, similar to the + ``source`` sub-element of a domain disk. An optional sub-element + ``driver`` can also be used, with an attribute ``type`` to specify a + destination format different from qcow2. See documentation for + ``scratch`` below for additional configuration. + + ``scratch`` + Valid only for pull mode backups, this is the primary sub-element that + describes the file name of the local scratch file to be used in + facilitating the backup, and is similar to the ``source`` sub-element + of a domain disk. Currently only ``file`` and ``block`` scratch storage + is supported. The ``file`` scratch file is created and deleted by + libvirt in the given location. A ``block`` scratch device must exist + prior to starting the backup and is formatted. The block device must + have enough space for the corresponding disk data including format + overhead. If ``VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL`` flag is used + the file for a scratch of ``file`` type must exist with the correct + format and size to hold the copy and is used without modification. The + file is not deleted after the backup but the contents of the file don't + make sense outside of the backup. The same applies for the block device + which must be formatted appropriately. Similarly to the domain + ```disk`` <formatdomain.html#elementsDisks>`__ definition ``scratch`` + and ``target`` can contain ``seclabel`` and/or ``encryption`` + subelements to configure the corresponding properties. + +Examples +-------- + +Use ``virDomainBackupBegin()`` to perform a full backup using push mode. The +example lets libvirt pick the destination and format for 'vda', fully specifies +that we want a raw backup of 'vdb', and omits 'vdc' from the operation. + +:: + + <domainbackup> + <disks> + <disk name='vda' backup='yes'/> + <disk name='vdb' type='file'> + <target file='/path/to/vdb.backup'/> + <driver type='raw'/> + </disk> + <disk name='vdc' backup='no'/> + </disks> + </domainbackup> + +If the previous full backup also passed a parameter describing `checkpoint +XML <formatcheckpoint.html>`__ that resulted in a checkpoint named +``1525889631``, we can make another call to ``virDomainBackupBegin()`` to +perform an incremental backup of just the data changed since that checkpoint, +this time using the following XML to start a pull model export of the 'vda' and +'vdb' disks, where a third-party NBD client connecting to '/path/to/server' +completes the backup (omitting 'vdc' from the explicit list has the same effect +as the backup='no' from the previous example): + +:: + + <domainbackup mode="pull"> + <incremental>1525889631</incremental> + <server transport="unix" socket="/path/to/server"/> + <disks> + <disk name='vda' backup='yes' type='file'> + <scratch file='/path/to/file1.scratch'/> + </disk> + </disks> + </domainbackup> -- 2.26.2

1 0

[PATCH libvirt-cim 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 25 Jun '20

25 Jun '20

Daniel P. Berrangé (2): gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 130 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 ++++ ci/containers/README.rst | 14 ++ ci/containers/libvirt-centos-7.Dockerfile | 89 ++++++++++++ ci/containers/libvirt-fedora-31.Dockerfile | 56 ++++++++ ci/containers/libvirt-fedora-32.Dockerfile | 56 ++++++++ .../libvirt-fedora-rawhide.Dockerfile | 65 +++++++++ ci/containers/refresh | 27 ++++ 9 files changed, 465 insertions(+), 4 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.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.Dockerfile create mode 100755 ci/containers/refresh -- 2.26.2

2 7

[PATCH 0/6] kbase: Improve incremental backup docs
by Peter Krempa 25 Jun '20

25 Jun '20

Refactor some sections, get rid of bash in favor of pseudo-code and describe block-commit. Peter Krempa (6): kbase: incrementalbackupinternals: Add snapshot terminology kbase: incrementalbackupinternals: Clarify language in snapshots section kbase: incrementalbackupinternals: Add secion on bitmap handling in shell kbase: incrementalbackupinternals: Add section on 'qemu-img bitmap' use kbase: incrementalbackupinternals: Replace bash with pseudocode kbase: incrementalbackupinternals: Describe 'block commit' docs/kbase/incrementalbackupinternals.rst | 175 +++++++++++++++------- 1 file changed, 121 insertions(+), 54 deletions(-) -- 2.26.2

2 14

[PATCH] NEWS: mention fix for crash in qemuDomainBlockCommit
by Peter Krempa 25 Jun '20

25 Jun '20

There were two upstream issues filed for the problem so it's worth mentioning. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 2fc43c31b9..54b1e4a992 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -51,6 +51,11 @@ v6.5.0 (unreleased) * **Bug fixes** + * qemu: fixed crash in ``qemuDomainBlockCommit`` + + This release fixes a regression which was introduced in libvirt v6.4.0 + where libvirtd always crashes when a block commit of a disk is requested. + v6.4.0 (2020-06-02) =================== -- 2.26.2

2 1

[PATCH] network: Fix a race condition when shutdown & start vm at the same time
by Bingsong Si 25 Jun '20

25 Jun '20

when shutdown vm, the qemuProcessStop cleanup virtual interface in two steps: 1. qemuProcessKill kill qemu process, and vif disappeared 2. ovs-vsctl del-port from the brige if start a vm in the middle of the two steps, the new vm will reused the vif, but removed from bridge by step 2 Signed-off-by: Bingsong Si <owen.si(a)ucloud.cn> --- src/qemu/qemu_process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d36088ba98..706248815a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7483,9 +7483,11 @@ void qemuProcessStop(virQEMUDriverPtr driver, if (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_MIDONET) { ignore_value(virNetDevMidonetUnbindPort(vport)); } else if (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); + virMacAddr mac; + if (virNetDevGetMAC(net->ifname, &mac) < 0 || !virMacAddrCmp(&mac, &net->mac)) + ignore_value(virNetDevOpenvswitchRemovePort( + virDomainNetGetActualBridgeName(net), + net->ifname)); } } -- 2.18.2

6 10

[libvirt-publican PATCH 0/3] introduce GitLab CI and merge requests
by Daniel P. Berrangé 24 Jun '20

24 Jun '20

The publican theme is used by the libvirt-appdev-guide-python, so we should test it. Daniel P. Berrangé (3): cfg: remove obsolete "release" config entry gitlab: introduce CI jobs for building content gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 118 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/containers/README.rst | 14 +++ ci/containers/libvirt-centos-7.Dockerfile | 83 ++++++++++++ .../libvirt-centos-stream.Dockerfile | 52 ++++++++ ci/containers/libvirt-debian-10.Dockerfile | 53 ++++++++ ci/containers/libvirt-debian-9.Dockerfile | 56 +++++++++ ci/containers/libvirt-debian-sid.Dockerfile | 53 ++++++++ ci/containers/libvirt-fedora-31.Dockerfile | 50 ++++++++ ci/containers/libvirt-fedora-32.Dockerfile | 50 ++++++++ .../libvirt-fedora-rawhide.Dockerfile | 51 ++++++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 56 +++++++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 53 ++++++++ ci/containers/refresh | 22 ++++ publican.cfg | 1 - 16 files changed, 739 insertions(+), 5 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-centos-7.Dockerfile create mode 100644 ci/containers/libvirt-centos-stream.Dockerfile create mode 100644 ci/containers/libvirt-debian-10.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.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.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.26.2

2 6

[PATCH libvirt-dbus 0/3] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 24 Jun '20

24 Jun '20

This introduces CI build coverage and then documents the switch to use merge requests. Daniel P. Berrangé (3): src: fix double free of virDomain object gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 218 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++ ci/containers/libvirt-centos-7.Dockerfile | 90 ++++++++ ci/containers/libvirt-centos-8.Dockerfile | 68 ++++++ .../libvirt-centos-stream.Dockerfile | 69 ++++++ ci/containers/libvirt-debian-10.Dockerfile | 61 +++++ ci/containers/libvirt-debian-9.Dockerfile | 64 +++++ ci/containers/libvirt-debian-sid.Dockerfile | 61 +++++ ci/containers/libvirt-fedora-31.Dockerfile | 58 +++++ ci/containers/libvirt-fedora-32.Dockerfile | 58 +++++ .../libvirt-fedora-rawhide.Dockerfile | 59 +++++ ci/containers/libvirt-opensuse-151.Dockerfile | 60 +++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 64 +++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 61 +++++ src/domainsnapshot.c | 4 +- 16 files changed, 1021 insertions(+), 6 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.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.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.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.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 -- 2.26.2

2 6

[GSoC][PATCH 0/2] Extracting qemu domain jobs into a separate file
by Prathamesh Chavan 24 Jun '20

24 Jun '20

These patches aim towards extracting out the domain jobs into a separate file. Curretnly, we have named it as `qemu_domainjob`, keeping it similar to the already exisiting `qemu_blockjob` files. Prathamesh Chavan (2): qemu_domain: Avoid using qemuDomainObjPrivatePtr as parameter qemu_domainjob: moved domain job APIs to a separate file po/POTFILES.in | 1 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_domain.c | 1172 +----------------------------------- src/qemu/qemu_domain.h | 247 +------- src/qemu/qemu_domainjob.c | 1192 +++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domainjob.h | 269 +++++++++ 6 files changed, 1472 insertions(+), 1411 deletions(-) create mode 100644 src/qemu/qemu_domainjob.c create mode 100644 src/qemu/qemu_domainjob.h -- 2.17.1

2 3

[PATCH] spec: Add the build dependency of make
by Han Han 24 Jun '20

24 Jun '20

For some minimal OS like fedora cloud image, the make is not installed by default. Signed-off-by: Han Han <hhan(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index cd7c33ab1a..9f24e06aa4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -269,6 +269,7 @@ BuildRequires: python36-docutils BuildRequires: python3-docutils %endif BuildRequires: gcc +BuildRequires: make BuildRequires: git %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: perl-interpreter -- 2.24.0.rc1

2 1

[PATCH 0/3] leaseshelper: Wait to acquire PID file
by Michal Privoznik 24 Jun '20

24 Jun '20

Patch 1/3 is for demonstration purposes only. The rest patches actual problem.I was also thinking of making the PID file per bridge, i.e. include bridge name in the name (e.g. /var/run/virbr0_leaseshelper.pid) to decrease pressure on the single PID file. However, DHCP transactions are not that frequent IMO so it's not really a bottle neck nor performance issue. Michal Prívozník (3): *** DO NOT APPLY UPSTREAM *** leaseshelper: Wait to acquire PID file leaseshelper: Report more errors src/network/leaseshelper.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) -- 2.26.2

3 9

[libvirt-sandbox PATCH v2] gitlab: introduce CI jobs testing git master & distro libvirt
by Daniel P. Berrangé 24 Jun '20

24 Jun '20

The sandbox build needs to validate one axis - A variety of libvirt versions We test a variety of libvirt versions by running a build against the distro provided libvirt packages. All that is then missing is a build against the latest libvirt git master, which only needs to be run on a single distro, for which Ubuntu 20.04 is picked as a stable long life base. Several distros are not included because they don't provide the package pre-requisites. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 178 ++++++++++++++++++ ci/containers/README.rst | 14 ++ ci/containers/libvirt-debian-10.Dockerfile | 64 +++++++ ci/containers/libvirt-debian-9.Dockerfile | 67 +++++++ ci/containers/libvirt-debian-sid.Dockerfile | 64 +++++++ ci/containers/libvirt-fedora-31.Dockerfile | 64 +++++++ ci/containers/libvirt-fedora-32.Dockerfile | 64 +++++++ .../libvirt-fedora-rawhide.Dockerfile | 65 +++++++ ci/containers/libvirt-opensuse-151.Dockerfile | 66 +++++++ ci/containers/libvirt-ubuntu-1804.Dockerfile | 67 +++++++ ci/containers/libvirt-ubuntu-2004.Dockerfile | 69 +++++++ ci/containers/refresh | 27 +++ 12 files changed, 809 insertions(+) create mode 100644 ci/containers/README.rst create mode 100644 ci/containers/libvirt-debian-10.Dockerfile create mode 100644 ci/containers/libvirt-debian-9.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.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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50dae92..3de5392 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,91 @@ 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-sandbox/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/containers/libvirt-$NAME.Dockerfile" ci + - docker push "$TAG" + after_script: + - docker logout + +.script_variables: &script_variables | + export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)" + export SCRATCH_DIR="/tmp/scratch" + export VROOT="$SCRATCH_DIR/vroot" + export CCACHE_DIR="$PWD/ccache" + export CCACHE_MAXSIZE="500M" + export PATH="$CCACHE_WRAPPERSDIR:$VROOT/bin:$PATH" + export PKG_CONFIG_PATH="$VROOT/lib/pkgconfig" + export XDG_DATA_DIRS="$VROOT/share:/usr/share" + export GI_TYPELIB_PATH="$VROOT/lib/girepository-1.0" + export LD_LIBRARY_PATH="$VROOT/lib" + +.git_native_build_job_template: &git_native_build_job_definition + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + stage: builds + cache: + paths: + - ccache/ + key: "$CI_JOB_NAME" + before_script: + - *script_variables + 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-glib.git + - mkdir libvirt/build + - cd libvirt/build + - ../autogen.sh --prefix="$VROOT" --without-libvirtd + - $MAKE install + - cd ../.. + - mkdir libvirt-glib/build + - cd libvirt-glib/build + - ../autogen.sh --prefix="$VROOT" + - $MAKE install + - popd + - mkdir build + - cd build + - ../autogen.sh --prefix="$VROOT" --enable-gtk-doc + - $MAKE + - $MAKE check + - $MAKE install + - $MAKE dist + - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild --nodeps -ta libvirt-sandbox*.tar.gz ; fi + +.dist_native_build_job_template: &dist_native_build_job_definition + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + stage: builds + cache: + paths: + - ccache/ + key: "$CI_JOB_NAME" + before_script: + - *script_variables + script: + - mkdir build + - cd build + - ../autogen.sh --prefix="$VROOT" --enable-gtk-doc + - $MAKE + - $MAKE check + - $MAKE install + - $MAKE dist + - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild -ta libvirt-sandbox*.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 +99,96 @@ check-dco: except: variables: - $CI_PROJECT_NAMESPACE == 'libvirt' + +x64-debian-9-container: + <<: *container_job_definition + variables: + NAME: debian-9 + +x64-debian-10-container: + <<: *container_job_definition + variables: + NAME: debian-10 + +x64-debian-sid-container: + <<: *container_job_definition + variables: + NAME: debian-sid + +x64-fedora-31-container: + <<: *container_job_definition + variables: + NAME: fedora-31 + +x64-fedora-32-container: + <<: *container_job_definition + variables: + NAME: fedora-32 + +x64-fedora-rawhide-container: + <<: *container_job_definition + variables: + NAME: fedora-rawhide + +x64-opensuse-151-container: + <<: *container_job_definition + variables: + NAME: opensuse-151 + +x64-ubuntu-1804-container: + <<: *container_job_definition + variables: + NAME: ubuntu-1804 + +x64-ubuntu-2004-container: + <<: *container_job_definition + variables: + NAME: ubuntu-2004 + + + +x64-debian-9-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: debian-9 + +x64-debian-10-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: debian-10 + +x64-debian-sid-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: debian-sid + +x64-fedora-31-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: fedora-31 + +x64-fedora-32-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: fedora-32 + +x64-fedora-rawhide-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: fedora-rawhide + +x64-opensuse-151-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: opensuse-151 + RPM: skip + +x64-ubuntu-1804-dist-build: + <<: *dist_native_build_job_definition + variables: + NAME: ubuntu-1804 + +x64-ubuntu-2004-git-build: + <<: *git_native_build_job_definition + variables: + NAME: ubuntu-2004 diff --git a/ci/containers/README.rst b/ci/containers/README.rst new file mode 100644 index 0000000..530897e --- /dev/null +++ b/ci/containers/README.rst @@ -0,0 +1,14 @@ +CI job assets +============= + +This directory contains assets used in the automated CI jobs, most +notably the Dockerfiles used to build container images in which the +CI jobs then run. + +The ``refresh`` script is used to re-create the Dockerfiles using the +``lcitool`` command that is provided by repo +https://gitlab.com/libvirt/libvirt-ci + +The containers are built during the CI process and cached in the GitLab +container registry of the project doing the build. The cached containers +can be deleted at any time and will be correctly rebuilt. diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile new file mode 100644 index 0000000..51f79e2 --- /dev/null +++ b/ci/containers/libvirt-debian-10.Dockerfile @@ -0,0 +1,64 @@ +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 \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + liblzma-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libvirt-dev \ + libvirt-glib-1.0-dev \ + libxml2-dev \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + zlib1g-dev && \ + 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/containers/libvirt-debian-9.Dockerfile b/ci/containers/libvirt-debian-9.Dockerfile new file mode 100644 index 0000000..cf94a67 --- /dev/null +++ b/ci/containers/libvirt-debian-9.Dockerfile @@ -0,0 +1,67 @@ +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 \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + liblzma-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libvirt-dev \ + libvirt-glib-1.0-dev \ + libxml2-dev \ + locales \ + lsof \ + make \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + zlib1g-dev && \ + 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/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile new file mode 100644 index 0000000..6a34306 --- /dev/null +++ b/ci/containers/libvirt-debian-sid.Dockerfile @@ -0,0 +1,64 @@ +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 \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + liblzma-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libvirt-dev \ + libvirt-glib-1.0-dev \ + libxml2-dev \ + locales \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + zlib1g-dev && \ + 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/containers/libvirt-fedora-31.Dockerfile b/ci/containers/libvirt-fedora-31.Dockerfile new file mode 100644 index 0000000..6e0da18 --- /dev/null +++ b/ci/containers/libvirt-fedora-31.Dockerfile @@ -0,0 +1,64 @@ +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 \ + glibc-static \ + gobject-introspection-devel \ + gtk-doc \ + libcap-ng-devel \ + libselinux-devel \ + libtirpc-devel \ + libtool \ + libvirt-devel \ + libvirt-gobject-devel \ + libxml2-devel \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim \ + xz-devel \ + xz-static \ + zlib-devel \ + zlib-static && \ + 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/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile new file mode 100644 index 0000000..5d86af2 --- /dev/null +++ b/ci/containers/libvirt-fedora-32.Dockerfile @@ -0,0 +1,64 @@ +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 \ + glibc-static \ + gobject-introspection-devel \ + gtk-doc \ + libcap-ng-devel \ + libselinux-devel \ + libtirpc-devel \ + libtool \ + libvirt-devel \ + libvirt-gobject-devel \ + libxml2-devel \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim \ + xz-devel \ + xz-static \ + zlib-devel \ + zlib-static && \ + 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/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile new file mode 100644 index 0000000..8a299fd --- /dev/null +++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile @@ -0,0 +1,65 @@ +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 \ + glibc-static \ + gobject-introspection-devel \ + gtk-doc \ + libcap-ng-devel \ + libselinux-devel \ + libtirpc-devel \ + libtool \ + libvirt-devel \ + libvirt-gobject-devel \ + libxml2-devel \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim \ + xz-devel \ + xz-static \ + zlib-devel \ + zlib-static && \ + 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/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/libvirt-opensuse-151.Dockerfile new file mode 100644 index 0000000..8028a21 --- /dev/null +++ b/ci/containers/libvirt-opensuse-151.Dockerfile @@ -0,0 +1,66 @@ +FROM opensuse/leap:15.1 + +RUN zypper update -y && \ + zypper install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glibc-locale \ + glibc-static \ + gobject-introspection-devel \ + gtk-doc \ + libcap-ng-devel \ + libselinux-devel \ + libtirpc-devel \ + libtool \ + libvirt-devel \ + libvirt-glib-devel \ + libxml2-devel \ + lsof \ + make \ + net-tools \ + ninja \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + rpcgen \ + rpm-build \ + screen \ + strace \ + sudo \ + vim \ + xz-devel \ + xz-static-devel \ + zlib-devel \ + zlib-devel-static && \ + zypper clean --all && \ + 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/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile new file mode 100644 index 0000000..bea1fb4 --- /dev/null +++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile @@ -0,0 +1,67 @@ +FROM ubuntu:18.04 + +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 \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + liblzma-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + libvirt-dev \ + libvirt-glib-1.0-dev \ + libxml2-dev \ + locales \ + lsof \ + make \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconf \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + screen \ + strace \ + sudo \ + vim \ + zlib1g-dev && \ + 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/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile new file mode 100644 index 0000000..0c2c4d6 --- /dev/null +++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile @@ -0,0 +1,69 @@ +FROM ubuntu:20.04 + +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 \ + gtk-doc-tools \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libgirepository1.0-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + liblzma-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libselinux1-dev \ + libtirpc-dev \ + libtool \ + libtool-bin \ + 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 \ + valac \ + vim \ + xsltproc \ + zlib1g-dev && \ + 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/containers/refresh b/ci/containers/refresh new file mode 100755 index 0000000..26febb0 --- /dev/null +++ b/ci/containers/refresh @@ -0,0 +1,27 @@ +#!/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|centos)') + +for host in $HOSTS +do + if test "$host" = "libvirt-ubuntu-2004" + then + $LCITOOL dockerfile $host libvirt+minimal,libvirt-glib,libvirt-sandbox > $host.Dockerfile + else + $LCITOOL dockerfile $host libvirt+dist,libvirt-glib+dist,libvirt-sandbox > $host.Dockerfile + fi +done -- 2.26.2

2 1

[PATCH v4 00/20] audio: deprecate -soundhw
by Gerd Hoffmann 24 Jun '20

24 Jun '20

v2: - use g_assert_not_reached() for stubs. - add deprecation notice. v3: - rebase to latest master. - adapt to armbru's device initialization changes. v4: - reorder patches, drop temporary -global setup, go straight to -machine pcspk-audiodev= instead. - update error messages and documentation accordingly. Gerd Hoffmann (20): stubs: add isa_create_simple stubs: add pci_create_simple audio: add deprecated_register_soundhw audio: deprecate -soundhw ac97 audio: deprecate -soundhw es1370 audio: deprecate -soundhw adlib audio: deprecate -soundhw cs4231a audio: deprecate -soundhw gus audio: deprecate -soundhw sb16 audio: deprecate -soundhw hda pc_basic_device_init: pass PCMachineState pc_basic_device_init: drop has_pit arg pc_basic_device_init: drop no_vmport arg softmmu: initialize spice and audio earlier audio: rework pcspk_init() audio: create pcspk device early audio: deprecate -soundhw pcspk audio: add soundhw deprecation notice pcspk: update docs/system/target-i386-desc.rst.inc audio: set default value for pcspk.iobase property include/hw/audio/pcspk.h | 12 ++---------- include/hw/audio/soundhw.h | 2 ++ include/hw/i386/pc.h | 6 +++--- hw/audio/ac97.c | 9 ++------- hw/audio/adlib.c | 8 +------- hw/audio/cs4231a.c | 8 +------- hw/audio/es1370.c | 9 ++------- hw/audio/gus.c | 8 +------- hw/audio/intel-hda.c | 3 +++ hw/audio/pcspk.c | 26 ++++++++++++++++++++++---- hw/audio/sb16.c | 9 ++------- hw/audio/soundhw.c | 24 +++++++++++++++++++++++- hw/i386/pc.c | 14 ++++++++------ hw/i386/pc_piix.c | 3 +-- hw/i386/pc_q35.c | 3 +-- hw/isa/i82378.c | 2 +- qdev-monitor.c | 2 ++ softmmu/vl.c | 12 ++++++------ stubs/isa-bus.c | 7 +++++++ stubs/pci-bus.c | 7 +++++++ docs/system/deprecated.rst | 9 +++++++++ docs/system/target-i386-desc.rst.inc | 13 ++++++++++++- stubs/Makefile.objs | 2 ++ 23 files changed, 120 insertions(+), 78 deletions(-) create mode 100644 stubs/isa-bus.c create mode 100644 stubs/pci-bus.c -- 2.18.4

2 22

[libvirt PATCH] gitlab: test RPM build in CI jobs
by Daniel P. Berrangé 24 Jun '20

24 Jun '20

We need to test the native and mingw RPM builds, but since the mingw RPM does both arches at once, we only need to test it on one of the two mingw jobs. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfb66a652d..e5babfeba2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,6 +63,7 @@ stages: - cd build - ../autogen.sh || (cat config.log && exit 1) - $MAKE distcheck + - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ; then rpmbuild --nodeps -ta libvirt*.tar.xz ; fi # Extra native build jobs that are only run post-merge, or # when code is pushed to a branch with "ci-full-" name prefix @@ -111,6 +112,8 @@ stages: - cd build - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1) - $MAKE + - if test -x /usr/bin/rpmbuild && "$RPM" != "skip"; then $MAKE dist ; fi + - if test -x /usr/bin/rpmbuild && "$RPM" != "skip"; then rpmbuild --nodeps -ta --define "_sourcedir `pwd`" mingw-libvirt.spec ; fi # Extra cross build jobs that are only run post-merge, or # when code is pushed to a branch with "ci-full-" name prefix @@ -378,6 +381,7 @@ x64-opensuse-151: <<: *native_build_default_job_definition variables: NAME: opensuse-151 + RPM: skip x64-ubuntu-1804: <<: *native_build_extra_job_definition @@ -461,6 +465,7 @@ mingw32-fedora-rawhide: variables: NAME: fedora-rawhide CROSS: mingw32 + RPM: skip mingw64-fedora-rawhide: <<: *cross_build_default_job_definition -- 2.26.2

2 1

[libvirt PATCH 0/2] AUTHORS: update maintainer list
by Ján Tomko 24 Jun '20

24 Jun '20

During the switch to gitlab, not all people listed as maintainers asked to be added to the libvirt group: https://gitlab.com/libvirt/libvirt/-/project_members Remove those who haven't and add Pino, who was missing from the list. I omitted Chris Lalancette and Lily Nie, since they have not committed anything to the main libvirt repo in the past ~10 years. Ján Tomko (2): AUTHORS: clean up maintainer list AUTHORS: add Pino Toscano as a maintainer AUTHORS.in | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.25.4

2 3

[libvirt PATCH v2] qemu: format 'ramfb' attribute for mediated devices
by Jonathon Jongsma 23 Jun '20

23 Jun '20

It's possible to use ramfb as the boot display of an assigned vgpu device. This was introduced in 4b95738c, but unfortunately the attribute was not formatted into the xml output for such a device. This patch fixes that oversight and adds a xml2xml test to verify proper behavior. https://bugzilla.redhat.com/show_bug.cgi?id=1847791 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Changes in v2: - drop unnecessary input xml file for test src/conf/domain_conf.c | 3 ++ ...stdev-mdev-display-ramfb.x86_64-latest.xml | 44 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 3 files changed, 48 insertions(+) create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e0855a2476..da02255142 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28343,6 +28343,9 @@ virDomainHostdevDefFormat(virBufferPtr buf, if (mdevsrc->display != VIR_TRISTATE_SWITCH_ABSENT) virBufferAsprintf(buf, " display='%s'", virTristateSwitchTypeToString(mdevsrc->display)); + if (mdevsrc->ramfb != VIR_TRISTATE_SWITCH_ABSENT) + virBufferAsprintf(buf, " ramfb='%s'", + virTristateSwitchTypeToString(mdevsrc->display)); } } diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml new file mode 100644 index 0000000000..c134400486 --- /dev/null +++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml @@ -0,0 +1,44 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i386</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes'> + <listen type='address'/> + </graphics> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci' display='on' ramfb='on'> + <source> + <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/> + </source> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </hostdev> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a52768e9ce..5a124853b4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -529,6 +529,7 @@ mymain(void) QEMU_CAPS_VFIO_PCI_DISPLAY, QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_VNC); + DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb"); DO_TEST("pci-rom", NONE); DO_TEST("pci-rom-disabled", NONE); DO_TEST("pci-rom-disabled-invalid", NONE); -- 2.21.3

3 2

[PATCH v2 0/3] Support hooks placed in several files
by Dmitry Nesterenko 23 Jun '20

23 Jun '20

Libvirt hook calls only one script (/etc/libvirt/hooks/<driver>) now. This is not convenient if scripts for hook are provided by many vendors. Script one vendor can replace previously installed script other vendor. These patches are changing behaviour of hooks to usual linux scheme - running all scripts from the directories /etc/libvirt/hooks/<driver>.d/ in alphabetical order. If we find script in old place we will execute it as first for backward compatibility. Dmitry Nesterenko (3): virhook: refactoring for support hooks placed in several files virhook: support hooks placed in several files virhook: changes in docs about support hooks placed in several files NEWS.rst | 6 ++ docs/hooks.html.in | 27 ++++++++ src/util/virhook.c | 164 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 175 insertions(+), 22 deletions(-) -- 2.18.4

2 6

[PATCH v7 00/10] TPM Proxy (H_TPM_COMM) support for PPC64
by Daniel Henrique Barboza 23 Jun '20

23 Jun '20

This is a rebase to fix conflicts with master (at 2072c395419b) and to adapt to the new NEWS.rst format. Changes were simple, so I didn't remove any reviewed-by/tested-by tags from the previous version. changes in v7: - fixed conflicts in patch 02 after "cpu.migratable" and "fw_cfg" caps went upstream - fixed a conflict in patch 05 after virSysinfoDefPtr was added to the domain - changed to the new NEWS.rst format instead of docs/news.xml in patch 10 Gitlab tree: https://gitlab.com/danielhb/libvirt/tree/spapr_tpm_proxy_v7 v6 link: https://www.redhat.com/archives/libvir-list/2020-June/msg00051.html 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 NEWS.rst: update for the new TPM Proxy device NEWS.rst | 13 ++++ docs/formatdomain.html.in | 19 ++++- 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 | 2 + src/qemu/qemu_capabilities.h | 1 + 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, 623 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

2 21

[PATCH] qemu_command: Fix IOMMU validator name in two comments
by Michal Privoznik 23 Jun '20

23 Jun '20

When building command line for IOMMU or machine, there are two comments which mention function that validate IOMMU. But they both refer to old name which was changed in v6.3.0-rc1~246. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 73a655a0bc..e2cbdf0925 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6180,7 +6180,7 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd, case VIR_DOMAIN_IOMMU_MODEL_INTEL: { g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER; - /* qemuDomainDeviceDefValidateIOMMU() already made sure we have + /* qemuValidateDomainDeviceDefIOMMU() already made sure we have * one of QEMU_CAPS_DEVICE_INTEL_IOMMU or QEMU_CAPS_MACHINE_IOMMU: * here we handle the former case, while the latter is taken care * of in qemuBuildMachineCommandLine() */ @@ -6833,7 +6833,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, if (def->iommu) { switch (def->iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_INTEL: - /* qemuDomainDeviceDefValidateIOMMU() already made sure we have + /* qemuValidateDomainDeviceDefIOMMU() already made sure we have * one of QEMU_CAPS_DEVICE_INTEL_IOMMU or QEMU_CAPS_MACHINE_IOMMU: * here we handle the latter case, while the former is taken care * of in qemuBuildIOMMUCommandLine() */ -- 2.26.2

1 0

[PATCH 0/2] Add support for IOMMU address width
by Menno Lageman 23 Jun '20

23 Jun '20

Since commit 37f51384ae05 ('intel-iommu: Extend address width to 48 bits') QEMU supports setting the address width of the IOMMU. This patch adds a new 'aw_bits' attribute to the iommu in libvirtd to configure this. Menno Lageman (2): conf: add address width attribute to iommu qemu: format address wdith on intel-iommu command line docs/formatdomain.html.in | 9 +++++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 21 +++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 6 ++++ src/qemu/qemu_capabilities.h | 4 +++ src/qemu/qemu_command.c | 6 ++++ src/qemu/qemu_validate.c | 9 ++++- .../caps_2.12.0.x86_64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../intel-iommu-aw-bits.x86_64-latest.args | 33 +++++++++++++++++ .../qemuxml2argvdata/intel-iommu-aw-bits.xml | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../intel-iommu-aw-bits.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 21 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/intel-iommu-aw-bits.xml create mode 120000 tests/qemuxml2xmloutdata/intel-iommu-aw-bits.x86_64-latest.xml -- 2.26.2

3 11

[PATCH 1/1] qemu_capabilities.c: modernize virQEMUCapsCacheLookupDefault
by Daniel Henrique Barboza 23 Jun '20

23 Jun '20

Use g_autoptr() in qemuCaps to get rid of a virObjectUnref call, a 'cleanup' label and the 'ret' pointer. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Found this while reviewing a patch last week. src/qemu/qemu_capabilities.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 484fff99e5..b46f3d8c2c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5735,8 +5735,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, virArch hostarch = virArchFromHost(); virArch arch = hostarch; virDomainVirtType capsType; - virQEMUCapsPtr qemuCaps = NULL; - virQEMUCapsPtr ret = NULL; + g_autoptr(virQEMUCaps) qemuCaps = NULL; virArch arch_from_caps; g_autofree char *probedbinary = NULL; @@ -5744,14 +5743,14 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, (virttype = virDomainVirtTypeFromString(virttypeStr)) < 0) { virReportError(VIR_ERR_INVALID_ARG, _("unknown virttype: %s"), virttypeStr); - goto cleanup; + return NULL; } if (archStr && (arch = virArchFromString(archStr)) == VIR_ARCH_NONE) { virReportError(VIR_ERR_INVALID_ARG, _("unknown architecture: %s"), archStr); - goto cleanup; + return NULL; } if (!binary) { @@ -5760,7 +5759,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, } if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary))) - goto cleanup; + return NULL; arch_from_caps = virQEMUCapsGetArch(qemuCaps); @@ -5774,7 +5773,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, "match given architecture '%s'"), virArchToString(arch_from_caps), virArchToString(arch)); - goto cleanup; + return NULL; } capsType = virQEMUCapsGetVirtType(qemuCaps); @@ -5786,7 +5785,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, virReportError(VIR_ERR_INVALID_ARG, _("KVM is not supported by '%s' on this host"), binary); - goto cleanup; + return NULL; } if (machine) { @@ -5797,7 +5796,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, virReportError(VIR_ERR_INVALID_ARG, _("the machine '%s' is not supported by emulator '%s'"), machine, binary); - goto cleanup; + return NULL; } } else { machine = virQEMUCapsGetPreferredMachine(qemuCaps, virttype); @@ -5810,11 +5809,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, if (retMachine) *retMachine = machine; - ret = g_steal_pointer(&qemuCaps); - - cleanup: - virObjectUnref(qemuCaps); - return ret; + return g_steal_pointer(&qemuCaps); } bool -- 2.26.2

2 1

[PATCH] qemu: Correct the log name for qemu_security.c
by Yi Wang 23 Jun '20

23 Jun '20

From: Liao Pingfang <liao.pingfang(a)zte.com.cn> Correct the log name for qemu_security.c to qemu.qemu_security instead of qemu.qemu_process. Signed-off-by: Liao Pingfang <liao.pingfang(a)zte.com.cn> --- src/qemu/qemu_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index f49c089..3b6d6e9 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -26,7 +26,7 @@ #define VIR_FROM_THIS VIR_FROM_QEMU -VIR_LOG_INIT("qemu.qemu_process"); +VIR_LOG_INIT("qemu.qemu_security"); int -- 2.9.5

2 1

[libvirt PATCH v2] qemu: don't continue loading caps if outdated
by Daniel P. Berrangé 23 Jun '20

23 Jun '20

The XML format used for QEMU capabilities is not required to be stable across releases, as we invalidate the cache whenever the libvirt binary changes. We none the less always try to parse te entire XML file before we do any validity checks. Thus if we change the format of any part of the data, or change permitted values for enums, then libvirtd logs will be spammed with errors. These are not in fact errors, but an expected scenario. This change makes the loading code validate the cache timestamp against the libvirtd timestamp immediately. If they don't match then we stop loading the rest of the XML file. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 63 +++++++++++++++++++++++------------- src/qemu/qemu_capspriv.h | 6 ++-- src/util/virfilecache.c | 11 ++++--- src/util/virfilecache.h | 11 +++++-- tests/testutilsqemu.c | 3 +- tests/virfilecachetest.c | 3 +- 6 files changed, 61 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 484fff99e5..3053aa31f9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1807,14 +1807,6 @@ virQEMUCapsNewBinary(const char *binary) } -void -virQEMUCapsSetInvalidation(virQEMUCapsPtr qemuCaps, - bool enabled) -{ - qemuCaps->invalidation = enabled; -} - - static int virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUDataPtr dst, virQEMUCapsHostCPUDataPtr src) @@ -4205,11 +4197,14 @@ virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xmlXPathContextPtr ctxt) * <machine name='pc-1.0' alias='pc' hotplugCpus='yes' maxCpus='4' default='yes' numaMemSupported='yes'/> * ... * </qemuCaps> + * + * Returns 0 on success, 1 if outdated, -1 on error */ int virQEMUCapsLoadCache(virArch hostArch, virQEMUCapsPtr qemuCaps, - const char *filename) + const char *filename, + bool skipInvalidation) { xmlDocPtr doc = NULL; int ret = -1; @@ -4237,6 +4232,31 @@ virQEMUCapsLoadCache(virArch hostArch, goto cleanup; } + if (virXPathLongLong("string(./selfctime)", ctxt, &l) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing selfctime in QEMU capabilities XML")); + goto cleanup; + } + qemuCaps->libvirtCtime = (time_t)l; + + qemuCaps->libvirtVersion = 0; + if (virXPathULong("string(./selfvers)", ctxt, &lu) == 0) + qemuCaps->libvirtVersion = lu; + + if (!skipInvalidation && + (qemuCaps->libvirtCtime != virGetSelfLastChanged() || + qemuCaps->libvirtVersion != LIBVIR_VERSION_NUMBER)) { + VIR_DEBUG("Outdated capabilities in %s: libvirt changed " + "(%lld vs %lld, %lu vs %lu), stopping load", + qemuCaps->binary, + (long long)qemuCaps->libvirtCtime, + (long long)virGetSelfLastChanged(), + (unsigned long)qemuCaps->libvirtVersion, + (unsigned long)LIBVIR_VERSION_NUMBER); + ret = 1; + goto cleanup; + } + if (!(str = virXPathString("string(./emulator)", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing emulator in QEMU capabilities cache")); @@ -4256,17 +4276,6 @@ virQEMUCapsLoadCache(virArch hostArch, } qemuCaps->ctime = (time_t)l; - if (virXPathLongLong("string(./selfctime)", ctxt, &l) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing selfctime in QEMU capabilities XML")); - goto cleanup; - } - qemuCaps->libvirtCtime = (time_t)l; - - qemuCaps->libvirtVersion = 0; - if (virXPathULong("string(./selfvers)", ctxt, &lu) == 0) - qemuCaps->libvirtVersion = lu; - if ((n = virXPathNodeSet("./flag", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse qemu capabilities flags")); @@ -4418,6 +4427,9 @@ virQEMUCapsLoadCache(virArch hostArch, if (virXPathBoolean("boolean(./kvmSupportsSecureGuest)", ctxt) > 0) qemuCaps->kvmSupportsSecureGuest = true; + if (skipInvalidation) + qemuCaps->invalidation = false; + ret = 0; cleanup: VIR_FREE(str); @@ -5489,16 +5501,23 @@ virQEMUCapsNewData(const char *binary, static void * virQEMUCapsLoadFile(const char *filename, const char *binary, - void *privData) + void *privData, + bool *outdated) { virQEMUCapsPtr qemuCaps = virQEMUCapsNewBinary(binary); virQEMUCapsCachePrivPtr priv = privData; + int ret; if (!qemuCaps) return NULL; - if (virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename) < 0) + ret = virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename, false); + if (ret < 0) goto error; + if (ret == 1) { + *outdated = true; + goto error; + } return qemuCaps; diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 5d2f448e41..f6c06ea008 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -37,12 +37,10 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, unsigned int microcodeVersion, const char *kernelVersion); -void virQEMUCapsSetInvalidation(virQEMUCapsPtr qemuCaps, - bool enabled); - int virQEMUCapsLoadCache(virArch hostArch, virQEMUCapsPtr qemuCaps, - const char *filename); + const char *filename, + bool skipInvalidation); char *virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps); int diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index aecabf173d..2162917b11 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -130,6 +130,7 @@ virFileCacheLoad(virFileCachePtr cache, g_autofree char *file = NULL; int ret = -1; void *loadData = NULL; + bool outdated = false; *data = NULL; @@ -148,10 +149,12 @@ virFileCacheLoad(virFileCachePtr cache, goto cleanup; } - if (!(loadData = cache->handlers.loadFile(file, name, cache->priv))) { - VIR_WARN("Failed to load cached data from '%s' for '%s': %s", - file, name, virGetLastErrorMessage()); - virResetLastError(); + if (!(loadData = cache->handlers.loadFile(file, name, cache->priv, &outdated))) { + if (!outdated) { + VIR_WARN("Failed to load cached data from '%s' for '%s': %s", + file, name, virGetLastErrorMessage()); + virResetLastError(); + } ret = 0; goto cleanup; } diff --git a/src/util/virfilecache.h b/src/util/virfilecache.h index 006a9717cb..9a7edf07e6 100644 --- a/src/util/virfilecache.h +++ b/src/util/virfilecache.h @@ -62,15 +62,20 @@ typedef void * * @filename: name of a file with cached data * @name: name of the cached data * @priv: private data created together with cache + * @outdated: set to true if data was outdated * - * Loads the cached data from a file @filename. + * Loads the cached data from a file @filename. If + * NULL is returned, then @oudated indicates whether + * this was due to the data being outdated, or an + * error loading the cache. * - * Returns cached data object or NULL on error. + * Returns cached data object or NULL on outdated data or error. */ typedef void * (*virFileCacheLoadFilePtr)(const char *filename, const char *name, - void *priv); + void *priv, + bool *outdated); /** * virFileCacheSaveFilePtr: diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 4dcc3089dd..e3b1e2813b 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -293,10 +293,9 @@ qemuTestParseCapabilitiesArch(virArch arch, virArchToString(arch)); if (!(qemuCaps = virQEMUCapsNewBinary(binary)) || - virQEMUCapsLoadCache(arch, qemuCaps, capsFile) < 0) + virQEMUCapsLoadCache(arch, qemuCaps, capsFile, true) < 0) goto error; - virQEMUCapsSetInvalidation(qemuCaps, false); return qemuCaps; error: diff --git a/tests/virfilecachetest.c b/tests/virfilecachetest.c index 6d280b3bec..34e0d0ab2f 100644 --- a/tests/virfilecachetest.c +++ b/tests/virfilecachetest.c @@ -110,7 +110,8 @@ testFileCacheNewData(const char *name G_GNUC_UNUSED, static void * testFileCacheLoadFile(const char *filename, const char *name G_GNUC_UNUSED, - void *priv G_GNUC_UNUSED) + void *priv G_GNUC_UNUSED, + bool *outdated G_GNUC_UNUSED) { testFileCacheObjPtr obj; char *data; -- 2.24.1

2 1

[PATCH 00/12] qemuxml2*test: Improve testing of SCSI hostdevs
by Peter Krempa 23 Jun '20

23 Jun '20

Switch to qemu caps based testing to validate pre and post blockdev configs. This is split out from my unfinished series for switching hostdevs to blockdev. Peter Krempa (12): qemuxml2argvtest: hostdev-scsi-lsi: Modernize to qemu-4.1 qemuxml2argvtest: hostdev-scsi-lsi: Add qemu-2.8 variant qemuxml2argvtest: hostdev-scsi-lsi: Add "latest" caps version qemuxml2argvtest: hostdev-scsi-lsi: Add test of readonly variant qemuxml2argvtest: hostdev-scsi-lsi: Integrate 'hostdev-scsi-lsi-iscsi' case qemuxml2argvtest: hostdev-scsi-lsi: Integrate 'hostdev-scsi-lsi-iscsi-auth' case qemuxml2argvtest: hostdev-scsi-virtio-scsi: Modernize to qemu-4.1 qemuxml2argvtest: hostdev-scsi-virtio-scsi: Add "latest" caps version qemuxml2argvtest: hostdev-scsi-virtio-scsi: Add qemu-2.8 variant qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate 'hostdev-scsi-readonly' qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate 'hostdev-scsi-virtio-iscsi' case qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate iSCSI authentication cases ...sk-hostdev-scsi-virtio-iscsi-auth-AES.args | 49 ------------ ...isk-hostdev-scsi-virtio-iscsi-auth-AES.xml | 43 ----------- .../hostdev-scsi-lsi-iscsi-auth.args | 37 ---------- .../hostdev-scsi-lsi-iscsi-auth.xml | 48 ------------ .../hostdev-scsi-lsi-iscsi.args | 37 ---------- .../hostdev-scsi-lsi-iscsi.xml | 42 ----------- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 33 --------- .../hostdev-scsi-lsi.x86_64-2.8.0.args | 51 +++++++++++++ .../hostdev-scsi-lsi.x86_64-4.1.0.args | 64 ++++++++++++++++ .../hostdev-scsi-lsi.x86_64-latest.args | 68 +++++++++++++++++ tests/qemuxml2argvdata/hostdev-scsi-lsi.xml | 38 ++++++++++ .../hostdev-scsi-readonly.args | 34 --------- .../hostdev-scsi-readonly.xml | 38 ---------- .../hostdev-scsi-virtio-iscsi-auth.xml | 48 ------------ .../hostdev-scsi-virtio-iscsi.args | 39 ---------- .../hostdev-scsi-virtio-iscsi.xml | 42 ----------- .../hostdev-scsi-virtio-scsi.args | 34 --------- ...ostdev-scsi-virtio-scsi.x86_64-2.8.0.args} | 40 +++++++--- ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 70 ++++++++++++++++++ ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 74 +++++++++++++++++++ .../hostdev-scsi-virtio-scsi.xml | 38 ++++++++++ tests/qemuxml2argvtest.c | 36 ++------- .../hostdev-scsi-lsi-iscsi-auth.xml | 57 -------------- .../hostdev-scsi-lsi-iscsi.xml | 51 ------------- tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 38 ++++++++++ .../hostdev-scsi-readonly.xml | 47 ------------ .../hostdev-scsi-virtio-iscsi-auth.xml | 57 -------------- .../hostdev-scsi-virtio-iscsi.xml | 51 ------------- .../hostdev-scsi-virtio-scsi.xml | 38 ++++++++++ tests/qemuxml2xmltest.c | 16 ---- 30 files changed, 515 insertions(+), 843 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args delete mode 100644 tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-readonly.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-readonly.xml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args rename tests/qemuxml2argvdata/{hostdev-scsi-virtio-iscsi-auth.args => hostdev-scsi-virtio-scsi.x86_64-2.8.0.args} (52%) create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml -- 2.26.2

2 13

[PATCH 0/2] Support hooks placed in several files
by Dmitry Nesterenko 23 Jun '20

23 Jun '20

Libvirt hook calls only one script (/etc/libvirt/hooks/<driver>) now. This is not convenient if scripts for hook are provided by many vendors. Script one vendor can replace previously installed script other vendor. These patches are changing behaviour of hooks to usual linux scheme - running all scripts from directory /etc/libvirt/hooks/<driver>.d in alphabetical order. If we find script in old place we will execute it as first for backward compatibility. Dmitry Nesterenko (2): virthook: refactoring for support hooks placed in several files virhook: support hooks placed in several files src/util/virhook.c | 168 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 146 insertions(+), 22 deletions(-) -- 2.18.4

2 8

[PATCH v5 for-5.0? 0/7] Tighten qemu-img rules on missing backing format
by Eric Blake 23 Jun '20

23 Jun '20

3 15

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

23 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> --- v1: - rebased on top of current master - move compat mode from 4.2 to 5.0 v2: - move deprection 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 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..e74a5717c8 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`` 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. 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..7814e646e4 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"); + 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

5 5

[libvirt PATCH] ci: Drop mips container for Debian sid
by Andrea Bolognani 23 Jun '20

23 Jun '20

The build job for this container has been failing every single time, and as it turns out the explanation for that is very simple: Debian is just not going to support the mips architecture going forward. Reported-by: Pino Toscano <ptoscano(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab-ci.yml | 5 - .../libvirt-debian-sid-cross-mips.Dockerfile | 121 ------------------ ci/containers/refresh | 3 +- 3 files changed, 2 insertions(+), 127 deletions(-) delete mode 100644 ci/containers/libvirt-debian-sid-cross-mips.Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfb66a652d..49f6d57a0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -291,11 +291,6 @@ i686-debian-sid-container: variables: NAME: debian-sid-cross-i686 -mips-debian-sid-container: - <<: *container_optional_job_definition - variables: - NAME: debian-sid-cross-mips - mips64el-debian-sid-container: <<: *container_optional_job_definition variables: diff --git a/ci/containers/libvirt-debian-sid-cross-mips.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mips.Dockerfile deleted file mode 100644 index 4327b77e3b..0000000000 --- a/ci/containers/libvirt-debian-sid-cross-mips.Dockerfile +++ /dev/null @@ -1,121 +0,0 @@ -FROM debian:sid - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - autoconf \ - automake \ - autopoint \ - bash \ - bash-completion \ - ca-certificates \ - ccache \ - chrony \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - meson \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - strace \ - sudo \ - vim \ - xsltproc \ - zfs-fuse && \ - 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/mips-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(basename /usr/bin/gcc) - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mips && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ - gcc-mips-linux-gnu \ - libacl1-dev:mips \ - libapparmor-dev:mips \ - libattr1-dev:mips \ - libaudit-dev:mips \ - libavahi-client-dev:mips \ - libblkid-dev:mips \ - libc6-dev:mips \ - libcap-ng-dev:mips \ - libcurl4-gnutls-dev:mips \ - libdbus-1-dev:mips \ - libdevmapper-dev:mips \ - libfuse-dev:mips \ - libglib2.0-dev:mips \ - libglusterfs-dev:mips \ - libgnutls28-dev:mips \ - libiscsi-dev:mips \ - libncurses-dev:mips \ - libnl-3-dev:mips \ - libnl-route-3-dev:mips \ - libnuma-dev:mips \ - libparted-dev:mips \ - libpcap0.8-dev:mips \ - libpciaccess-dev:mips \ - librbd-dev:mips \ - libreadline-dev:mips \ - libsanlock-dev:mips \ - libsasl2-dev:mips \ - libselinux1-dev:mips \ - libssh-gcrypt-dev:mips \ - libssh2-1-dev:mips \ - libtirpc-dev:mips \ - libudev-dev:mips \ - libxml2-dev:mips \ - libyajl-dev:mips \ - xfslibs-dev:mips && \ - apt-get autoremove -y && \ - apt-get autoclean -y - -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" - -ENV ABI "mips-linux-gnu" -ENV CONFIGURE_OPTS "--host=mips-linux-gnu" diff --git a/ci/containers/refresh b/ci/containers/refresh index f457f3bc23..3a3594caa4 100755 --- a/ci/containers/refresh +++ b/ci/containers/refresh @@ -28,7 +28,8 @@ do libvirt-debian-*) for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64le s390x do - if test "$host" = "libvirt-debian-9" && test "$cross" = "i686" + if test "$host-cross-$cross" = "libvirt-debian-9-cross-i686" || + test "$host-cross-$cross" = "libvirt-debian-sid-cross-mips" then continue fi -- 2.25.4

2 1

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

23 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> --- v1: - rebased on top of current master - move compat mode from 4.2 to 5.0 v2: - move deprection text to recently removed section v3: - increase title line length for (deprecated.rst) '``-numa node,mem=``\ *size* (removed in 5.1)' 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 --- docs/system/deprecated.rst | 37 ++++++++++++++++++++----------------- hw/arm/virt.c | 2 +- hw/core/numa.c | 6 ++++++ 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, 35 insertions(+), 24 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index f0061f94aa..502e41ff35 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) ''''''''''''''''''''''''''''''''''''''''''''''''''''' @@ -512,3 +495,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`` 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. 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..05be412e59 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -117,6 +117,12 @@ 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. Use -numa node,memdev instead"); + 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

3 3