- Devel - libvirt List Archives

[libvirt PATCH] qemu: Drop redundant checks for qemuCaps before virQEMUCapsGet
by Jiri Denemark 22 Mar '21

22 Mar '21

virQEMUCapsGet checks for qemuCaps itself, no need to do it explicitly. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 5 +---- src/qemu/qemu_process.c | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5c98f8ff1a..fff67481a7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5289,7 +5289,6 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDefPtr disk, g_autofree char *encalias = NULL; if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) || - !qemuCaps || virStorageSourceIsEmpty(disk->src) || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_SECRET)) return 0; @@ -5475,7 +5474,6 @@ qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(virDomainHostdevDefPtr hostde g_autofree char *authalias = NULL; if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) || - !qemuCaps || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_SECRET)) return 0; @@ -5520,8 +5518,7 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDefPtr ho if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS)) return 0; - if (!qemuCaps || - hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) return 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0b79dde2c3..b86afe4daa 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8349,8 +8349,7 @@ qemuProcessReconnect(void *opaque) if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) goto error; - if (priv->qemuCaps && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) retry = false; if (qemuDomainObjStartWorker(obj) < 0) -- 2.31.0

2 1

[libvirt PATCH] ci: Drop prefix from Dockerfiles
by Andrea Bolognani 22 Mar '21

22 Mar '21

Since the string "ci" is already contained in the path, it seems unnecessary to include it into the filename too: in fact, we only do that for Dockerfiles and not for files in ci/cirrus, even though those are generated the very same way. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab-ci.yml | 2 +- ci/containers/{ci-centos-7.Dockerfile => centos-7.Dockerfile} | 0 ci/containers/{ci-centos-8.Dockerfile => centos-8.Dockerfile} | 0 .../{ci-centos-stream.Dockerfile => centos-stream.Dockerfile} | 0 ...-aarch64.Dockerfile => debian-10-cross-aarch64.Dockerfile} | 0 ...ss-armv6l.Dockerfile => debian-10-cross-armv6l.Dockerfile} | 0 ...ss-armv7l.Dockerfile => debian-10-cross-armv7l.Dockerfile} | 0 ...-cross-i686.Dockerfile => debian-10-cross-i686.Dockerfile} | 0 ...-cross-mips.Dockerfile => debian-10-cross-mips.Dockerfile} | 0 ...ips64el.Dockerfile => debian-10-cross-mips64el.Dockerfile} | 0 ...ss-mipsel.Dockerfile => debian-10-cross-mipsel.Dockerfile} | 0 ...-ppc64le.Dockerfile => debian-10-cross-ppc64le.Dockerfile} | 0 ...ross-s390x.Dockerfile => debian-10-cross-s390x.Dockerfile} | 0 .../{ci-debian-10.Dockerfile => debian-10.Dockerfile} | 0 ...aarch64.Dockerfile => debian-sid-cross-aarch64.Dockerfile} | 0 ...s-armv6l.Dockerfile => debian-sid-cross-armv6l.Dockerfile} | 0 ...s-armv7l.Dockerfile => debian-sid-cross-armv7l.Dockerfile} | 0 ...cross-i686.Dockerfile => debian-sid-cross-i686.Dockerfile} | 0 ...ps64el.Dockerfile => debian-sid-cross-mips64el.Dockerfile} | 0 ...s-mipsel.Dockerfile => debian-sid-cross-mipsel.Dockerfile} | 0 ...ppc64le.Dockerfile => debian-sid-cross-ppc64le.Dockerfile} | 0 ...oss-s390x.Dockerfile => debian-sid-cross-s390x.Dockerfile} | 0 .../{ci-debian-sid.Dockerfile => debian-sid.Dockerfile} | 0 .../{ci-fedora-32.Dockerfile => fedora-32.Dockerfile} | 0 .../{ci-fedora-33.Dockerfile => fedora-33.Dockerfile} | 0 ...w32.Dockerfile => fedora-rawhide-cross-mingw32.Dockerfile} | 0 ...w64.Dockerfile => fedora-rawhide-cross-mingw64.Dockerfile} | 0 ...ci-fedora-rawhide.Dockerfile => fedora-rawhide.Dockerfile} | 0 .../{ci-opensuse-152.Dockerfile => opensuse-152.Dockerfile} | 0 .../{ci-ubuntu-1804.Dockerfile => ubuntu-1804.Dockerfile} | 0 .../{ci-ubuntu-2004.Dockerfile => ubuntu-2004.Dockerfile} | 0 ci/helper | 4 ++-- 32 files changed, 3 insertions(+), 3 deletions(-) rename ci/containers/{ci-centos-7.Dockerfile => centos-7.Dockerfile} (100%) rename ci/containers/{ci-centos-8.Dockerfile => centos-8.Dockerfile} (100%) rename ci/containers/{ci-centos-stream.Dockerfile => centos-stream.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-aarch64.Dockerfile => debian-10-cross-aarch64.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-armv6l.Dockerfile => debian-10-cross-armv6l.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-armv7l.Dockerfile => debian-10-cross-armv7l.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-i686.Dockerfile => debian-10-cross-i686.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-mips.Dockerfile => debian-10-cross-mips.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-mips64el.Dockerfile => debian-10-cross-mips64el.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-mipsel.Dockerfile => debian-10-cross-mipsel.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-ppc64le.Dockerfile => debian-10-cross-ppc64le.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-s390x.Dockerfile => debian-10-cross-s390x.Dockerfile} (100%) rename ci/containers/{ci-debian-10.Dockerfile => debian-10.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-aarch64.Dockerfile => debian-sid-cross-aarch64.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-armv6l.Dockerfile => debian-sid-cross-armv6l.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-armv7l.Dockerfile => debian-sid-cross-armv7l.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-i686.Dockerfile => debian-sid-cross-i686.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-mips64el.Dockerfile => debian-sid-cross-mips64el.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-mipsel.Dockerfile => debian-sid-cross-mipsel.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-ppc64le.Dockerfile => debian-sid-cross-ppc64le.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-s390x.Dockerfile => debian-sid-cross-s390x.Dockerfile} (100%) rename ci/containers/{ci-debian-sid.Dockerfile => debian-sid.Dockerfile} (100%) rename ci/containers/{ci-fedora-32.Dockerfile => fedora-32.Dockerfile} (100%) rename ci/containers/{ci-fedora-33.Dockerfile => fedora-33.Dockerfile} (100%) rename ci/containers/{ci-fedora-rawhide-cross-mingw32.Dockerfile => fedora-rawhide-cross-mingw32.Dockerfile} (100%) rename ci/containers/{ci-fedora-rawhide-cross-mingw64.Dockerfile => fedora-rawhide-cross-mingw64.Dockerfile} (100%) rename ci/containers/{ci-fedora-rawhide.Dockerfile => fedora-rawhide.Dockerfile} (100%) rename ci/containers/{ci-opensuse-152.Dockerfile => opensuse-152.Dockerfile} (100%) rename ci/containers/{ci-ubuntu-1804.Dockerfile => ubuntu-1804.Dockerfile} (100%) rename ci/containers/{ci-ubuntu-2004.Dockerfile => ubuntu-2004.Dockerfile} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81a4e80fd8..a059ad229c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ stages: - 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/ci-$NAME.Dockerfile" ci/containers + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers - docker push "$TAG" after_script: - docker logout diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile similarity index 100% rename from ci/containers/ci-centos-7.Dockerfile rename to ci/containers/centos-7.Dockerfile diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile similarity index 100% rename from ci/containers/ci-centos-8.Dockerfile rename to ci/containers/centos-8.Dockerfile diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/centos-stream.Dockerfile similarity index 100% rename from ci/containers/ci-centos-stream.Dockerfile rename to ci/containers/centos-stream.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-aarch64.Dockerfile rename to ci/containers/debian-10-cross-aarch64.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-armv6l.Dockerfile rename to ci/containers/debian-10-cross-armv6l.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-armv7l.Dockerfile rename to ci/containers/debian-10-cross-armv7l.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-i686.Dockerfile rename to ci/containers/debian-10-cross-i686.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-mips.Dockerfile rename to ci/containers/debian-10-cross-mips.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-mips64el.Dockerfile rename to ci/containers/debian-10-cross-mips64el.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-mipsel.Dockerfile rename to ci/containers/debian-10-cross-mipsel.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-ppc64le.Dockerfile rename to ci/containers/debian-10-cross-ppc64le.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-s390x.Dockerfile rename to ci/containers/debian-10-cross-s390x.Dockerfile diff --git a/ci/containers/ci-debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10.Dockerfile rename to ci/containers/debian-10.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-aarch64.Dockerfile rename to ci/containers/debian-sid-cross-aarch64.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-armv6l.Dockerfile rename to ci/containers/debian-sid-cross-armv6l.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-armv7l.Dockerfile rename to ci/containers/debian-sid-cross-armv7l.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-i686.Dockerfile rename to ci/containers/debian-sid-cross-i686.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-mips64el.Dockerfile rename to ci/containers/debian-sid-cross-mips64el.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-mipsel.Dockerfile rename to ci/containers/debian-sid-cross-mipsel.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile rename to ci/containers/debian-sid-cross-ppc64le.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-s390x.Dockerfile rename to ci/containers/debian-sid-cross-s390x.Dockerfile diff --git a/ci/containers/ci-debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid.Dockerfile rename to ci/containers/debian-sid.Dockerfile diff --git a/ci/containers/ci-fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-32.Dockerfile rename to ci/containers/fedora-32.Dockerfile diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-33.Dockerfile rename to ci/containers/fedora-33.Dockerfile diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile rename to ci/containers/fedora-rawhide-cross-mingw32.Dockerfile diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile rename to ci/containers/fedora-rawhide-cross-mingw64.Dockerfile diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-rawhide.Dockerfile rename to ci/containers/fedora-rawhide.Dockerfile diff --git a/ci/containers/ci-opensuse-152.Dockerfile b/ci/containers/opensuse-152.Dockerfile similarity index 100% rename from ci/containers/ci-opensuse-152.Dockerfile rename to ci/containers/opensuse-152.Dockerfile diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile similarity index 100% rename from ci/containers/ci-ubuntu-1804.Dockerfile rename to ci/containers/ubuntu-1804.Dockerfile diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile similarity index 100% rename from ci/containers/ci-ubuntu-2004.Dockerfile rename to ci/containers/ubuntu-2004.Dockerfile diff --git a/ci/helper b/ci/helper index 7032c816d5..2c3a9f8db4 100755 --- a/ci/helper +++ b/ci/helper @@ -197,11 +197,11 @@ class Application: def _generate_dockerfile(self, host, cross=None): args = ["dockerfile", host, "libvirt"] outdir = self._basedir.joinpath("containers") - outfile = f"ci-{host}.Dockerfile" + outfile = f"{host}.Dockerfile" if cross: args.extend(["--cross", cross]) - outfile = f"ci-{host}-cross-{cross}.Dockerfile" + outfile = f"{host}-cross-{cross}.Dockerfile" outpath = outdir.joinpath(outfile) if not self._args.quiet: -- 2.26.3

2 1

[PATCH 0/3] qemu: Enable virDomainBackupBegin for full backups
by Peter Krempa 19 Mar '21

19 Mar '21

Peter Krempa (3): qemu: capabilities: Introduce QEMU_CAPS_BLOCKDEV_BACKUP qemu: backup: Enable full backup support NEWS: Mention support for full backups via virDomainBackupBegin NEWS.rst | 9 ++++++ src/qemu/qemu_backup.c | 28 +++++++++++++++---- src/qemu/qemu_capabilities.c | 7 ++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 3 -- .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + 20 files changed, 54 insertions(+), 9 deletions(-) -- 2.29.2

3 5

[libvirt PATCH v2 00/51] Refactor XML parsing boilerplate code
by Tim Wiederhake 19 Mar '21

19 Mar '21

This series replaces some recurring boilerplate code in src/conf/ regarding the extraction of a virTristate(Switch|Bool) XML attribute. The boilerplate code looks roughly like this, g_autofree char *str = NULL; if (str = virXMLPropString(node, ...)) { int val; if ((val = virTristateBoolTypeFromString(str)) <= 0) { virReportError(...) return -1; } def->... = val; } with some variations regarding how `str` is free'd in case of later re-use, the exact error message for invalid values, whether or not `VIR_TRISTATE_(SWITCH|BOOL)_ABSENT` is explicitly checked for (`val < 0` vs. `val <= 0`), whether an intermediate variable is used or the value is assigned directly, and in some cases the conditions in the two if-blocks are merged. As a side effect, this makes the error messages for invalid values in these attributes much more consistent and catches some instances where e.g. `<foo bar="default"/>` would incorrectly be accepted. V1: https://listman.redhat.com/archives/libvir-list/2021-March/msg00853.html Changes since V1: * Rebased (resolved conflict) * Added functions to libvirt_private.syms * Patch "virStorageAdapterFCHost: Fix comment" became obsolete * Changed some member variable types to virTristate(Bool|Switch), that cleaned up the actual conversions significantly * Applied the feedback regarding the new functions in virxml Tim Wiederhake (51): conf: Use virTristateXXX in virStorageSource conf: Use virTristateXXX in virStorageSourceNVMeDef conf: Use virTristateXXX in virDomainDeviceInfo conf: Use virTristateXXX in virDomainDiskDef conf: Use virTristateXXX in virDomainActualNetDef conf: Use virTristateXXX in virDomainNetDef conf: Use virTristateXXX in virDomainChrSourceDef conf: Use virTristateXXX in virDomainGraphicsDef conf: Use virTristateXXX in virDomainMemballoonDef conf: Use virTristateXXX in virDomainLoaderDef conf: Use virTristateXXX in virDomainDef conf: Use virTristateXXX in virStorageAdapterFCHost conf: Use virTristateXXX in virStoragePoolSourceDevice conf: Use virTristateXXX in virPCIDeviceAddress virxml: Add virXMLPropTristateBool virxml: Add virXMLPropTristateSwitch domain_conf: Use virXMLPropTristateXXX in virDomainKeyWrapCipherDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainVirtioOptionsParseXML domain_conf: Use virXMLPropTristateXXX in virDomainDeviceInfoParseXML domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNetworkParse domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNVMeParse domain_conf: Use virXMLPropTristateXXX in virDomainDiskDefDriverParseXML domain_conf: Use virXMLPropTristateXXX in virDomainActualNetDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceReconnectDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainNetDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseTCP domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseFile domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseLog domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLVNC domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSDL domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSpice domain_conf: Use virXMLPropTristateXXX in virDomainAudioCommonParse domain_conf: Use virXMLPropTristateXXX in virDomainAudioJackParse domain_conf: Use virXMLPropTristateXXX in virDomainAudioOSSParse domain_conf: Use virXMLPropTristateXXX in virDomainAudioDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainMemballoonDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainShmemDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainPerfEventDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainMemoryDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainIOMMUDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainVsockDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainFeaturesDefParse domain_conf: Use virXMLPropTristateXXX in virDomainLoaderDefParseXML domain_conf: Use virXMLPropTristateXXX in virDomainVcpuParse backup_conf: Use virXMLPropTristateXXX in virDomainBackupDiskDefParseXML backup_conf: Use virXMLPropTristateXXX in virDomainBackupDefParse device_conf: Use virXMLPropTristateXXX in virPCIDeviceAddressParseXML network_conf: Use virXMLPropTristateXXX in virNetworkForwardNatDefParseXML numa_conf: Use virXMLPropTristateXXX in virDomainNumaDefParseXML storage_adapter_conf: Use virXMLPropTristateXXX in virStorageAdapterParseXMLFCHost storage_conf: Use virXMLPropTristateXXX in virStoragePoolDefParseSource src/conf/backup_conf.c | 32 +- src/conf/device_conf.c | 8 +- src/conf/device_conf.h | 4 +- src/conf/domain_conf.c | 795 +++++++------------------------- src/conf/domain_conf.h | 28 +- src/conf/network_conf.c | 15 +- src/conf/numa_conf.c | 14 +- src/conf/storage_adapter_conf.c | 14 +- src/conf/storage_adapter_conf.h | 2 +- src/conf/storage_conf.c | 17 +- src/conf/storage_conf.h | 2 +- src/conf/storage_source_conf.h | 4 +- src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 3 +- src/qemu/qemu_hotplug.c | 2 +- src/util/virpci.h | 2 +- src/util/virxml.c | 82 ++++ src/util/virxml.h | 9 + 18 files changed, 302 insertions(+), 733 deletions(-) -- 2.26.2

2 54

[PATCH 0/3] Add event for hypervisor faults and implement it for qemu
by Peter Krempa 19 Mar '21

19 Mar '21

Peter Krempa (3): qemuMonitorJSONGetStatus: Refactor cleanup API: Add VIR_DOMAIN_PAUSED_HYPERVISOR_FAULT enum value qemu: Update paused reason on unexpected 'STOP' event examples/c/misc/event-test.c | 3 +++ include/libvirt/libvirt-domain.h | 2 ++ src/conf/domain_conf.c | 1 + src/qemu/qemu_domain.c | 4 ++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 37 ++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 4 +++- src/qemu/qemu_monitor_json.c | 18 ++++++---------- src/qemu/qemu_process.c | 22 ++++++++++++++++--- tools/virsh-domain-monitor.c | 1 + tools/virsh-domain.c | 3 ++- 11 files changed, 79 insertions(+), 17 deletions(-) -- 2.29.2

2 6

[libvirt PATCH v4 0/6] ci: helper: Rewrite image listing in Python and add stale Docker image checker
by Erik Skultety 19 Mar '21

19 Mar '21

since v3: - more formatting changes as requested per review comments - get_registry_stale_images was simplified according to the comments - class attributes were also converted to private in [6/6] v1: https://listman.redhat.com/archives/libvir-list/2021-February/msg00641.ht= ml v2: https://listman.redhat.com/archives/libvir-list/2021-March/msg00789.html v3: https://listman.redhat.com/archives/libvir-list/2021-March/msg00892.html Erik Skultety (6): ci: helper: Use the ArgumentDefaultsHelpFormatter help formatter ci: helper: Introduce --quiet ci: Introduce a util module ci: helper: Rewrite image listing to Python ci: util: Add a registry checker for stale images ci: helper: Apply Python naming practice to private methods/attributes ci/Makefile | 12 --- ci/helper | 203 +++++++++++++++++++++++++++++++++------------- ci/list-images.sh | 14 ---- ci/util.py | 81 ++++++++++++++++++ 4 files changed, 229 insertions(+), 81 deletions(-) delete mode 100644 ci/list-images.sh create mode 100644 ci/util.py --=20 2.30.2

2 9

[PATCH] qemu: backup: Restore security label on backup disk store image on VM termination
by Peter Krempa 19 Mar '21

19 Mar '21

When the backup job is terminated normally the security label is restored by the blockjob finishing handler. If the VM dies or is destroyed that wouldn't happen as the blockjob handler wouldn't be called. Restore the security label on disk store where we remember that the job was running at the point when 'qemuBackupJobTerminate' was called. Not resetting the security label means that we also leak the xattr attributes remembering the label which prevents any further use of the file, which is a problem for block devices. This also requires that the call to 'qemuBackupJobTerminate' from 'qemuProcessStop' happens only after 'vm->pid' was reset as otherwise the security subdrivers attempt to enter the process namespace which fails if the process isn't running any more. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1939082 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_backup.c | 36 ++++++++++++++++++++++++++---------- src/qemu/qemu_process.c | 8 ++++---- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index f91d632715..430c11762c 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -28,6 +28,7 @@ #include "qemu_monitor_json.h" #include "qemu_checkpoint.h" #include "qemu_command.h" +#include "qemu_security.h" #include "storage_source.h" #include "storage_source_conf.h" @@ -558,25 +559,40 @@ qemuBackupJobTerminate(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg = NULL; size_t i; - if (!(priv->backup->apiFlags & VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL) && - (priv->backup->type == VIR_DOMAIN_BACKUP_TYPE_PULL || - (priv->backup->type == VIR_DOMAIN_BACKUP_TYPE_PUSH && - jobstatus != QEMU_DOMAIN_JOB_STATUS_COMPLETED))) { + for (i = 0; i < priv->backup->ndisks; i++) { + virDomainBackupDiskDefPtr backupdisk = priv->backup->disks + i; - g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver); + if (!backupdisk->store) + continue; + + /* restore security label on the images in case the blockjob finishing + * handler didn't do so, such as when the VM was destroyed */ + if (backupdisk->state == VIR_DOMAIN_BACKUP_DISK_STATE_RUNNING || + backupdisk->state == VIR_DOMAIN_BACKUP_DISK_STATE_NONE) { + if (qemuSecurityRestoreImageLabel(priv->driver, vm, backupdisk->store, + false) < 0) + VIR_WARN("Unable to restore security label on %s", + NULLSTR(backupdisk->store->path)); + } + + /* delete unneeded images created by libvirt */ + if (backupdisk->store->type == VIR_STORAGE_TYPE_FILE && + !(priv->backup->apiFlags & VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL) && + (priv->backup->type == VIR_DOMAIN_BACKUP_TYPE_PULL || + (priv->backup->type == VIR_DOMAIN_BACKUP_TYPE_PUSH && + jobstatus != QEMU_DOMAIN_JOB_STATUS_COMPLETED))) { - for (i = 0; i < priv->backup->ndisks; i++) { - virDomainBackupDiskDefPtr backupdisk = priv->backup->disks + i; uid_t uid; gid_t gid; - if (!backupdisk->store || - backupdisk->store->type != VIR_STORAGE_TYPE_FILE) - continue; + if (!cfg) + cfg = virQEMUDriverGetConfig(priv->driver); qemuDomainGetImageIds(cfg, vm, backupdisk->store, NULL, &uid, &gid); + if (virFileRemove(backupdisk->store->path, uid, gid) < 0) VIR_WARN("failed to remove scratch file '%s'", backupdisk->store->path); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5f31260221..0b79dde2c3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7822,10 +7822,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, virResctrlAllocRemove(vm->def->resctrls[i]->alloc); } - /* clean up a possible backup job */ - if (priv->backup) - qemuBackupJobTerminate(vm, QEMU_DOMAIN_JOB_STATUS_CANCELED); - qemuProcessRemoveDomainStatus(driver, vm); /* Remove VNC and Spice ports from port reservation bitmap, but only if @@ -7877,6 +7873,10 @@ void qemuProcessStop(virQEMUDriverPtr driver, for (i = 0; i < vm->def->niothreadids; i++) vm->def->iothreadids[i]->thread_id = 0; + /* clean up a possible backup job */ + if (priv->backup) + qemuBackupJobTerminate(vm, QEMU_DOMAIN_JOB_STATUS_CANCELED); + /* Do this explicitly after vm->pid is reset so that security drivers don't * try to enter the domain's namespace which is non-existent by now as qemu * is no longer running. */ -- 2.29.2

2 1

Host attached usb device lost during a managedsave/start sequence
by Hans-Peter Jansen 19 Mar '21

19 Mar '21

Hi, using libvirt 7.1.0, qemu-kvm 5.2.0 on a host with kernel 5.11.6 (otherwise Leap 15.2), I noticed an issue within a managedsave/start sequence. After resuming a w2k19 client, accessing a host attached usb device fails. It is still attached, but the client doesn't recognize the device anymore. Reattaching fails with: $ virsh attach-device fs2k19 /work/libvirt/devices/fs2k19.xml error: Failed to attach device from /work/libvirt/devices/fs2k19.xml error: Angeforderte Operation ist nicht gültig: USB device 001:007 is in use by driver QEMU, domain fs2k19 Manually detaching and reattaching it works fine: $ virsh detach-device fs2k19 /work/libvirt/devices/fs2k19.xml Device detached successfully virsh attach-device fs2k19 /work/libvirt/devices/fs2k19.xml Device attached successfully Let me know, if you need more details on this. Pete

1 0

[libvirt PATCH v3 0/6] ci: helper: Rewrite image listing in Python and add stale Docker image checker
by Erik Skultety 19 Mar '21

19 Mar '21

since v2: - dropped original patch 1 renaming ci-help to help in Makefile - changed the --quiet cmdline option to be tied to the refresh cmd only - urrlib imports fixed - improved on Python type hinting - improved util functions docstrings - replaced all tabs in formatted strings with 4 spaces - moved the list_stale_images method to util as requested - renamed variables in list_stale_images so that it's more clear at first glance what they actually hold - added a hint on where GitLab personal tokens should be generated - added a patch converting private method naming to reflect the common Python practice (I did it in a separate patch so that if this is not accepted I only need to ditch a single patch with no further changes) v1: https://listman.redhat.com/archives/libvir-list/2021-February/msg00641.ht= ml v2: https://listman.redhat.com/archives/libvir-list/2021-March/msg00789.html EXAMPLE OUTPUT OF THE REGISTRY CHECKER: The following images can be purged from the registry: ci-debian-9: (ID: 1154661) ci-debian-9-cross-aarch64: (ID: 1154667) ci-debian-9-cross-mipsel: (ID: 1154669) ci-debian-9-cross-armv7l: (ID: 1154671) ci-debian-9-cross-armv6l: (ID: 1154676) ci-debian-9-cross-mips: (ID: 1154678) ci-debian-9-cross-ppc64le: (ID: 1154682) ci-debian-9-cross-s390x: (ID: 1154683) ci-debian-9-cross-mips64el: (ID: 1154686) ci-fedora-31: (ID: 1154687) ci-opensuse-151: (ID: 1154724) You can remove the above images over the API with the following code snippet: $ for image_id in 1154661 1154667 1154669 1154671 1154676 1154678 1154682= \ 1154683 1154686 1154687 1154724; do \ curl --request DELETE --header "PRIVATE-TOKEN: <access_token>" \ https://gitlab.com/api/v4/projects/libvirt%2Flibvirt/registry/repos= itories/$image_id \ done You can generate a personal access token here: https://gitlab.com/-/profile/personal_access_tokens Erik Skultety (6): ci: helper: Use the ArgumentDefaultsHelpFormatter help formatter ci: helper: Introduce --quiet ci: Introduce a util module ci: helper: Rewrite image listing to Python ci: util: Add a registry checker for stale images ci: helper: Convert private methods to Python common naming practice ci/Makefile | 12 ---- ci/helper | 162 ++++++++++++++++++++++++++++++++++++---------- ci/list-images.sh | 14 ---- ci/util.py | 92 ++++++++++++++++++++++++++ 4 files changed, 219 insertions(+), 61 deletions(-) delete mode 100644 ci/list-images.sh create mode 100644 ci/util.py --=20 2.29.2

2 12

[PULL v2 00/13] misc patches removing deprecated features
by Daniel P. Berrangé 18 Mar '21

18 Mar '21

The following changes since commit 571d413b5da6bc6f1c2aaca8484717642255ddb0: Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20210316' into staging (2021-03-17 21:02:37 +0000) are available in the Git repository at: https://gitlab.com/berrange/qemu tags/dep-many-pull-request for you to fetch changes up to 8d17adf34f501ded65a106572740760f0a75577c: block: remove support for using "file" driver with block/char devices (2021-03-18 09:22:55 +0000) ---------------------------------------------------------------- Remove many old deprecated features The following features have been deprecated for well over the 2 release cycle we promise ``-drive file=json:{...{'driver':'file'}}`` (since 3.0) ``-vnc acl`` (since 4.0.0) ``-mon ...,control=readline,pretty=on|off`` (since 4.1) ``migrate_set_downtime`` and ``migrate_set_speed`` (since 2.8.0) ``query-named-block-nodes`` result ``encryption_key_missing`` (since 2.10.0) ``query-block`` result ``inserted.encryption_key_missing`` (since 2.10.0) ``migrate-set-cache-size`` and ``query-migrate-cache-size`` (since 2.11.0) ``query-named-block-nodes`` and ``query-block`` result dirty-bitmaps[i].status (since 4.0) ``query-cpus`` (since 2.12.0) ``query-cpus-fast`` ``arch`` output member (since 3.0.0) ``query-events`` (since 4.0) chardev client socket with ``wait`` option (since 4.0) ``acl_show``, ``acl_reset``, ``acl_policy``, ``acl_add``, ``acl_remove`` (since 4.0.0) ``ide-drive`` (since 4.2) ``scsi-disk`` (since 4.2) ---------------------------------------------------------------- Daniel P. Berrangé (13): ui, monitor: remove deprecated VNC ACL option and HMP commands monitor: raise error when 'pretty' option is used with HMP monitor: remove 'query-events' QMP command migrate: remove QMP/HMP commands for speed, downtime and cache size machine: remove 'query-cpus' QMP command machine: remove 'arch' field from 'query-cpus-fast' QMP command chardev: reject use of 'wait' flag for socket client chardevs hw/ide: remove 'ide-drive' device hw/scsi: remove 'scsi-disk' device block: remove 'encryption_key_missing' flag from QAPI block: remove dirty bitmaps 'status' field block: remove 'dirty-bitmaps' field from 'BlockInfo' struct block: remove support for using "file" driver with block/char devices block/dirty-bitmap.c | 38 -- block/file-posix.c | 17 +- block/qapi.c | 6 - chardev/char-socket.c | 12 +- docs/devel/migration.rst | 2 +- docs/qdev-device-use.txt | 2 +- docs/rdma.txt | 2 +- docs/system/deprecated.rst | 108 ----- docs/system/removed-features.rst | 108 +++++ docs/xbzrle.txt | 5 - hmp-commands-info.hx | 13 - hmp-commands.hx | 121 ------ hw/core/machine-hmp-cmds.c | 8 +- hw/core/machine-qmp-cmds.c | 120 ------ hw/i386/pc.c | 2 - hw/ide/qdev.c | 38 -- hw/ppc/mac_newworld.c | 13 - hw/ppc/mac_oldworld.c | 13 - hw/scsi/scsi-disk.c | 62 --- hw/sparc64/sun4u.c | 15 - include/block/dirty-bitmap.h | 1 - include/monitor/hmp.h | 4 - migration/migration.c | 45 --- migration/ram.c | 2 +- monitor/hmp-cmds.c | 34 -- monitor/misc.c | 187 --------- monitor/monitor.c | 4 +- monitor/qmp-cmds-control.c | 24 -- qapi/block-core.json | 64 +-- qapi/control.json | 45 --- qapi/machine.json | 181 +-------- qapi/migration.json | 98 ----- qemu-options.hx | 5 +- scripts/device-crash-test | 2 - softmmu/vl.c | 1 - tests/acceptance/pc_cpu_hotplug_props.py | 2 +- tests/acceptance/x86_cpu_model_versions.py | 2 +- tests/migration/guestperf/engine.py | 18 +- tests/qemu-iotests/051 | 4 - tests/qemu-iotests/051.pc.out | 20 - tests/qemu-iotests/124 | 4 - tests/qemu-iotests/181 | 2 +- tests/qemu-iotests/184.out | 6 +- tests/qemu-iotests/191.out | 48 +-- tests/qemu-iotests/194 | 4 +- tests/qemu-iotests/194.out | 4 +- tests/qemu-iotests/226.out | 10 +- tests/qemu-iotests/236 | 2 +- tests/qemu-iotests/236.out | 42 +- tests/qemu-iotests/246 | 3 +- tests/qemu-iotests/246.out | 66 +-- tests/qemu-iotests/254 | 2 +- tests/qemu-iotests/254.out | 9 +- tests/qemu-iotests/257.out | 378 ++++++------------ tests/qemu-iotests/260 | 5 +- tests/qemu-iotests/273.out | 15 +- .../tests/migrate-bitmaps-postcopy-test | 6 +- tests/qtest/migration-test.c | 48 --- tests/qtest/numa-test.c | 6 +- tests/qtest/qmp-test.c | 6 +- tests/qtest/test-hmp.c | 6 +- tests/qtest/test-x86-cpuid-compat.c | 4 +- tests/qtest/vhost-user-test.c | 8 +- ui/vnc.c | 38 -- 64 files changed, 369 insertions(+), 1801 deletions(-) -- 2.30.2

2 14

[PATCH v7 00/11] Configurable policy for handling deprecated interfaces
by Markus Armbruster 18 Mar '21

18 Mar '21

New option -compat lets you configure what to do when deprecated interfaces get used. This is intended for testing users of the management interfaces. It is experimental. -compat deprecated-input=<in-policy> configures what to do when deprecated input is received. Available policies: * accept: Accept deprecated commands and arguments (default) * reject: Reject them * crash: Crash -compat deprecated-output=<out-policy> configures what to do when deprecated output is sent. Available output policies: * accept: Emit deprecated command results and events (default) * hide: Suppress them For now, -compat covers only deprecated syntactic aspects of QMP. We may want to extend it to cover semantic aspects, CLI, and experimental features. v7: * Trivially rebased * PATCH 01: New, bug fix from Paolo * PATCH 02+11: Since: comments fixed, for real this time [Eric] * PATCH 03+10: qobject_output_visitor_new_qmp() and qobject_input_visitor_new_qmp() moved to qmp-dispatch.c to not break --disable-system --disable-tools builds * PATCH 05: Minor fallout from changed PATCH 03 * PATCH 06: Commit message typo fixed [Eric] v6: * Rebased, with straightforward conflicts * PATCH 1: More verbose commit message, explaining intent, and the lack of introspection [Peter], comments updated for 6.0, Eric's R-by kept anyway * PATCH 5+6: Split old PATCH 5 [Eric], Eric's R-by lept anyway * PATCH 7: New, correcting a latent issue so it doesn't break PATCH 8 * PATCH 10: Doc fix [Eric] v5: * Old PATCH 01-26 merged in commit f57587c7d47. * Rebased, non-trivial conflicts in PATCH 1 due to Meson, and in PATCH 7 due to visitor changes * PATCH 1: Comments updated for 5.2 [Eric] * PATCH 2: Harmless missing initialization fixed [Eric] * PATCH 3+4: Harmless missing has_FOO = true fixed [Eric] * PATCH 6+7: Commit message tweaked v4: * PATCH 05+07: Temporary memory leak plugged [Marc-André] * PATCH 23: Rewritten [Marc-André] * PATCH 24: Comment typo [Marc-André] * PATCH 30: Memory leaks plugged v3: * Rebased, non-trivial conflicts in PATCH 01+26+27+34 due to RST conversion and code motion * PATCH 28-29: Old PATCH 28 split up to ease review * PATCH 30-31: New * PATCH 32-33: Old PATCH 29 split up to ease review Comparison to RFC (24 Oct 2019): * Cover arguments and results in addition to commands and events * Half-baked "[RFC PATCH 18/19] qapi: Include a warning in the response to a deprecated command" dropped See also last item of Subject: Minutes of KVM Forum BoF on deprecating stuff Date: Fri, 26 Oct 2018 16:03:51 +0200 Message-ID: <87mur0ls8o.fsf(a)dusky.pond.sub.org> https://lists.nongnu.org/archive/html/qemu-devel/2018-10/msg05828.html Cc: Lukáš Doktor <ldoktor(a)redhat.com> Cc: libguestfs(a)redhat.com Cc: libvir-list(a)redhat.com Cc: Daniel P. Berrange <berrange(a)redhat.com> Cc: Peter Krempa <pkrempa(a)redhat.com> Cc: Kevin Wolf <kwolf(a)redhat.com> Markus Armbruster (10): qemu-options: New -compat to set policy for deprecated interfaces qapi: Implement deprecated-output=hide for QMP command results qapi: Implement deprecated-output=hide for QMP events qapi: Implement deprecated-output=hide for QMP event data monitor: Drop query-qmp-schema 'gen': false hack qapi: Implement deprecated-output=hide for QMP introspection test-util-sockets: Add stub for monitor_set_cur() qapi: Implement deprecated-input=reject for QMP commands qapi: Implement deprecated-input=reject for QMP command arguments qapi: New -compat deprecated-input=crash Paolo Bonzini (1): qemuutil: remove qemu_set_fd_handler duplicate symbol qapi/compat.json | 52 ++++++++++++ qapi/introspect.json | 2 +- qapi/qapi-schema.json | 1 + include/qapi/compat-policy.h | 38 +++++++++ include/qapi/qmp/dispatch.h | 1 + include/qapi/qobject-input-visitor.h | 4 + include/qapi/qobject-output-visitor.h | 4 + include/qapi/visitor-impl.h | 6 ++ include/qapi/visitor.h | 18 +++++ monitor/monitor-internal.h | 3 - monitor/misc.c | 2 - monitor/qmp-cmds-control.c | 100 +++++++++++++++++++++--- qapi/qapi-visit-core.c | 18 +++++ qapi/qmp-dispatch.c | 35 +++++++++ qapi/qobject-input-visitor.c | 29 +++++++ qapi/qobject-output-visitor.c | 19 +++++ softmmu/vl.c | 17 ++++ storage-daemon/qemu-storage-daemon.c | 2 - stubs/set-fd-handler.c | 10 --- tests/unit/test-qmp-cmds.c | 91 +++++++++++++++++++-- tests/unit/test-qmp-event.c | 41 ++++++++++ tests/unit/test-util-sockets.c | 1 + qapi/meson.build | 1 + qapi/trace-events | 2 + qemu-options.hx | 22 ++++++ scripts/qapi/commands.py | 17 ++-- scripts/qapi/events.py | 21 ++++- scripts/qapi/visit.py | 15 ++++ stubs/meson.build | 1 - tests/qapi-schema/qapi-schema-test.json | 20 +++-- tests/qapi-schema/qapi-schema-test.out | 20 ++--- 31 files changed, 549 insertions(+), 64 deletions(-) create mode 100644 qapi/compat.json create mode 100644 include/qapi/compat-policy.h delete mode 100644 stubs/set-fd-handler.c -- 2.26.3

1 0

[libvirt PATCH 00/38] Refactor XML parsing boilerplate code
by Tim Wiederhake 18 Mar '21

18 Mar '21

This series replaces some recurring boilerplate code in src/conf/ regarding the extraction of a virTristate(Switch|Bool) XML attribute. The boilerplate code looks roughly like this, g_autofree char *str = NULL; if (str = virXMLPropString(node, ...)) { int val; if ((val = virTristateBoolTypeFromString(str)) <= 0) { virReportError(...) return -1; } def->... = val; } with some variations regarding how `str` is free'd in case of later re-use, the exact error message for invalid values, whether or not `VIR_TRISTATE_(SWITCH|BOOL)_ABSENT` is explicitly checked for (`val < 0` vs. `val <= 0`), whether an intermediate variable is used or the value is assigned directly, and in some cases the conditions in the two if-blocks are merged. As a side effect, this makes the error messages for invalid values in these attributes much more consistent and catches some instances where e.g. `<foo bar="default"/>` would incorrectly be accepted. Patch #11 (virDomainChrSourceReconnectDefParseXML) is a good example of what this refactoring is about. Tim Wiederhake (38): virStorageAdapterFCHost: Fix comment virxml: Add virXMLPropYesNo virxml: Add virXMLPropOnOff domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainKeyWrapCipherDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainVirtioOptionsParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainDeviceInfoParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainDiskSourceNetworkParse domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainDiskSourceNVMeParse domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainDiskDefDriverParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainActualNetDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainChrSourceReconnectDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainNetDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainChrSourceDefParseTCP domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainChrSourceDefParseFile domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainChrSourceDefParseLog domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainGraphicsDefParseXMLVNC domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainGraphicsDefParseXMLSDL domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainGraphicsDefParseXMLSpice domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainAudioCommonParse domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainAudioJackParse domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainAudioOSSParse domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainAudioDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainMemballoonDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainShmemDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainPerfEventDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainMemoryDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainIOMMUDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainVsockDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainFeaturesDefParse domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainLoaderDefParseXML domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainVcpuParse backup_conf: Use virXMLProp(OnOff|YesNo) in virDomainBackupDiskDefParseXML backup_conf: Use virXMLProp(OnOff|YesNo) in virDomainBackupDefParse device_conf: Use virXMLProp(OnOff|YesNo) in virPCIDeviceAddressParseXML network_conf: Use virXMLProp(OnOff|YesNo) in virNetworkForwardNatDefParseXML numa_conf: Use virXMLProp(OnOff|YesNo) in virDomainNumaDefParseXML storage_adapter_conf: Use virXMLProp(OnOff|YesNo) in virStorageAdapterParseXMLFCHost storage_conf: Use virXMLProp(OnOff|YesNo) in virStoragePoolDefParseSource src/conf/backup_conf.c | 32 +- src/conf/device_conf.c | 10 +- src/conf/domain_conf.c | 791 +++++++++----------------------- src/conf/network_conf.c | 15 +- src/conf/numa_conf.c | 13 +- src/conf/storage_adapter_conf.c | 17 +- src/conf/storage_adapter_conf.h | 2 +- src/conf/storage_conf.c | 16 +- src/util/virxml.c | 74 +++ src/util/virxml.h | 7 + 10 files changed, 314 insertions(+), 663 deletions(-) -- 2.26.2

4 45

[PATCH v6 00/10] Configurable policy for handling deprecated interfaces
by Markus Armbruster 18 Mar '21

18 Mar '21

New option -compat lets you configure what to do when deprecated interfaces get used. This is intended for testing users of the management interfaces. It is experimental. -compat deprecated-input=<in-policy> configures what to do when deprecated input is received. Available policies: * accept: Accept deprecated commands and arguments (default) * reject: Reject them * crash: Crash -compat deprecated-output=<out-policy> configures what to do when deprecated output is sent. Available output policies: * accept: Emit deprecated command results and events (default) * hide: Suppress them For now, -compat covers only deprecated syntactic aspects of QMP. We may want to extend it to cover semantic aspects, CLI, and experimental features. v6: * Rebased, with straightforward conflicts * PATCH 1: More verbose commit message, explaining intent, and the lack of introspection [Peter], comments updated for 6.0, Eric's R-by kept anyway * PATCH 5+6: Split old PATCH 5 [Eric], Eric's R-by lept anyway * PATCH 7: New, correcting a latent issue so it doesn't break PATCH 8 * PATCH 10: Doc fix [Eric] v5: * Old PATCH 01-26 merged in commit f57587c7d47. * Rebased, non-trivial conflicts in PATCH 1 due to Meson, and in PATCH 7 due to visitor changes * PATCH 1: Comments updated for 5.2 [Eric] * PATCH 2: Harmless missing initialization fixed [Eric] * PATCH 3+4: Harmless missing has_FOO = true fixed [Eric] * PATCH 6+7: Commit message tweaked v4: * PATCH 05+07: Temporary memory leak plugged [Marc-André] * PATCH 23: Rewritten [Marc-André] * PATCH 24: Comment typo [Marc-André] * PATCH 30: Memory leaks plugged v3: * Rebased, non-trivial conflicts in PATCH 01+26+27+34 due to RST conversion and code motion * PATCH 28-29: Old PATCH 28 split up to ease review * PATCH 30-31: New * PATCH 32-33: Old PATCH 29 split up to ease review Comparison to RFC (24 Oct 2019): * Cover arguments and results in addition to commands and events * Half-baked "[RFC PATCH 18/19] qapi: Include a warning in the response to a deprecated command" dropped See also last item of Subject: Minutes of KVM Forum BoF on deprecating stuff Date: Fri, 26 Oct 2018 16:03:51 +0200 Message-ID: <87mur0ls8o.fsf(a)dusky.pond.sub.org> https://lists.nongnu.org/archive/html/qemu-devel/2018-10/msg05828.html Cc: Lukáš Doktor <ldoktor(a)redhat.com> Cc: libguestfs(a)redhat.com Cc: libvir-list(a)redhat.com Cc: Daniel P. Berrange <berrange(a)redhat.com> Cc: Peter Krempa <pkrempa(a)redhat.com> Cc: Kevin Wolf <kwolf(a)redhat.com> Markus Armbruster (10): qemu-options: New -compat to set policy for deprecated interfaces qapi: Implement deprecated-output=hide for QMP command results qapi: Implement deprecated-output=hide for QMP events qapi: Implement deprecated-output=hide for QMP event data monitor: Drop query-qmp-schema 'gen': false hack qapi: Implement deprecated-output=hide for QMP introspection test-util-sockets: Add stub for monitor_set_cur() qapi: Implement deprecated-input=reject for QMP commands qapi: Implement deprecated-input=reject for QMP command arguments qapi: New -compat deprecated-input=crash qapi/compat.json | 52 ++++++++++++ qapi/introspect.json | 2 +- qapi/qapi-schema.json | 1 + include/qapi/compat-policy.h | 20 +++++ include/qapi/qmp/dispatch.h | 1 + include/qapi/qobject-input-visitor.h | 9 +++ include/qapi/qobject-output-visitor.h | 9 +++ include/qapi/visitor-impl.h | 6 ++ include/qapi/visitor.h | 18 +++++ monitor/monitor-internal.h | 3 - monitor/misc.c | 2 - monitor/qmp-cmds-control.c | 100 +++++++++++++++++++++--- qapi/qapi-visit-core.c | 18 +++++ qapi/qmp-dispatch.c | 17 ++++ qapi/qobject-input-visitor.c | 29 +++++++ qapi/qobject-output-visitor.c | 19 +++++ softmmu/vl.c | 17 ++++ storage-daemon/qemu-storage-daemon.c | 2 - tests/test-qmp-cmds.c | 91 +++++++++++++++++++-- tests/test-qmp-event.c | 41 ++++++++++ tests/test-util-sockets.c | 1 + qapi/meson.build | 1 + qapi/trace-events | 2 + qemu-options.hx | 22 ++++++ scripts/qapi/commands.py | 14 ++-- scripts/qapi/events.py | 20 ++++- scripts/qapi/visit.py | 15 ++++ tests/qapi-schema/qapi-schema-test.json | 20 +++-- tests/qapi-schema/qapi-schema-test.out | 20 ++--- 29 files changed, 522 insertions(+), 50 deletions(-) create mode 100644 qapi/compat.json create mode 100644 include/qapi/compat-policy.h -- 2.26.2

1 1

[PATCH v2 0/2] XML non-virtio video device validation
by Kristina Hanicova 18 Mar '21

18 Mar '21

Kristina Hanicova (2): move virDomainCheckVirtioOptionsAreAbsent a few lines forward XML validate that non-virtio video devices have none virtio options src/conf/domain_validate.c | 60 ++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 28 deletions(-) -- 2.29.2

2 4

[PATCH 0/2] refactoring conf for virDomainDeviceInfoParseXML to use XPath
by Kristina Hanicova 18 Mar '21

18 Mar '21

Kristina Hanicova (2): conf: Propagate xmlXPathContextPtr into virDomainDeviceInfoParseXML() refactoring virDomainDeviceInfoParseXML to use XPath src/conf/domain_conf.c | 116 +++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 67 deletions(-) -- 2.29.2

2 3

[PATCH v2] bhyve: add <os firmware='efi'> support
by Roman Bogorodskiy 18 Mar '21

18 Mar '21

Implement "<os firmware='efi'>" support for bhyve driver. As there are not really lot of options, try to find "BHYVE_UEFI.fd" firmware which is installed by the sysutils/uefi-edk2-bhyve FreeBSD port. If not found, just use the first found firmware in the firmwares directory (which is configurable via config file). Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- Changes from v1: - Fixed various leaks, - Re-implemented testing using opendir() mock. po/POTFILES.in | 1 + src/bhyve/bhyve_domain.c | 5 + src/bhyve/bhyve_firmware.c | 91 +++++++++++++++++++ src/bhyve/bhyve_firmware.h | 30 ++++++ src/bhyve/bhyve_process.c | 15 +++ src/bhyve/bhyve_process.h | 5 + src/bhyve/bhyve_utils.h | 2 + src/bhyve/meson.build | 1 + tests/bhyvefirmwaredata/empty/.keepme | 0 .../three_firmwares/BHYVE_UEFI.fd | 0 .../three_firmwares/BHYVE_UEFI_CSM.fd | 0 .../three_firmwares/refind_x64.efi | 0 .../bhyvexml2argv-firmware-efi.args | 11 +++ .../bhyvexml2argv-firmware-efi.ldargs | 1 + .../bhyvexml2argv-firmware-efi.xml | 22 +++++ tests/bhyvexml2argvmock.c | 33 +++++++ tests/bhyvexml2argvtest.c | 52 ++++++++--- 17 files changed, 257 insertions(+), 12 deletions(-) create mode 100644 src/bhyve/bhyve_firmware.c create mode 100644 src/bhyve/bhyve_firmware.h create mode 100644 tests/bhyvefirmwaredata/empty/.keepme create mode 100644 tests/bhyvefirmwaredata/three_firmwares/BHYVE_UEFI.fd create mode 100644 tests/bhyvefirmwaredata/three_firmwares/BHYVE_UEFI_CSM.fd create mode 100644 tests/bhyvefirmwaredata/three_firmwares/refind_x64.efi create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml diff --git a/po/POTFILES.in b/po/POTFILES.in index 80c5f145be..413783ee35 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,6 +14,7 @@ @SRCDIR@src/bhyve/bhyve_command.c @SRCDIR@src/bhyve/bhyve_domain.c @SRCDIR@src/bhyve/bhyve_driver.c +@SRCDIR@src/bhyve/bhyve_firmware.c @SRCDIR@src/bhyve/bhyve_monitor.c @SRCDIR@src/bhyve/bhyve_parse_command.c @SRCDIR@src/bhyve/bhyve_process.c diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 8fbc554a0a..209e4d3905 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -64,6 +64,9 @@ bhyveDomainDefNeedsISAController(virDomainDefPtr def) if (def->os.bootloader == NULL && def->os.loader) return true; + if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) + return true; + if (def->nserials || def->nconsoles) return true; @@ -230,6 +233,8 @@ virDomainDefParserConfig virBhyveDriverDomainDefParserConfig = { .domainPostParseCallback = bhyveDomainDefPostParse, .assignAddressesCallback = bhyveDomainDefAssignAddresses, .deviceValidateCallback = bhyveDomainDeviceDefValidate, + + .features = VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT, }; static void diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c new file mode 100644 index 0000000000..2055f34288 --- /dev/null +++ b/src/bhyve/bhyve_firmware.c @@ -0,0 +1,91 @@ +/* + * bhyve_firmware.c: bhyve firmware management + * + * Copyright (C) 2021 Roman Bogorodskiy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> +#include <dirent.h> + +#include "viralloc.h" +#include "virlog.h" +#include "virfile.h" +#include "bhyve_conf.h" +#include "bhyve_firmware.h" + +#define VIR_FROM_THIS VIR_FROM_BHYVE + +VIR_LOG_INIT("bhyve.bhyve_firmware"); + + +#define BHYVE_DEFAULT_FIRMWARE "BHYVE_UEFI.fd" + +int +bhyveFirmwareFillDomain(bhyveConnPtr driver, + virDomainDefPtr def, + unsigned int flags) +{ + g_autoptr(DIR) dir = NULL; + g_autoptr(virBhyveDriverConfig) cfg = virBhyveDriverGetConfig(driver); + const char *firmware_dir = cfg->firmwareDir; + struct dirent *entry; + g_autofree char *matching_firmware = NULL; + g_autofree char *first_found = NULL; + + virCheckFlags(0, -1); + + if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) + return 0; + + if (virDirOpenIfExists(&dir, firmware_dir) > 0) { + while ((virDirRead(dir, &entry, firmware_dir)) > 0) { + if (g_str_has_prefix(entry->d_name, ".")) + continue; + + if (STREQ(entry->d_name, BHYVE_DEFAULT_FIRMWARE)) { + matching_firmware = g_strdup(entry->d_name); + break; + } + if (!first_found) + first_found = g_strdup(entry->d_name); + } + } + + if (!matching_firmware) { + if (!first_found) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("no firmwares found in %s"), + firmware_dir); + return -1; + } else { + matching_firmware = g_steal_pointer(&first_found); + } + } + + if (!def->os.loader) + def->os.loader = g_new0(virDomainLoaderDef, 1); + + def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_PFLASH; + def->os.loader->readonly = VIR_TRISTATE_BOOL_YES; + + VIR_FREE(def->os.loader->path); + + def->os.loader->path = g_build_filename(firmware_dir, matching_firmware, NULL); + + return 0; +} diff --git a/src/bhyve/bhyve_firmware.h b/src/bhyve/bhyve_firmware.h new file mode 100644 index 0000000000..ae4bc98676 --- /dev/null +++ b/src/bhyve/bhyve_firmware.h @@ -0,0 +1,30 @@ +/* + * bhyve_firmware.h: bhyve firmware management + * + * Copyright (C) 2021 Roman Bogorodskiy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +#include "domain_conf.h" +#include "bhyve_utils.h" + +int +bhyveFirmwareFillDomain(bhyveConnPtr driver, + virDomainDefPtr def, + unsigned int flags); diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 060018bc70..0cfe69688c 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -33,6 +33,7 @@ #include "bhyve_device.h" #include "bhyve_driver.h" #include "bhyve_command.h" +#include "bhyve_firmware.h" #include "bhyve_monitor.h" #include "bhyve_process.h" #include "datatypes.h" @@ -251,6 +252,17 @@ virBhyveProcessStartImpl(bhyveConnPtr driver, return ret; } +int +bhyveProcessPrepareDomain(bhyveConnPtr driver, + virDomainObjPtr vm, + unsigned int flags) +{ + if (bhyveFirmwareFillDomain(driver, vm->def, flags) < 0) + return -1; + + return 0; +} + int virBhyveProcessStart(virConnectPtr conn, virDomainObjPtr vm, @@ -268,6 +280,9 @@ virBhyveProcessStart(virConnectPtr conn, conn, bhyveProcessAutoDestroy) < 0) return -1; + if (bhyveProcessPrepareDomain(driver, vm, flags) < 0) + return -1; + return virBhyveProcessStartImpl(driver, vm, reason); } diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h index d7b4e0bd4e..133863c1e0 100644 --- a/src/bhyve/bhyve_process.h +++ b/src/bhyve/bhyve_process.h @@ -23,6 +23,11 @@ #include "bhyve_utils.h" +int +bhyveProcessPrepareDomain(bhyveConnPtr driver, + virDomainObjPtr vm, + unsigned int flags); + int virBhyveProcessStart(virConnectPtr conn, virDomainObjPtr vm, virDomainRunningReason reason, diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index f3e80b6121..3bf5ae5daf 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -43,6 +43,8 @@ struct _virBhyveDriverConfig { char *firmwareDir; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virBhyveDriverConfig, virObjectUnref); + struct _bhyveConn { virMutex lock; diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 2b65eecf5e..b3551477b7 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -2,6 +2,7 @@ bhyve_sources = files( 'bhyve_capabilities.c', 'bhyve_command.c', 'bhyve_conf.c', + 'bhyve_firmware.c', 'bhyve_parse_command.c', 'bhyve_device.c', 'bhyve_domain.c', diff --git a/tests/bhyvefirmwaredata/empty/.keepme b/tests/bhyvefirmwaredata/empty/.keepme new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/bhyvefirmwaredata/three_firmwares/BHYVE_UEFI.fd b/tests/bhyvefirmwaredata/three_firmwares/BHYVE_UEFI.fd new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/bhyvefirmwaredata/three_firmwares/BHYVE_UEFI_CSM.fd b/tests/bhyvefirmwaredata/three_firmwares/BHYVE_UEFI_CSM.fd new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/bhyvefirmwaredata/three_firmwares/refind_x64.efi b/tests/bhyvefirmwaredata/three_firmwares/refind_x64.efi new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args new file mode 100644 index 0000000000..2f5aa4d783 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args @@ -0,0 +1,11 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,fakefirmwaredir/BHYVE_UEFI.fd \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml new file mode 100644 index 0000000000..302326cb26 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml @@ -0,0 +1,22 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os firmware='efi'> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index 25b97f5e04..af5e0fd4b9 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -1,13 +1,46 @@ #include <config.h> +#include <dirent.h> + #include "viralloc.h" #include "virstring.h" #include "virnetdev.h" #include "virnetdevtap.h" +#include "virmock.h" #include "internal.h" #define VIR_FROM_THIS VIR_FROM_BHYVE +static DIR * (*real_opendir)(const char *name); + +static void +init_syms(void) +{ + VIR_MOCK_REAL_INIT(opendir); +} + +#define FAKEFIRMWAREDIR abs_srcdir "/bhyvefirmwaredata/three_firmwares" +#define FAKEFIRMWAREEMPTYDIR abs_srcdir "/bhyvefirmwaredata/empty" + +DIR * +opendir(const char *path) +{ + init_syms(); + + g_autofree char *path_override = NULL; + + if (STREQ(path, "fakefirmwaredir")) { + path_override = g_strdup(FAKEFIRMWAREDIR); + } else if (STREQ(path, "fakefirmwareemptydir")) { + path_override = g_strdup(FAKEFIRMWAREEMPTYDIR); + } + + if (!path_override) + path_override = g_strdup(path); + + return real_opendir(path_override); +} + void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], virMacAddrPtr addr) { diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 197334f9c4..34e40a6438 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -7,17 +7,20 @@ # include "datatypes.h" # include "bhyve/bhyve_capabilities.h" +# include "bhyve/bhyve_conf.h" # include "bhyve/bhyve_domain.h" # include "bhyve/bhyve_utils.h" # include "bhyve/bhyve_command.h" +# include "bhyve/bhyve_process.h" # define VIR_FROM_THIS VIR_FROM_BHYVE static bhyveConn driver; typedef enum { - FLAG_EXPECT_FAILURE = 1 << 0, - FLAG_EXPECT_PARSE_ERROR = 1 << 1, + FLAG_EXPECT_FAILURE = 1 << 0, + FLAG_EXPECT_PARSE_ERROR = 1 << 1, + FLAG_EXPECT_PREPARE_ERROR = 1 << 2, } virBhyveXMLToArgvTestFlags; static int testCompareXMLToArgvFiles(const char *xml, @@ -29,7 +32,7 @@ static int testCompareXMLToArgvFiles(const char *xml, g_autofree char *actualargv = NULL; g_autofree char *actualld = NULL; g_autofree char *actualdm = NULL; - g_autoptr(virDomainDef) vmdef = NULL; + g_autoptr(virDomainObj) vm = NULL; g_autoptr(virCommand) cmd = NULL; g_autoptr(virCommand) ldcmd = NULL; g_autoptr(virConnect) conn = NULL; @@ -38,8 +41,11 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(conn = virGetConnect())) goto out; - if (!(vmdef = virDomainDefParseFile(xml, driver.xmlopt, - NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { + if (!(vm = virDomainObjNew(driver.xmlopt))) + return -1; + + if (!(vm->def = virDomainDefParseFile(xml, driver.xmlopt, + NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { if (flags & FLAG_EXPECT_PARSE_ERROR) { ret = 0; } else if (flags & FLAG_EXPECT_FAILURE) { @@ -54,11 +60,20 @@ static int testCompareXMLToArgvFiles(const char *xml, conn->privateData = &driver; - cmd = virBhyveProcessBuildBhyveCmd(&driver, vmdef, false); - if (vmdef->os.loader) + if (bhyveProcessPrepareDomain(&driver, vm, 0) < 0) { + if (flags & FLAG_EXPECT_PREPARE_ERROR) { + ret = 0; + VIR_TEST_DEBUG("Got expected error: %s", + virGetLastErrorMessage()); + } + goto out; + } + + cmd = virBhyveProcessBuildBhyveCmd(&driver, vm->def, false); + if (vm->def->os.loader) ldcmd = virCommandNew("dummy"); else - ldcmd = virBhyveProcessBuildLoadCmd(&driver, vmdef, "<device.map>", + ldcmd = virBhyveProcessBuildLoadCmd(&driver, vm->def, "<device.map>", &actualdm); if ((cmd == NULL) || (ldcmd == NULL)) { @@ -94,10 +109,10 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; out: - if (vmdef && - vmdef->ngraphics == 1 && - vmdef->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) - virPortAllocatorRelease(vmdef->graphics[0]->data.vnc.port); + if (vm && vm->def && + vm->def->ngraphics == 1 && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) + virPortAllocatorRelease(vm->def->graphics[0]->data.vnc.port); return ret; } @@ -132,6 +147,8 @@ static int mymain(void) { int ret = 0; + g_autofree char *fakefirmwaredir = g_strdup("fakefirmwaredir"); + g_autofree char *fakefirmwareemptydir = g_strdup("fakefirmwareemptydir"); if ((driver.caps = virBhyveCapsBuild()) == NULL) return EXIT_FAILURE; @@ -142,6 +159,10 @@ mymain(void) if (!(driver.remotePorts = virPortAllocatorRangeNew("display", 5900, 65535))) return EXIT_FAILURE; + if (!(driver.config = virBhyveDriverConfigNew())) + return EXIT_FAILURE; + + driver.config->firmwareDir = fakefirmwaredir; # define DO_TEST_FULL(name, flags) \ do { \ @@ -162,6 +183,9 @@ mymain(void) # define DO_TEST_PARSE_ERROR(name) \ DO_TEST_FULL(name, FLAG_EXPECT_PARSE_ERROR) +# define DO_TEST_PREPARE_ERROR(name) \ + DO_TEST_FULL(name, FLAG_EXPECT_PREPARE_ERROR) + driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; driver.bhyvecaps = BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT | \ BHYVE_CAP_NET_E1000 | BHYVE_CAP_LPC_BOOTROM | \ @@ -209,6 +233,9 @@ mymain(void) DO_TEST("sound"); DO_TEST("isa-controller"); DO_TEST_FAILURE("isa-multiple-controllers"); + DO_TEST("firmware-efi"); + driver.config->firmwareDir = fakefirmwareemptydir; + DO_TEST_PREPARE_ERROR("firmware-efi"); DO_TEST("fs-9p"); DO_TEST("fs-9p-readonly"); DO_TEST_FAILURE("fs-9p-unsupported-type"); @@ -267,6 +294,7 @@ mymain(void) virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); virPortAllocatorRangeFree(driver.remotePorts); + virObjectUnref(driver.config); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.30.0

2 1

[libvirt PATCH] nodedev: Don't crash when exiting before init is done
by Jonathon Jongsma 18 Mar '21

18 Mar '21

If libvirtd is terminated before the node driver finishes initialization, it can crash with a backtrace similar to the following: Stack trace of thread 1922933: #0 0x00007f8515178774 g_hash_table_find (libglib-2.0.so.0) #1 0x00007f851593ea98 virHashSearch (libvirt.so.0) #2 0x00007f8515a1dd83 virNodeDeviceObjListSearch (libvirt.so.0) #3 0x00007f84cceb40a1 udevAddOneDevice (libvirt_driver_nodedev.so) #4 0x00007f84cceb5fae nodeStateInitializeEnumerate (libvirt_driver_nodedev.so) #5 0x00007f85159840cb virThreadHelper (libvirt.so.0) #6 0x00007f8511c7d14a start_thread (libpthread.so.0) #7 0x00007f851442bdb3 __clone (libc.so.6) Stack trace of thread 1922863: #0 0x00007f851442651d syscall (libc.so.6) #1 0x00007f85159842d4 virThreadSelfID (libvirt.so.0) #2 0x00007f851594e240 virLogFormatString (libvirt.so.0) #3 0x00007f851596635d vir_object_finalize (libvirt.so.0) #4 0x00007f8514efe8e9 g_object_unref (libgobject-2.0.so.0) #5 0x00007f85159667f8 virObjectUnref (libvirt.so.0) #6 0x00007f851517755f g_hash_table_remove_all_nodes.part.0 (libglib-2.0.so.0) #7 0x00007f8515177e62 g_hash_table_unref (libglib-2.0.so.0) #8 0x00007f851596637e vir_object_finalize (libvirt.so.0) #9 0x00007f8514efe8e9 g_object_unref (libgobject-2.0.so.0) #10 0x00007f85159667f8 virObjectUnref (libvirt.so.0) #11 0x00007f84cceb2b42 nodeStateCleanup (libvirt_driver_nodedev.so) #12 0x00007f8515b37950 virStateCleanup (libvirt.so.0) #13 0x00005648085348e8 main (libvirtd) #14 0x00007f8514352493 __libc_start_main (libc.so.6) #15 0x00005648085350fe _start (libvirtd) This is because the initial population of the device list is done in a separate initialization thread. If we attempt to exit libvirtd before this init thread has completed, we'll try to free the device list while accessing it from the other thread. In order to guarantee that this init thread is not accessing the device list when we're cleaning up the nodedev driver, make it joinable and wait for it to finish before proceding with the cleanup. This is similar to how we handle the udev event handler thread. The separate initialization thread was added in commit 9f0ae0b1. https://bugzilla.redhat.com/show_bug.cgi?id=1933590 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/node_device/node_device_udev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index fe25f8235e..010ebf4e74 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -66,6 +66,9 @@ struct _udevEventData { virCond threadCond; bool threadQuit; bool dataReady; + + /* init thread */ + virThread initThread; }; static virClassPtr udevEventDataClass; @@ -1660,6 +1663,7 @@ nodeStateCleanup(void) priv->threadQuit = true; virCondSignal(&priv->threadCond); virObjectUnlock(priv); + virThreadJoin(&priv->initThread); virThreadJoin(&priv->th); } @@ -1995,7 +1999,6 @@ nodeStateInitialize(bool privileged, { udevEventDataPtr priv = NULL; struct udev *udev = NULL; - virThread enumThread; if (root != NULL) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -2103,7 +2106,7 @@ nodeStateInitialize(bool privileged, if (udevSetupSystemDev() != 0) goto cleanup; - if (virThreadCreateFull(&enumThread, false, nodeStateInitializeEnumerate, + if (virThreadCreateFull(&priv->initThread, true, nodeStateInitializeEnumerate, "nodedev-init", false, udev) < 0) { virReportSystemError(errno, "%s", _("failed to create udev enumerate thread")); -- 2.26.2

2 1

[PATCH] virxml: Fix possible memory leak in virXMLNodeContentString()
by Kristina Hanicova 18 Mar '21

18 Mar '21

Previously, if xml node passed to the virXMLNodeContentString() was not of type XML_ELEMENT_NODE, @ret could have caused a memory leak because xmlNodeGetContent() works for other types of nodes as well. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/util/virxml.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virxml.c b/src/util/virxml.c index 060b7530fc..4a6fe09468 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -536,7 +536,7 @@ virXMLPropStringLimit(xmlNodePtr node, char * virXMLNodeContentString(xmlNodePtr node) { - char *ret = (char *)xmlNodeGetContent(node); + char *ret = NULL; if (node->type != XML_ELEMENT_NODE) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -545,6 +545,8 @@ virXMLNodeContentString(xmlNodePtr node) return NULL; } + ret = (char *)xmlNodeGetContent(node); + if (!ret) { virReportError(VIR_ERR_INTERNAL_ERROR, _("node '%s' has unexpected NULL content. This could be caused by malformed input, or a memory allocation failure"), -- 2.29.2

2 1

[PATCH] NEWS: Document domain memory dirty rate APIs
by Hao Wang 18 Mar '21

18 Mar '21

Signed-off-by: Hao Wang <wanghao232(a)huawei.com> --- NEWS.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index bd40373a80..df35044ef0 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -13,6 +13,17 @@ v7.2.0 (unreleased) * **New features** + * qemu: Implement domain memory dirty rate calculation API + + New API (``virDomainStartDirtyRateCalc()``) and virsh command + (``domdirtyrate-calc``) are added to start calculating a live domain's + memory dirty rate. + + * qemu: Support reporting memory dirty rate stats + + The memory dirty rate stats can be obtained through ``virsh domstats + --dirtyrate`` via the virConnectGetAllDomainStats API. + * **Improvements** * **Bug fixes** -- 2.23.0

2 1

[libvirt PATCH v2 0/6] ci: helper: Rewrite image listing in Python and add stale Docker image checker
by Erik Skultety 18 Mar '21

18 Mar '21

Technically v2 of https://listman.redhat.com/archives/libvir-list/2021-February/msg00641.html, but the changes are not minor anymore so I had to change the subject. since v1: - integrated the standalone script to the recently added 'helper' script - ditched the hardcode libvirt project ID and instead we work with namespacing instead (which is converted to the right URL under the hood) - util module moved to the ci/ directory - all util functions now use proper Python type hinting - ID is now printed along with the stale image name - address formatting issues raised v1: https://listman.redhat.com/archives/libvir-list/2021-February/msg00641.ht= ml EXAMPLE OUTPUT OF THE REGISTRY CHECKER: The following images can be purged from the registry: ci-debian-9: 1154661 ci-debian-9-cross-aarch64: 1154667 ci-debian-9-cross-mipsel: 1154669 ci-debian-9-cross-armv7l: 1154671 ci-debian-9-cross-armv6l: 1154676 ci-debian-9-cross-mips: 1154678 ci-debian-9-cross-ppc64le: 1154682 ci-debian-9-cross-s390x: 1154683 ci-debian-9-cross-mips64el: 1154686 ci-fedora-31: 1154687 ci-opensuse-151: 1154724 You can remove the above images over the API with the following code snippet: $ for image_id in 1154661 1154667 1154669 1154671 1154676 1154678 1154682= \ 1154683 1154686 1154687 1154724; do \ curl --request DELETE --header "PRIVATE-TOKEN: <access_token>" \ https://gitlab.com/api/v4/projects/libvirt%2Flibvirt/registry/repos= itories/$image_id \ done Erik Skultety (6): ci: Makefile: Specify a help target to replace ci-help ci: helper: Use the ArgumentDefaultsHelpFormatter help formatter ci: helper: Introduce --quiet ci: Introduce a util module ci: helper: Rewrite image listing to Python ci: util: Add a registry checker for stale images ci/Makefile | 16 ++----- ci/helper | 108 ++++++++++++++++++++++++++++++++++++++++++++-- ci/list-images.sh | 14 ------ ci/util.py | 52 ++++++++++++++++++++++ 4 files changed, 159 insertions(+), 31 deletions(-) delete mode 100644 ci/list-images.sh create mode 100644 ci/util.py --=20 2.29.2

2 23

[PATCH v7 0/7] migration/dirtyrate: Introduce APIs for getting domain memory dirty rate
by Hao Wang 18 Mar '21

18 Mar '21

V6 -> V7: add virDomainDirtyRateStatus enum define calc_status as int split 5/5 in v6 into two parts: 6/7 in v7: extend dirtyrate statistics for domGetStats 7/7 in v7: extend corresponding virsh command V5 -> V6: split DomainGetDirtyRateInfo(domdirtyrate) API into two parts: 1. DomainStartDirtyRateCalc(domdirtyrate-calc) for starting dirty rate calculation; 2. qemuDomainGetStatsDirtyRate(domstats --dirtyrate) for querying dirty rate infomation. V4 -> V5: squash 1/7 and bits of 5/7 and 6/7 into 2/7 in v4 (to be 1/5 in v5) squash left of 5/7 into 4/7 in v4 (to be 3/5 in v5) add VIR_DOMAIN_DIRTYRATE_DEFAULT flag remove redundant error report rename virsh api to "domdirtyrate" use vshTablePtr for virsh api output add description in docs/manpages/virsh.rst other format optimize V3 -> V4: define flags to unsigned int fix some compile warnings V2 -> V3: reorganize patchset to fix compile warning V1 -> V2: replace QEMU_JOB_ASYNC with QEMU_JOB_QUERY Sometimes domain's memory dirty rate is expected by user in order to decide whether it's proper to be migrated out or not. We have already completed the QEMU part of the capability: https://patchew.org/QEMU/1600237327-33618-1-git-send-email-zhengchuan@huawe… And this serial of patches introduce the corresponding LIBVIRT part: 1. Calculating Introduce a new API DomainStartDirtyRateCalc and corresponding virsh api (domdirtyrate-calc) for starting dirty rate calculation by calling qmp 'calc-dirty-rate'. # virsh domdirtyrate-calc <domain> [--seconds <sec>] 2. Querying Introduce command 'virsh domstats --dirtyrate' for reporting memory dirty rate infomation by calling qmp 'query-dirty-rate'. The info is listed as: Domain: 'vm0' dirtyrate.calc_status=2 dirtyrate.calc_start_time=1534523 dirtyrate.calc_period=1 dirtyrate.megabytes_per_second=5 Hao Wang (7): migration/dirtyrate: Introduce virDomainStartDirtyRateCalc API migration/dirtyrate: Implement qemuDomainStartDirtyRateCalc migration/dirtyrate: Introduce domdirtyrate-calc virsh api migration/dirtyrate: Introduce virDomainDirtyRateStatus enum migration/dirtyrate: Implement qemuMonitorQueryDirtyRate migration/dirtyrate: Extend dirtyrate statistics for domGetStats migration/dirtyrate: Introduce command 'virsh domstats --dirtyrate' docs/manpages/virsh.rst | 33 +++++++++- include/libvirt/libvirt-domain.h | 23 +++++++ src/driver-hypervisor.h | 6 ++ src/libvirt-domain.c | 59 +++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 110 +++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 24 +++++++ src/qemu/qemu_monitor.h | 19 ++++++ src/qemu/qemu_monitor_json.c | 101 ++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 +++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 +++- src/remote_protocol-structs | 6 ++ tools/virsh-domain-monitor.c | 7 ++ tools/virsh-domain.c | 58 ++++++++++++++++ 15 files changed, 471 insertions(+), 3 deletions(-) -- 2.23.0

2 9

[PATCH v1] tests: Adjust libxlxml2domconfigtest to work with Xen < 4.8
by Olaf Hering 18 Mar '21

18 Mar '21

Commit fcdc387410fadfb066b95395c5b5d2a6a16f7066 used a libxl API which is only available since Xen 4.8. Due to lack of a specific guard for this API change, reuse another guard from libxl.h. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- tests/libxlxml2domconfigtest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index d58be1211b..c13a562a3c 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -105,7 +105,13 @@ testCompareXMLToDomConfig(const char *xmlfile, */ # ifndef LIBXL_HAVE_BUILDINFO_APIC if (expectconfig.c_info.type == LIBXL_DOMAIN_TYPE_HVM) { +# ifdef LIBXL_HAVE_MEMKB_64BITS + /* + * This part of the libxl API was changed without a guard in Xen 4.8. + * Reuse another Xen 4.8 specific conditional. + */ libxl_defbool_unset(&expectconfig.b_info.acpi); +# endif libxl_defbool_set(&expectconfig.b_info.u.hvm.apic, true); libxl_defbool_set(&expectconfig.b_info.u.hvm.acpi, true); }

3 2

[PULL 00/13] misc patches removing deprecated features
by Daniel P. Berrangé 17 Mar '21

17 Mar '21

The following changes since commit 6e31b3a5c34c6e5be7ef60773e607f189eaa15f3: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2021-03-16 10:53:47 +0000) are available in the Git repository at: https://gitlab.com/berrange/qemu tags/dep-many-pull-request for you to fetch changes up to 13bf1a48d1671e26ca2fa13817d388fbdc4215ff: block: remove support for using "file" driver with block/char devices (2021-03-16 16:33:52 +0000) ---------------------------------------------------------------- Remove many old deprecated features The following features have been deprecated for well over the 2 release cycle we promise ``-drive file=json:{...{'driver':'file'}}`` (since 3.0) ``-vnc acl`` (since 4.0.0) ``-mon ...,control=readline,pretty=on|off`` (since 4.1) ``migrate_set_downtime`` and ``migrate_set_speed`` (since 2.8.0) ``query-named-block-nodes`` result ``encryption_key_missing`` (since 2.10.0) ``query-block`` result ``inserted.encryption_key_missing`` (since 2.10.0) ``migrate-set-cache-size`` and ``query-migrate-cache-size`` (since 2.11.0) ``query-named-block-nodes`` and ``query-block`` result dirty-bitmaps[i].status (since 4.0) ``query-cpus`` (since 2.12.0) ``query-cpus-fast`` ``arch`` output member (since 3.0.0) ``query-events`` (since 4.0) chardev client socket with ``wait`` option (since 4.0) ``acl_show``, ``acl_reset``, ``acl_policy``, ``acl_add``, ``acl_remove`` (since 4.0.0) ``ide-drive`` (since 4.2) ``scsi-disk`` (since 4.2) ---------------------------------------------------------------- Daniel P. Berrangé (13): ui, monitor: remove deprecated VNC ACL option and HMP commands monitor: raise error when 'pretty' option is used with HMP monitor: remove 'query-events' QMP command migrate: remove QMP/HMP commands for speed, downtime and cache size machine: remove 'query-cpus' QMP command machine: remove 'arch' field from 'query-cpus-fast' QMP command chardev: reject use of 'wait' flag for socket client chardevs hw/ide: remove 'ide-drive' device hw/scsi: remove 'scsi-disk' device block: remove 'encryption_key_missing' flag from QAPI block: remove dirty bitmaps 'status' field block: remove 'dirty-bitmaps' field from 'BlockInfo' struct block: remove support for using "file" driver with block/char devices block/dirty-bitmap.c | 38 -- block/file-posix.c | 17 +- block/qapi.c | 6 - chardev/char-socket.c | 12 +- docs/devel/migration.rst | 2 +- docs/qdev-device-use.txt | 2 +- docs/rdma.txt | 2 +- docs/system/deprecated.rst | 108 ----- docs/system/removed-features.rst | 109 +++++ docs/xbzrle.txt | 5 - hmp-commands-info.hx | 13 - hmp-commands.hx | 121 ------ hw/core/machine-hmp-cmds.c | 8 +- hw/core/machine-qmp-cmds.c | 120 ------ hw/i386/pc.c | 2 - hw/ide/qdev.c | 38 -- hw/ppc/mac_newworld.c | 13 - hw/ppc/mac_oldworld.c | 13 - hw/scsi/scsi-disk.c | 62 --- hw/sparc64/sun4u.c | 15 - include/block/dirty-bitmap.h | 1 - include/monitor/hmp.h | 4 - migration/migration.c | 45 --- migration/ram.c | 2 +- monitor/hmp-cmds.c | 34 -- monitor/misc.c | 187 --------- monitor/monitor.c | 4 +- monitor/qmp-cmds-control.c | 24 -- qapi/block-core.json | 64 +-- qapi/control.json | 45 --- qapi/machine.json | 181 +-------- qapi/migration.json | 98 ----- qemu-options.hx | 5 +- scripts/device-crash-test | 2 - softmmu/vl.c | 1 - tests/acceptance/pc_cpu_hotplug_props.py | 2 +- tests/acceptance/x86_cpu_model_versions.py | 2 +- tests/migration/guestperf/engine.py | 18 +- tests/qemu-iotests/051 | 4 - tests/qemu-iotests/051.pc.out | 20 - tests/qemu-iotests/124 | 4 - tests/qemu-iotests/181 | 2 +- tests/qemu-iotests/184.out | 6 +- tests/qemu-iotests/191.out | 48 +-- tests/qemu-iotests/194 | 4 +- tests/qemu-iotests/194.out | 4 +- tests/qemu-iotests/226.out | 10 +- tests/qemu-iotests/236 | 2 +- tests/qemu-iotests/236.out | 42 +- tests/qemu-iotests/246 | 3 +- tests/qemu-iotests/246.out | 66 +-- tests/qemu-iotests/254 | 2 +- tests/qemu-iotests/254.out | 9 +- tests/qemu-iotests/257.out | 378 ++++++------------ tests/qemu-iotests/260 | 5 +- tests/qemu-iotests/273.out | 15 +- .../tests/migrate-bitmaps-postcopy-test | 6 +- tests/qtest/migration-test.c | 48 --- tests/qtest/numa-test.c | 6 +- tests/qtest/qmp-test.c | 6 +- tests/qtest/test-hmp.c | 6 +- tests/qtest/test-x86-cpuid-compat.c | 4 +- tests/qtest/vhost-user-test.c | 8 +- ui/vnc.c | 38 -- 64 files changed, 370 insertions(+), 1801 deletions(-) -- 2.30.2

2 14

[PULL 00/11] Ui 20210316 patches
by Gerd Hoffmann 17 Mar '21

17 Mar '21

The following changes since commit 6157b0e19721aadb4c7fdcfe57b2924af6144b14: Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-= request' into staging (2021-03-14 17:47:49 +0000) are available in the Git repository at: git://git.kraxel.org/qemu tags/ui-20210316-pull-request for you to fetch changes up to ad7f2f8ee9fbded410fbf77158b0065f8e2f08e3: ui/cocoa: Comment about modifier key input quirks (2021-03-16 06:36:45 +010= 0) ---------------------------------------------------------------- vnc+spice: password-secret option. bugfixes for cocoa, vnc, opengl. ---------------------------------------------------------------- Akihiko Odaki (3): opengl: Do not convert format with glTexImage2D on OpenGL ES ui/cocoa: Do not exit immediately after shutdown ui/cocoa: Comment about modifier key input quirks Daniel P. Berrang=C3=A9 (7): ui: introduce "password-secret" option for VNC servers ui: introduce "password-secret" option for SPICE server ui: deprecate "password" option for SPICE server ui: add more trace points for VNC client/server messages ui: avoid sending framebuffer updates outside client desktop bounds ui: use client width/height in WMVi message ui: honour the actual guest display dimensions without rounding Marc-Andr=C3=A9 Lureau (1): ui: fold qemu_alloc_display in only caller ui/vnc.h | 1 + ui/console-gl.c | 19 +++++++--- ui/console.c | 14 ++------ ui/spice-core.c | 32 +++++++++++++++-- ui/vnc-jobs.c | 44 ++++++++++++++++++++--- ui/vnc.c | 71 +++++++++++++++++++++++++++++++++----- docs/system/deprecated.rst | 8 +++++ qemu-options.hx | 18 ++++++++-- ui/cocoa.m | 46 ++++++++++++++++++++++-- ui/trace-events | 16 +++++++++ 10 files changed, 234 insertions(+), 35 deletions(-) --=20 2.29.2

2 12

[PULL 00/13] Usb 20210315 patches
by Gerd Hoffmann 16 Mar '21

16 Mar '21

The following changes since commit 6157b0e19721aadb4c7fdcfe57b2924af6144b14: Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-= request' into staging (2021-03-14 17:47:49 +0000) are available in the Git repository at: git://git.kraxel.org/qemu tags/usb-20210315-pull-request for you to fetch changes up to 39912c14da07a2dbc73854addcfa0a42596340ac: usb/storage: clear csw on reset (2021-03-15 17:01:17 +0100) ---------------------------------------------------------------- usb: -usbdevice cleanup and un-deprecation. usb: split usb-storage. usb: misc fixes and cleanups. ---------------------------------------------------------------- Gerd Hoffmann (5): usb/storage: move declarations to usb/msd.h header usb/storage: move usb-bot device to separate source file usb/storage move usb-storage device to separate source file usb/storage: add kconfig symbols usb/storage: clear csw on reset Paolo Bonzini (2): usb: remove support for -usbdevice parameters usb: remove '-usbdevice u2f-key' Philippe Mathieu-Daud=C3=A9 (3): hw/southbridge: Add missing Kconfig dependency VT82C686 on USB_UHCI hw/usb/hcd-uhci: Expose generic prototypes to local header hw/usb: Extract VT82C686 UHCI PCI function into a new unit Thomas Huth (3): hw/usb/bus: Remove the "full-path" property usb: Un-deprecate -usbdevice (except for -usbdevice audio which gets removed) usb: Document the missing -usbdevice options hw/usb/hcd-uhci.h | 93 +++++++++++++ include/hw/usb.h | 3 +- include/hw/usb/msd.h | 54 ++++++++ hw/usb/bus.c | 39 ++---- hw/usb/dev-audio.c | 1 - hw/usb/dev-serial.c | 2 +- hw/usb/dev-storage-bot.c | 63 +++++++++ hw/usb/dev-storage-classic.c | 156 +++++++++++++++++++++ hw/usb/dev-storage.c | 226 +------------------------------ hw/usb/hcd-uhci.c | 83 +----------- hw/usb/u2f.c | 1 - hw/usb/vt82c686-uhci-pci.c | 43 ++++++ softmmu/vl.c | 2 - MAINTAINERS | 1 + docs/system/deprecated.rst | 9 -- docs/system/removed-features.rst | 8 ++ hw/isa/Kconfig | 1 + hw/usb/Kconfig | 13 +- hw/usb/meson.build | 5 +- qemu-options.hx | 35 ++++- 20 files changed, 484 insertions(+), 354 deletions(-) create mode 100644 hw/usb/hcd-uhci.h create mode 100644 include/hw/usb/msd.h create mode 100644 hw/usb/dev-storage-bot.c create mode 100644 hw/usb/dev-storage-classic.c create mode 100644 hw/usb/vt82c686-uhci-pci.c --=20 2.29.2

2 14

[libvirt PATCH] util: tell users that memory locking ulimit is too low for BPF
by Daniel P. Berrangé 16 Mar '21

16 Mar '21

If running libvirtd via systemd, it gets a 64 MB memlock limit, but if running from the shell it will only get 64 KB on a Fedora 33 system. The latter low limit causes any attempt to use BPF to fail and it is not obvious why. This improves the error message thus: # virsh -c lxc:/// start sh error: Failed to start domain 'sh' error: internal error: guest failed to start: Failure in libvirt_lxc startup: failed to initialize device BPF map; locked memory limit for libvirtd probably needs to be raised: Operation not permitted Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/vircgroupv2devices.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c index 71591be4c4..4bcc1d52fe 100644 --- a/src/util/vircgroupv2devices.c +++ b/src/util/vircgroupv2devices.c @@ -443,9 +443,17 @@ virCgroupV2DevicesCreateMap(size_t size) sizeof(uint32_t), size); if (mapfd < 0) { - virReportSystemError(errno, "%s", - _("failed to initialize device BPF map")); - return -1; + if (errno == EPERM) { + virReportSystemError(errno, "%s", + _("failed to initialize device BPF map; " + "locked memory limit for libvirtd probably " + "needs to be raised")); + return -1; + } else { + virReportSystemError(errno, "%s", + _("failed to initialize device BPF map")); + return -1; + } } return mapfd; -- 2.30.2

2 1

[libvirt PATCH] src: ensure GSource background unref happens in correct event loop
by Daniel P. Berrangé 16 Mar '21

16 Mar '21

The g_idle_add function adds a callback to the primary GMainContext. To workaround the GSource unref bugs, we need to add our callbacks to the GMainContext that is associated with the GSource being unref'd. Thus code using the per-VM virEventThread must use its private GMainContext. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- meson.build | 3 --- src/libvirt_glib_crash_workaround.syms | 11 ----------- src/libvirt_private.syms | 1 + src/meson.build | 7 ------- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/util/glibcompat.c | 20 ++++++++++++++++++-- src/util/glibcompat.h | 11 +---------- src/util/vireventglib.c | 12 ++++++------ 9 files changed, 28 insertions(+), 41 deletions(-) delete mode 100644 src/libvirt_glib_crash_workaround.syms diff --git a/meson.build b/meson.build index 69a7b4c88e..ea93a2a8ec 100644 --- a/meson.build +++ b/meson.build @@ -1049,9 +1049,6 @@ if host_machine.system() == 'windows' else gio_dep = dependency('gio-unix-2.0', version: '>=' + glib_version) endif -# GLib event loop race workaround in glibcompat.h, remove when minimum required -# glib is >= 2.64.0 -glib_crash_workaround = glib_dep.version().version_compare('<2.64.0') glib_dep = declare_dependency( dependencies: [ glib_dep, gobject_dep, gio_dep ], ) diff --git a/src/libvirt_glib_crash_workaround.syms b/src/libvirt_glib_crash_workaround.syms deleted file mode 100644 index 249058b65b..0000000000 --- a/src/libvirt_glib_crash_workaround.syms +++ /dev/null @@ -1,11 +0,0 @@ -# -# Private symbols specific for pre-2.64.0 GLib workaround -# - -# util/glibcompat.h -virEventGLibSourceUnrefIdle; - -# Let emacs know we want case-insensitive sorting -# Local Variables: -# sort-fold-case: t -# End: diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 767d665613..526dcee11a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1733,6 +1733,7 @@ virStorageSourceUpdatePhysicalSize; # util/glibcompat.h vir_g_canonicalize_filename; vir_g_fsync; +vir_g_source_unref; vir_g_strdup_printf; vir_g_strdup_vprintf; diff --git a/src/meson.build b/src/meson.build index 70a5a83eea..c7ff9e978c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -124,13 +124,6 @@ else sym_files += 'libvirt_libssh2.syms' endif -if glib_crash_workaround - used_sym_files += 'libvirt_glib_crash_workaround.syms' -else - sym_files += 'libvirt_glib_crash_workaround.syms' -endif - - # variables filled by subdirectories libvirt_libs = [] diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 01ba2c78c1..787a7bb41c 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -533,7 +533,7 @@ qemuAgentUnregister(qemuAgentPtr agent) { if (agent->watch) { g_source_destroy(agent->watch); - g_vir_source_unref_safe(agent->watch); + vir_g_source_unref(agent->watch, agent->context); agent->watch = NULL; } } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b4f2641504..f6cd9d9eda 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -862,7 +862,7 @@ qemuMonitorUnregister(qemuMonitorPtr mon) { if (mon->watch) { g_source_destroy(mon->watch); - g_vir_source_unref_safe(mon->watch); + vir_g_source_unref(mon->watch, mon->context); mon->watch = NULL; } } diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c index fe19ffa87b..eb6dcc0111 100644 --- a/src/util/glibcompat.c +++ b/src/util/glibcompat.c @@ -231,9 +231,14 @@ vir_g_strdup_vprintf(const char *msg, va_list args) * * Drop when min glib >= 2.64.0 */ -#if GLIB_CHECK_VERSION(2, 64, 0) != TRUE +#if GLIB_CHECK_VERSION(2, 64, 0) +void vir_g_source_unref(GSource *src, GMainContext *ctx G_GNUC_UNUSED) +{ + g_source_unref(src); +} +#else -gboolean +static gboolean virEventGLibSourceUnrefIdle(gpointer data) { GSource *src = data; @@ -243,4 +248,15 @@ virEventGLibSourceUnrefIdle(gpointer data) return FALSE; } +void vir_g_source_unref(GSource *src, GMainContext *ctx) +{ + GSource *idle = g_idle_source_new(); + + g_source_set_callback(idle, virEventGLibSourceUnrefIdle, src, NULL); + + g_source_attach(idle, ctx); + + g_source_unref(idle); +} + #endif diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h index 9c52843274..697687b967 100644 --- a/src/util/glibcompat.h +++ b/src/util/glibcompat.h @@ -85,13 +85,4 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args) #undef g_fsync #define g_fsync vir_g_fsync -/* Drop when min glib >= 2.64.0 */ -#if GLIB_CHECK_VERSION(2, 64, 0) -# define g_vir_source_unref_safe(source) g_source_unref(source) -#else -# define g_vir_source_unref_safe(source) g_idle_add(virEventGLibSourceUnrefIdle, source) - -gboolean -virEventGLibSourceUnrefIdle(gpointer data); - -#endif +void vir_g_source_unref(GSource *src, GMainContext *ctx); diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c index 88e3ec6d5d..f3e5a344b0 100644 --- a/src/util/vireventglib.c +++ b/src/util/vireventglib.c @@ -214,7 +214,7 @@ virEventGLibHandleUpdate(int watch, if (data->source != NULL) { VIR_DEBUG("Removed old handle source=%p", data->source); g_source_destroy(data->source); - g_vir_source_unref_safe(data->source); + vir_g_source_unref(data->source, NULL); } data->source = virEventGLibAddSocketWatch( @@ -228,7 +228,7 @@ virEventGLibHandleUpdate(int watch, VIR_DEBUG("Removed old handle source=%p", data->source); g_source_destroy(data->source); - g_vir_source_unref_safe(data->source); + vir_g_source_unref(data->source, NULL); data->source = NULL; data->events = 0; } @@ -277,7 +277,7 @@ virEventGLibHandleRemove(int watch) if (data->source != NULL) { g_source_destroy(data->source); - g_vir_source_unref_safe(data->source); + vir_g_source_unref(data->source, NULL); data->source = NULL; data->events = 0; } @@ -410,7 +410,7 @@ virEventGLibTimeoutUpdate(int timer, if (interval >= 0) { if (data->source != NULL) { g_source_destroy(data->source); - g_vir_source_unref_safe(data->source); + vir_g_source_unref(data->source, NULL); } data->interval = interval; @@ -420,7 +420,7 @@ virEventGLibTimeoutUpdate(int timer, goto cleanup; g_source_destroy(data->source); - g_vir_source_unref_safe(data->source); + vir_g_source_unref(data->source, NULL); data->source = NULL; } @@ -469,7 +469,7 @@ virEventGLibTimeoutRemove(int timer) if (data->source != NULL) { g_source_destroy(data->source); - g_vir_source_unref_safe(data->source); + vir_g_source_unref(data->source, NULL); data->source = NULL; } -- 2.30.2

2 1

[PATCH] target/mips: Deprecate Trap-and-Emul KVM support
by Jiaxun Yang 16 Mar '21

16 Mar '21

Upstream kernel had removed both host[1] and guest[2] support. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git/commit/?id=4… [2]: https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git/commit/?id=a… Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> --- docs/system/deprecated.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index cfabe69846..a409c65485 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -496,3 +496,11 @@ nanoMIPS ISA The ``nanoMIPS`` ISA has never been upstreamed to any compiler toolchain. As it is hard to generate binaries for it, declare it deprecated. + +KVM features +------------------- + +MIPS Trap-and-Emul KVM support + +The MIPS ``Trap-and-Emul`` KVM host and guest support has been removed +from upstream kernel, declare it deprecated. -- 2.30.1

2 2

[PATCH 0/6] Drop internal virXXXPtr typedefs
by Michal Privoznik 16 Mar '21

16 Mar '21

This is patch set that implement dropping of virXXXPtr typedefs as discussed here: https://listman.redhat.com/archives/libvir-list/2021-March/msg00427.html and it does is in big bang style, just like suggested in the discussion. Patches can be found here: https://gitlab.com/MichalPrivoznik/libvirt/-/tree/ptr_remove And of course pipeline is green: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/269102351 Patch 6/6 is intentionally cut off as it has ~ 6MiB. I'll replace $URL in its commit message with link to this cover letter, once I send it. I've played around with sed and came to the following ugly, horrible and ineffective bash script: =========== #!/bin/bash SED_SCRIPT="sed_script" export IFS=$'\n' PRESERVED=( $(git grep -h "^typedef.*Ptr;$" -- include/) ) for i in $(git grep -h "^typedef.*Ptr;$"); do subst=1 for p in ${PRESERVED[*]}; do if [[ $i == *$p* ]]; then subst=0 fi done if [ $subst -ne 1 ]; then continue; fi PTR=$(echo $i | cut -d'*' -f2 | cut -d';' -f1); if [[ $i == *struct* ]]; then SRC=$(echo ${i#"typedef "} | cut -d' ' -f1-2); else SRC=$(echo ${i#"typedef "} | cut -d' ' -f1) ; fi if [ "$1" -eq 0 ]; then echo "s/${PTR} /${SRC} */g"; elif [ "$1" -eq 1 ]; then echo "s/${PTR}/${SRC} */g"; echo "/^typedef.*\*${SRC} \*;$/D"; fi done > ${SED_SCRIPT} for i in $(git ls-files); do if [ -f $i -a ! -L $i ]; then echo $i; sed -i -f ${SED_SCRIPT} $i; fi done rm ${SED_SCRIPT} =========== I've ran it like following: ./script.sh 0 && ./script.sh 1 Mostly, because in the first run I wanted to fix following pattern: virXXXPtr variable; and in the second: static virXXXPtr function() And just like always, I had to fix some stuff by hand. For instance, in vbox there is this function virVBoxSnapshotConfHardDiskPtrByLocation() and of course there's also virVBoxSnapshotConfHardDiskPtr. Then, I've dropped some empty lines, mostly from patterns like this: typedef struct _virXXX virXXX;  struct _virXXX { Michal Prívozník (6): virsysinfo: Define and use auto cleanup func for virSysinfoDef properly gendispatch: Don't use virXXXPtr for internal types syntax-check: Fix and rename virSecurity rule virconftypes: Fix name of virCapsGuestArchPtr lib: Put some variable declarations on individual lines lib: Drop internal virXXXPtr typedefs build-aux/syntax-check.mk | 4 +- docs/advanced-tests.rst | 2 +- docs/api_extension.html.in | 2 +- docs/coding-style.rst | 2 +- docs/internals/command.html.in | 12 +- docs/internals/rpc.html.in | 32 +- scripts/esx_vi_generator.py | 6 +- scripts/hyperv_wmi_generator.py | 6 +- src/access/viraccessdriver.h | 52 +- src/access/viraccessdrivernop.c | 46 +- src/access/viraccessdriverpolkit.c | 52 +- src/access/viraccessdriverstack.c | 82 +- src/access/viraccessdriverstack.h | 4 +- src/access/viraccessmanager.c | 78 +- src/access/viraccessmanager.h | 57 +- src/admin/admin_remote.c | 56 +- src/admin/admin_server.c | 34 +- src/admin/admin_server.h | 26 +- src/admin/admin_server_dispatch.c | 129 +- src/admin/admin_server_dispatch.h | 8 +- src/admin/libvirt-admin.c | 8 +- src/bhyve/bhyve_capabilities.c | 26 +- src/bhyve/bhyve_capabilities.h | 8 +- src/bhyve/bhyve_command.c | 121 +- src/bhyve/bhyve_command.h | 14 +- src/bhyve/bhyve_conf.c | 18 +- src/bhyve/bhyve_conf.h | 9 +- src/bhyve/bhyve_device.c | 30 +- src/bhyve/bhyve_device.h | 6 +- src/bhyve/bhyve_domain.c | 36 +- src/bhyve/bhyve_domain.h | 7 +- src/bhyve/bhyve_driver.c | 161 +- src/bhyve/bhyve_driver.h | 6 +- src/bhyve/bhyve_monitor.c | 34 +- src/bhyve/bhyve_monitor.h | 7 +- src/bhyve/bhyve_parse_command.c | 40 +- src/bhyve/bhyve_parse_command.h | 4 +- src/bhyve/bhyve_process.c | 52 +- src/bhyve/bhyve_process.h | 16 +- src/bhyve/bhyve_utils.h | 25 +- src/conf/backup_conf.c | 54 +- src/conf/backup_conf.h | 24 +- src/conf/capabilities.c | 240 +- src/conf/capabilities.h | 116 +- src/conf/checkpoint_conf.c | 80 +- src/conf/checkpoint_conf.h | 23 +- src/conf/cpu_conf.c | 78 +- src/conf/cpu_conf.h | 71 +- src/conf/device_conf.c | 36 +- src/conf/device_conf.h | 42 +- src/conf/domain_addr.c | 315 +-- src/conf/domain_addr.h | 128 +- src/conf/domain_audit.c | 96 +- src/conf/domain_audit.h | 76 +- src/conf/domain_capabilities.c | 70 +- src/conf/domain_capabilities.h | 39 +- src/conf/domain_conf.c | 2508 ++++++++--------- src/conf/domain_conf.h | 967 ++++--- src/conf/domain_event.c | 552 ++-- src/conf/domain_event.h | 178 +- src/conf/domain_nwfilter.c | 18 +- src/conf/domain_nwfilter.h | 6 +- src/conf/domain_validate.c | 64 +- src/conf/domain_validate.h | 10 +- src/conf/interface_conf.c | 76 +- src/conf/interface_conf.h | 18 +- src/conf/moment_conf.c | 8 +- src/conf/moment_conf.h | 8 +- src/conf/netdev_bandwidth_conf.c | 12 +- src/conf/netdev_bandwidth_conf.h | 6 +- src/conf/netdev_vlan_conf.c | 4 +- src/conf/netdev_vlan_conf.h | 4 +- src/conf/netdev_vport_profile_conf.c | 6 +- src/conf/netdev_vport_profile_conf.h | 4 +- src/conf/network_conf.c | 198 +- src/conf/network_conf.h | 105 +- src/conf/network_event.c | 26 +- src/conf/network_event.h | 6 +- src/conf/networkcommon_conf.c | 6 +- src/conf/networkcommon_conf.h | 6 +- src/conf/node_device_conf.c | 214 +- src/conf/node_device_conf.h | 70 +- src/conf/node_device_event.c | 37 +- src/conf/node_device_event.h | 8 +- src/conf/node_device_util.c | 4 +- src/conf/node_device_util.h | 4 +- src/conf/numa_conf.c | 161 +- src/conf/numa_conf.h | 93 +- src/conf/nwfilter_conf.c | 142 +- src/conf/nwfilter_conf.h | 52 +- src/conf/nwfilter_ipaddrmap.c | 10 +- src/conf/nwfilter_ipaddrmap.h | 2 +- src/conf/nwfilter_params.c | 77 +- src/conf/nwfilter_params.h | 42 +- src/conf/object_event.c | 134 +- src/conf/object_event.h | 18 +- src/conf/object_event_private.h | 18 +- src/conf/secret_conf.c | 16 +- src/conf/secret_conf.h | 7 +- src/conf/secret_event.c | 37 +- src/conf/secret_event.h | 8 +- src/conf/snapshot_conf.c | 98 +- src/conf/snapshot_conf.h | 41 +- src/conf/snapshot_conf_priv.h | 4 +- src/conf/storage_adapter_conf.c | 30 +- src/conf/storage_adapter_conf.h | 13 +- src/conf/storage_capabilities.c | 14 +- src/conf/storage_capabilities.h | 7 +- src/conf/storage_conf.c | 143 +- src/conf/storage_conf.h | 82 +- src/conf/storage_encryption_conf.c | 44 +- src/conf/storage_encryption_conf.h | 15 +- src/conf/storage_event.c | 37 +- src/conf/storage_event.h | 8 +- src/conf/storage_source_conf.c | 152 +- src/conf/storage_source_conf.h | 125 +- src/conf/virchrdev.c | 19 +- src/conf/virchrdev.h | 7 +- src/conf/virconftypes.h | 114 - src/conf/virdomaincheckpointobjlist.c | 58 +- src/conf/virdomaincheckpointobjlist.h | 54 +- src/conf/virdomainmomentobjlist.c | 110 +- src/conf/virdomainmomentobjlist.h | 66 +- src/conf/virdomainobjlist.c | 144 +- src/conf/virdomainobjlist.h | 55 +- src/conf/virdomainsnapshotobjlist.c | 62 +- src/conf/virdomainsnapshotobjlist.h | 54 +- src/conf/virinterfaceobj.c | 83 +- src/conf/virinterfaceobj.h | 44 +- src/conf/virnetworkobj.c | 271 +- src/conf/virnetworkobj.h | 156 +- src/conf/virnetworkportdef.c | 18 +- src/conf/virnetworkportdef.h | 15 +- src/conf/virnodedeviceobj.c | 159 +- src/conf/virnodedeviceobj.h | 57 +- src/conf/virnwfilterbindingdef.c | 26 +- src/conf/virnwfilterbindingdef.h | 16 +- src/conf/virnwfilterbindingobj.c | 40 +- src/conf/virnwfilterbindingobj.h | 23 +- src/conf/virnwfilterbindingobjlist.c | 88 +- src/conf/virnwfilterbindingobjlist.h | 27 +- src/conf/virnwfilterobj.c | 112 +- src/conf/virnwfilterobj.h | 59 +- src/conf/virsavecookie.c | 22 +- src/conf/virsavecookie.h | 25 +- src/conf/virsecretobj.c | 139 +- src/conf/virsecretobj.h | 60 +- src/conf/virstorageobj.c | 340 ++- src/conf/virstorageobj.h | 150 +- src/cpu/cpu.c | 70 +- src/cpu/cpu.h | 125 +- src/cpu/cpu_arm.c | 94 +- src/cpu/cpu_ppc64.c | 63 +- src/cpu/cpu_s390.c | 8 +- src/cpu/cpu_x86.c | 426 ++- src/cpu/cpu_x86.h | 8 +- src/cpu/cpu_x86_data.h | 3 - src/datatypes.c | 58 +- src/datatypes.h | 74 +- src/driver-hypervisor.h | 3 +- src/driver-interface.h | 1 - src/driver-network.h | 1 - src/driver-nodedev.h | 1 - src/driver-nwfilter.h | 1 - src/driver-secret.h | 1 - src/driver-state.h | 2 - src/driver-storage.h | 1 - src/driver-stream.h | 2 - src/driver.c | 2 +- src/driver.h | 32 +- src/esx/esx_driver.c | 22 +- src/esx/esx_interface_driver.c | 4 +- src/esx/esx_network_driver.c | 8 +- src/esx/esx_private.h | 4 +- src/esx/esx_storage_driver.c | 28 +- src/esx/esx_util.c | 4 +- src/esx/esx_util.h | 2 +- src/esx/esx_vi.c | 6 +- src/esx/esx_vi.h | 8 +- src/esx/esx_vi_types.c | 12 +- src/esx/esx_vi_types.h | 26 +- src/hyperv/hyperv_driver.c | 74 +- src/hyperv/hyperv_private.h | 4 +- src/hyperv/hyperv_util.c | 4 +- src/hyperv/hyperv_util.h | 2 +- src/hyperv/hyperv_wmi.c | 66 +- src/hyperv/hyperv_wmi.h | 49 +- src/hyperv/hyperv_wmi_classes.h | 4 +- src/hypervisor/domain_cgroup.c | 20 +- src/hypervisor/domain_cgroup.h | 16 +- src/hypervisor/domain_driver.c | 29 +- src/hypervisor/domain_driver.h | 18 +- src/hypervisor/virclosecallbacks.c | 55 +- src/hypervisor/virclosecallbacks.h | 25 +- src/hypervisor/virhostdev.c | 327 +-- src/hypervisor/virhostdev.h | 121 +- src/interface/interface_backend_netcf.c | 26 +- src/interface/interface_backend_udev.c | 14 +- src/libvirt.c | 38 +- src/libxl/libxl_capabilities.c | 64 +- src/libxl/libxl_capabilities.h | 6 +- src/libxl/libxl_conf.c | 142 +- src/libxl/libxl_conf.h | 75 +- src/libxl/libxl_domain.c | 196 +- src/libxl/libxl_domain.h | 57 +- src/libxl/libxl_driver.c | 727 ++--- src/libxl/libxl_logger.c | 8 +- src/libxl/libxl_logger.h | 9 +- src/libxl/libxl_migration.c | 145 +- src/libxl/libxl_migration.h | 24 +- src/libxl/xen_common.c | 184 +- src/libxl/xen_common.h | 30 +- src/libxl/xen_xl.c | 178 +- src/libxl/xen_xl.h | 8 +- src/libxl/xen_xm.c | 43 +- src/libxl/xen_xm.h | 6 +- src/locking/domain_lock.c | 72 +- src/locking/domain_lock.h | 40 +- src/locking/lock_daemon.c | 106 +- src/locking/lock_daemon.h | 10 +- src/locking/lock_daemon_config.c | 12 +- src/locking/lock_daemon_config.h | 8 +- src/locking/lock_daemon_dispatch.c | 92 +- src/locking/lock_driver.h | 21 +- src/locking/lock_driver_lockd.c | 73 +- src/locking/lock_driver_nop.c | 16 +- src/locking/lock_driver_sanlock.c | 62 +- src/locking/lock_manager.c | 42 +- src/locking/lock_manager.h | 29 +- src/logging/log_daemon.c | 88 +- src/logging/log_daemon.h | 7 +- src/logging/log_daemon_config.c | 12 +- src/logging/log_daemon_config.h | 8 +- src/logging/log_daemon_dispatch.c | 32 +- src/logging/log_handler.c | 72 +- src/logging/log_handler.h | 17 +- src/logging/log_manager.c | 24 +- src/logging/log_manager.h | 13 +- src/lxc/lxc_cgroup.c | 74 +- src/lxc/lxc_cgroup.h | 16 +- src/lxc/lxc_conf.c | 34 +- src/lxc/lxc_conf.h | 37 +- src/lxc/lxc_container.c | 92 +- src/lxc/lxc_container.h | 6 +- src/lxc/lxc_controller.c | 225 +- src/lxc/lxc_domain.c | 56 +- src/lxc/lxc_domain.h | 18 +- src/lxc/lxc_driver.c | 590 ++-- src/lxc/lxc_fuse.c | 32 +- src/lxc/lxc_fuse.h | 10 +- src/lxc/lxc_hostdev.c | 30 +- src/lxc/lxc_hostdev.h | 20 +- src/lxc/lxc_monitor.c | 50 +- src/lxc/lxc_monitor.h | 28 +- src/lxc/lxc_native.c | 114 +- src/lxc/lxc_native.h | 6 +- src/lxc/lxc_process.c | 162 +- src/lxc/lxc_process.h | 38 +- src/network/bridge_driver.c | 568 ++-- src/network/bridge_driver.h | 6 +- src/network/bridge_driver_linux.c | 100 +- src/network/bridge_driver_nop.c | 8 +- src/network/bridge_driver_platform.h | 17 +- src/node_device/node_device_driver.c | 74 +- src/node_device/node_device_driver.h | 10 +- src/node_device/node_device_udev.c | 152 +- src/nwfilter/nwfilter_dhcpsnoop.c | 186 +- src/nwfilter/nwfilter_dhcpsnoop.h | 6 +- src/nwfilter/nwfilter_driver.c | 48 +- src/nwfilter/nwfilter_ebiptables_driver.c | 205 +- src/nwfilter/nwfilter_gentech_driver.c | 129 +- src/nwfilter/nwfilter_gentech_driver.h | 18 +- src/nwfilter/nwfilter_learnipaddr.c | 40 +- src/nwfilter/nwfilter_learnipaddr.h | 6 +- src/nwfilter/nwfilter_tech_driver.h | 8 +- src/openvz/openvz_conf.c | 30 +- src/openvz/openvz_conf.h | 12 +- src/openvz/openvz_driver.c | 141 +- src/openvz/openvz_util.c | 2 +- src/qemu/THREADS.txt | 72 +- src/qemu/qemu_agent.c | 279 +- src/qemu/qemu_agent.h | 90 +- src/qemu/qemu_alias.c | 72 +- src/qemu/qemu_alias.h | 48 +- src/qemu/qemu_backup.c | 136 +- src/qemu/qemu_backup.h | 26 +- src/qemu/qemu_block.c | 522 ++-- src/qemu/qemu_block.h | 199 +- src/qemu/qemu_blockjob.c | 334 +-- src/qemu/qemu_blockjob.h | 120 +- src/qemu/qemu_capabilities.c | 643 +++-- src/qemu/qemu_capabilities.h | 117 +- src/qemu/qemu_capspriv.h | 60 +- src/qemu/qemu_cgroup.c | 202 +- src/qemu/qemu_cgroup.h | 81 +- src/qemu/qemu_checkpoint.c | 190 +- src/qemu/qemu_checkpoint.h | 52 +- src/qemu/qemu_command.c | 1154 ++++---- src/qemu/qemu_command.h | 176 +- src/qemu/qemu_conf.c | 204 +- src/qemu/qemu_conf.h | 105 +- src/qemu/qemu_dbus.c | 38 +- src/qemu/qemu_dbus.h | 22 +- src/qemu/qemu_domain.c | 1453 +++++----- src/qemu/qemu_domain.h | 627 ++--- src/qemu/qemu_domain_address.c | 384 +-- src/qemu/qemu_domain_address.h | 44 +- src/qemu/qemu_domainjob.c | 132 +- src/qemu/qemu_domainjob.h | 100 +- src/qemu/qemu_driver.c | 2026 ++++++------- src/qemu/qemu_extdevice.c | 82 +- src/qemu/qemu_extdevice.h | 36 +- src/qemu/qemu_firmware.c | 140 +- src/qemu/qemu_firmware.h | 13 +- src/qemu/qemu_hostdev.c | 128 +- src/qemu/qemu_hostdev.h | 92 +- src/qemu/qemu_hotplug.c | 876 +++--- src/qemu/qemu_hotplug.h | 190 +- src/qemu/qemu_interface.c | 42 +- src/qemu/qemu_interface.h | 38 +- src/qemu/qemu_interop_config.c | 4 +- src/qemu/qemu_migration.c | 598 ++-- src/qemu/qemu_migration.h | 76 +- src/qemu/qemu_migration_cookie.c | 188 +- src/qemu/qemu_migration_cookie.h | 66 +- src/qemu/qemu_migration_params.c | 139 +- src/qemu/qemu_migration_params.h | 69 +- src/qemu/qemu_migration_paramspriv.h | 14 +- src/qemu/qemu_monitor.c | 600 ++-- src/qemu/qemu_monitor.h | 710 +++-- src/qemu/qemu_monitor_json.c | 1544 +++++----- src/qemu/qemu_monitor_json.h | 413 ++- src/qemu/qemu_monitor_priv.h | 2 +- src/qemu/qemu_monitor_text.c | 10 +- src/qemu/qemu_monitor_text.h | 10 +- src/qemu/qemu_namespace.c | 182 +- src/qemu/qemu_namespace.h | 66 +- src/qemu/qemu_process.c | 1198 ++++---- src/qemu/qemu_process.h | 158 +- src/qemu/qemu_processpriv.h | 6 +- src/qemu/qemu_qapi.c | 48 +- src/qemu/qemu_qapi.h | 4 +- src/qemu/qemu_saveimage.c | 78 +- src/qemu/qemu_saveimage.h | 44 +- src/qemu/qemu_security.c | 140 +- src/qemu/qemu_security.h | 110 +- src/qemu/qemu_slirp.c | 44 +- src/qemu/qemu_slirp.h | 39 +- src/qemu/qemu_snapshot.c | 303 +- src/qemu/qemu_snapshot.h | 20 +- src/qemu/qemu_tpm.c | 44 +- src/qemu/qemu_tpm.h | 24 +- src/qemu/qemu_validate.c | 162 +- src/qemu/qemu_validate.h | 2 +- src/qemu/qemu_vhost_user.c | 49 +- src/qemu/qemu_vhost_user.h | 15 +- src/qemu/qemu_vhost_user_gpu.c | 24 +- src/qemu/qemu_vhost_user_gpu.h | 24 +- src/qemu/qemu_virtiofs.c | 46 +- src/qemu/qemu_virtiofs.h | 28 +- src/remote/remote_daemon.c | 46 +- src/remote/remote_daemon.h | 25 +- src/remote/remote_daemon_config.c | 4 +- src/remote/remote_daemon_dispatch.c | 990 +++---- src/remote/remote_daemon_dispatch.h | 2 +- src/remote/remote_daemon_stream.c | 82 +- src/remote/remote_daemon_stream.h | 12 +- src/remote/remote_driver.c | 590 ++-- src/remote/remote_sockets.c | 4 +- src/remote/remote_sockets.h | 4 +- src/remote/remote_ssh_helper.c | 17 +- src/rpc/gendispatch.pl | 66 +- src/rpc/virkeepalive.c | 38 +- src/rpc/virkeepalive.h | 21 +- src/rpc/virnetclient.c | 271 +- src/rpc/virnetclient.h | 82 +- src/rpc/virnetclientprogram.c | 38 +- src/rpc/virnetclientprogram.h | 30 +- src/rpc/virnetclientstream.c | 82 +- src/rpc/virnetclientstream.h | 49 +- src/rpc/virnetdaemon.c | 114 +- src/rpc/virnetdaemon.h | 46 +- src/rpc/virnetlibsshsession.c | 84 +- src/rpc/virnetlibsshsession.h | 29 +- src/rpc/virnetmessage.c | 42 +- src/rpc/virnetmessage.h | 46 +- src/rpc/virnetsaslcontext.c | 50 +- src/rpc/virnetsaslcontext.h | 36 +- src/rpc/virnetserver.c | 202 +- src/rpc/virnetserver.h | 74 +- src/rpc/virnetserverclient.c | 231 +- src/rpc/virnetserverclient.h | 130 +- src/rpc/virnetserverprogram.c | 94 +- src/rpc/virnetserverprogram.h | 70 +- src/rpc/virnetserverservice.c | 80 +- src/rpc/virnetserverservice.h | 36 +- src/rpc/virnetsocket.c | 174 +- src/rpc/virnetsocket.h | 95 +- src/rpc/virnetsshsession.c | 85 +- src/rpc/virnetsshsession.h | 31 +- src/rpc/virnettlscontext.c | 58 +- src/rpc/virnettlscontext.h | 32 +- src/secret/secret_driver.c | 51 +- src/security/security_apparmor.c | 218 +- src/security/security_dac.c | 474 ++-- src/security/security_dac.h | 8 +- src/security/security_driver.c | 8 +- src/security/security_driver.h | 181 +- src/security/security_manager.c | 264 +- src/security/security_manager.h | 210 +- src/security/security_nop.c | 128 +- src/security/security_selinux.c | 530 ++-- src/security/security_stack.c | 345 ++- src/security/security_stack.h | 12 +- src/security/virt-aa-helper.c | 58 +- src/storage/storage_backend.c | 10 +- src/storage/storage_backend.h | 57 +- src/storage/storage_backend_disk.c | 96 +- src/storage/storage_backend_fs.c | 38 +- src/storage/storage_backend_gluster.c | 35 +- src/storage/storage_backend_iscsi.c | 28 +- src/storage/storage_backend_iscsi_direct.c | 36 +- src/storage/storage_backend_logical.c | 80 +- src/storage/storage_backend_mpath.c | 14 +- src/storage/storage_backend_rbd.c | 118 +- src/storage/storage_backend_scsi.c | 39 +- src/storage/storage_backend_sheepdog.c | 48 +- src/storage/storage_backend_sheepdog_priv.h | 4 +- src/storage/storage_backend_vstorage.c | 16 +- src/storage/storage_backend_zfs.c | 42 +- src/storage/storage_driver.c | 293 +- src/storage/storage_driver.h | 6 +- src/storage/storage_util.c | 270 +- src/storage/storage_util.h | 89 +- src/storage_file/storage_file_backend.c | 6 +- src/storage_file/storage_file_backend.h | 24 +- src/storage_file/storage_file_backend_fs.c | 36 +- .../storage_file_backend_gluster.c | 60 +- src/storage_file/storage_file_probe.c | 10 +- src/storage_file/storage_file_probe.h | 2 +- src/storage_file/storage_source.c | 110 +- src/storage_file/storage_source.h | 56 +- .../storage_source_backingstore.c | 104 +- .../storage_source_backingstore.h | 8 +- src/test/test_driver.c | 1162 ++++---- src/util/virarptable.c | 8 +- src/util/virarptable.h | 8 +- src/util/viraudit.c | 2 +- src/util/viraudit.h | 2 +- src/util/virauth.c | 2 +- src/util/virauth.h | 2 +- src/util/virauthconfig.c | 12 +- src/util/virauthconfig.h | 10 +- src/util/virbitmap.c | 94 +- src/util/virbitmap.h | 69 +- src/util/virbuffer.c | 50 +- src/util/virbuffer.h | 47 +- src/util/vircgroup.c | 484 ++-- src/util/vircgroup.h | 139 +- src/util/vircgroupbackend.c | 10 +- src/util/vircgroupbackend.h | 151 +- src/util/vircgrouppriv.h | 27 +- src/util/vircgroupv1.c | 152 +- src/util/vircgroupv2.c | 144 +- src/util/vircgroupv2devices.c | 22 +- src/util/vircgroupv2devices.h | 10 +- src/util/vircommand.c | 206 +- src/util/vircommand.h | 123 +- src/util/vircommandpriv.h | 2 +- src/util/virconf.c | 147 +- src/util/virconf.h | 55 +- src/util/virdnsmasq.c | 40 +- src/util/virdnsmasq.h | 15 +- src/util/virfdstream.c | 81 +- src/util/virfile.c | 28 +- src/util/virfile.h | 14 +- src/util/virfilecache.c | 30 +- src/util/virfilecache.h | 14 +- src/util/virfirewall.c | 85 +- src/util/virfirewall.h | 38 +- src/util/virfirmware.c | 12 +- src/util/virfirmware.h | 10 +- src/util/virgic.h | 1 - src/util/virhash.c | 18 +- src/util/virhash.h | 10 +- src/util/virhostcpu.c | 40 +- src/util/virhostcpu.h | 11 +- src/util/viridentity.c | 52 +- src/util/viridentity.h | 50 +- src/util/viriptables.c | 90 +- src/util/viriptables.h | 60 +- src/util/virjson.c | 341 ++- src/util/virjson.h | 161 +- src/util/virlease.c | 10 +- src/util/virlease.h | 6 +- src/util/virlockspace.c | 60 +- src/util/virlockspace.h | 21 +- src/util/virlog.c | 90 +- src/util/virlog.h | 39 +- src/util/virmacaddr.c | 12 +- src/util/virmacaddr.h | 14 +- src/util/virmacmap.c | 34 +- src/util/virmacmap.h | 13 +- src/util/virmdev.c | 88 +- src/util/virmdev.h | 75 +- src/util/virnetdev.c | 88 +- src/util/virnetdev.h | 36 +- src/util/virnetdevbandwidth.c | 27 +- src/util/virnetdevbandwidth.h | 15 +- src/util/virnetdevip.c | 42 +- src/util/virnetdevip.h | 27 +- src/util/virnetdevmacvlan.c | 12 +- src/util/virnetdevmidonet.c | 4 +- src/util/virnetdevopenvswitch.c | 14 +- src/util/virnetdevtap.c | 2 +- src/util/virnetdevtap.h | 2 +- src/util/virnetdevvlan.c | 6 +- src/util/virnetdevvlan.h | 7 +- src/util/virnetdevvportprofile.c | 8 +- src/util/virnetdevvportprofile.h | 7 +- src/util/virnetlink.c | 21 +- src/util/virnetlink.h | 3 +- src/util/virnodesuspend.c | 4 +- src/util/virnuma.c | 22 +- src/util/virnuma.h | 12 +- src/util/virnvme.c | 66 +- src/util/virnvme.h | 40 +- src/util/virobject.c | 80 +- src/util/virobject.h | 28 +- src/util/virpci.c | 263 +- src/util/virpci.h | 132 +- src/util/virperf.c | 32 +- src/util/virperf.h | 13 +- src/util/virpolkit.c | 16 +- src/util/virpolkit.h | 5 +- src/util/virportallocator.c | 27 +- src/util/virportallocator.h | 5 +- src/util/virprocess.c | 16 +- src/util/virprocess.h | 4 +- src/util/virqemu.c | 54 +- src/util/virqemu.h | 26 +- src/util/virresctrl.c | 331 ++- src/util/virresctrl.h | 75 +- src/util/virresctrlpriv.h | 4 +- src/util/virrotatingfile.c | 54 +- src/util/virrotatingfile.h | 22 +- src/util/virscsi.c | 69 +- src/util/virscsi.h | 52 +- src/util/virscsivhost.c | 56 +- src/util/virscsivhost.h | 40 +- src/util/virseclabel.c | 16 +- src/util/virseclabel.h | 12 +- src/util/virsecret.c | 12 +- src/util/virsecret.h | 13 +- src/util/virsocketaddr.c | 65 +- src/util/virsocketaddr.h | 52 +- src/util/virsysinfo.c | 140 +- src/util/virsysinfo.h | 47 +- src/util/virsysinfopriv.h | 8 +- src/util/virsystemd.c | 30 +- src/util/virsystemd.h | 11 +- src/util/virthread.c | 52 +- src/util/virthread.h | 64 +- src/util/virthreadpool.c | 68 +- src/util/virthreadpool.h | 25 +- src/util/virtpm.c | 18 +- src/util/virtypedparam.c | 32 +- src/util/virtypedparam.h | 29 +- src/util/viruri.c | 20 +- src/util/viruri.h | 19 +- src/util/virusb.c | 76 +- src/util/virusb.h | 50 +- src/util/virxml.c | 22 +- src/util/virxml.h | 21 +- src/vbox/vbox_common.c | 274 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_get_driver.h | 6 +- src/vbox/vbox_network.c | 36 +- src/vbox/vbox_snapshot_conf.c | 128 +- src/vbox/vbox_snapshot_conf.h | 62 +- src/vbox/vbox_storage.c | 22 +- src/vbox/vbox_tmpl.c | 44 +- src/vbox/vbox_uniformed_api.h | 51 +- src/vmware/vmware_conf.c | 20 +- src/vmware/vmware_conf.h | 12 +- src/vmware/vmware_driver.c | 70 +- src/vmx/vmx.c | 184 +- src/vmx/vmx.h | 14 +- src/vz/vz_driver.c | 420 +-- src/vz/vz_sdk.c | 387 +-- src/vz/vz_sdk.h | 80 +- src/vz/vz_utils.c | 48 +- src/vz/vz_utils.h | 42 +- tests/bhyveargv2xmlmock.c | 4 +- tests/bhyvexml2argvmock.c | 4 +- tests/commandtest.c | 8 +- tests/cputest.c | 106 +- tests/domaincapstest.c | 22 +- tests/domainconftest.c | 8 +- tests/genericxml2xmltest.c | 10 +- tests/interfacexml2xmltest.c | 2 +- tests/libxlxml2domconfigtest.c | 6 +- tests/lxcconf2xmltest.c | 6 +- tests/lxcxml2xmltest.c | 2 +- tests/networkxml2conftest.c | 18 +- tests/networkxml2firewalltest.c | 2 +- tests/networkxml2xmltest.c | 4 +- tests/networkxml2xmlupdatetest.c | 2 +- tests/nodedevmdevctltest.c | 18 +- tests/nodedevxml2xmltest.c | 6 +- tests/nwfilterxml2firewalltest.c | 29 +- tests/nwfilterxml2xmltest.c | 2 +- tests/openvzutilstest.c | 2 +- tests/qemuagenttest.c | 86 +- tests/qemublocktest.c | 80 +- tests/qemucapabilitiestest.c | 9 +- tests/qemucaps2xmltest.c | 13 +- tests/qemucapsprobe.c | 2 +- tests/qemucapsprobemock.c | 18 +- tests/qemucommandutiltest.c | 2 +- tests/qemucpumock.c | 4 +- tests/qemudomaincheckpointxml2xmltest.c | 4 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemufirmwaretest.c | 10 +- tests/qemuhotplugmock.c | 8 +- tests/qemuhotplugtest.c | 42 +- tests/qemumigparamstest.c | 10 +- tests/qemumigrationcookiexmltest.c | 10 +- tests/qemumonitorjsontest.c | 141 +- tests/qemumonitortestutils.c | 163 +- tests/qemumonitortestutils.h | 56 +- tests/qemusecuritytest.c | 18 +- tests/qemustatusxml2xmltest.c | 2 +- tests/qemuxml2argvmock.c | 12 +- tests/qemuxml2argvtest.c | 44 +- tests/seclabeltest.c | 2 +- tests/secretxml2xmltest.c | 2 +- tests/securityselinuxlabeltest.c | 8 +- tests/securityselinuxtest.c | 14 +- tests/storagepoolcapstest.c | 8 +- tests/storagepoolxml2argvtest.c | 4 +- tests/storagevolxml2argvtest.c | 8 +- tests/sysinfotest.c | 4 +- tests/testutils.c | 32 +- tests/testutils.h | 12 +- tests/testutilshostcpus.h | 4 +- tests/testutilslxc.c | 12 +- tests/testutilslxc.h | 6 +- tests/testutilsqemu.c | 44 +- tests/testutilsqemu.h | 28 +- tests/testutilsqemuschema.c | 108 +- tests/testutilsqemuschema.h | 14 +- tests/testutilsxen.c | 14 +- tests/testutilsxen.h | 4 +- tests/vboxsnapshotxmltest.c | 2 +- tests/virauthconfigtest.c | 4 +- tests/virbitmaptest.c | 4 +- tests/virbuftest.c | 4 +- tests/vircaps2xmltest.c | 2 +- tests/vircapstest.c | 16 +- tests/vircgroupmock.c | 2 +- tests/vircgrouptest.c | 2 +- tests/virconftest.c | 2 +- tests/virfilecachetest.c | 29 +- tests/virfirewalltest.c | 6 +- tests/virhostcputest.c | 2 +- tests/virhostdevtest.c | 8 +- tests/virjsontest.c | 2 +- tests/virkmodtest.c | 2 +- tests/virlockspacetest.c | 14 +- tests/virlogtest.c | 4 +- tests/virmacmaptest.c | 8 +- tests/virnetdaemontest.c | 40 +- tests/virnetmessagetest.c | 10 +- tests/virnetserverclientmock.c | 4 +- tests/virnetserverclienttest.c | 6 +- tests/virnetsockettest.c | 32 +- tests/virnettlscontexttest.c | 4 +- tests/virnettlssessiontest.c | 8 +- tests/virnumamock.c | 6 +- tests/virnwfilterbindingxml2xmltest.c | 2 +- tests/virpcitest.c | 29 +- tests/virportallocatortest.c | 4 +- tests/virresctrltest.c | 4 +- tests/virrotatingfiletest.c | 26 +- tests/virschematest.c | 10 +- tests/virscsitest.c | 8 +- tests/virstoragetest.c | 24 +- tests/virsystemdtest.c | 10 +- tests/viruritest.c | 4 +- tests/virusbtest.c | 14 +- tests/vmx2xmltest.c | 8 +- tests/vshtabletest.c | 20 +- tests/xlconfigtest.c | 6 +- tests/xmconfigtest.c | 6 +- tests/xml2vmxtest.c | 10 +- tools/virsh-checkpoint.c | 17 +- tools/virsh-completer-checkpoint.c | 2 +- tools/virsh-completer-domain.c | 16 +- tools/virsh-completer-host.c | 6 +- tools/virsh-completer-interface.c | 2 +- tools/virsh-completer-network.c | 8 +- tools/virsh-completer-nodedev.c | 2 +- tools/virsh-completer-nwfilter.c | 4 +- tools/virsh-completer-pool.c | 2 +- tools/virsh-completer-secret.c | 2 +- tools/virsh-completer-snapshot.c | 2 +- tools/virsh-completer-volume.c | 2 +- tools/virsh-console.c | 21 +- tools/virsh-domain-monitor.c | 23 +- tools/virsh-domain.c | 95 +- tools/virsh-host.c | 42 +- tools/virsh-interface.c | 29 +- tools/virsh-network.c | 36 +- tools/virsh-nodedev.c | 25 +- tools/virsh-nwfilter.c | 36 +- tools/virsh-pool.c | 33 +- tools/virsh-secret.c | 19 +- tools/virsh-snapshot.c | 25 +- tools/virsh-util.c | 14 +- tools/virsh-util.h | 1 - tools/virsh-volume.c | 19 +- tools/virsh.c | 12 +- tools/virsh.h | 1 - tools/virt-admin-completer.c | 2 +- tools/virt-admin.c | 44 +- tools/virt-admin.h | 1 - tools/virt-host-validate-common.c | 8 +- tools/virt-host-validate-common.h | 2 +- tools/virt-host-validate-qemu.c | 2 +- tools/virt-login-shell-helper.c | 4 +- tools/vsh-table.c | 36 +- tools/vsh-table.h | 12 +- tools/vsh.c | 4 +- 734 files changed, 29278 insertions(+), 30098 deletions(-) -- 2.26.2

4 15

[PATCH] docs/compiling: Add note on how to check minimum meson version
by Peter Krempa 16 Mar '21

16 Mar '21

Give guidance on how to check minimum meson version for a given package. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/140 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/compiling.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/compiling.rst b/docs/compiling.rst index 62519b6bdb..7746f20bed 100644 --- a/docs/compiling.rst +++ b/docs/compiling.rst @@ -18,6 +18,11 @@ the build directory is different from the source directory: The *meson* script can be given options to change its default behaviour. +**Note:** Please ensure that you have the appropriate minimal ``meson`` version +installed in your build environment. The minimal version for a specific package +can be checked in the top level ``meson.build`` file in the ``meson_version`` +field. + To get the complete list of the options run the following command: :: -- 2.29.2

3 2

[PATCH 0/2] Fix calling of virNetworkUpdate() driver callback
by Michal Privoznik 16 Mar '21

16 Mar '21

See 2/2 for explanation. BUT, I am not fully convinced about changing XDR though. In my testing it did not really show to be that backward compatible. I did the following tests: 1) run libvirtd unpatched, 2) run libvirtd with just arguments if the callback fixed (i.e. just the first hunk of 2/2), 3) run libvirtd with patch 2/2 as is And also, I repeated the same for split daemon using qemu:///system and network:///system URIs. I've tested the following command: virsh net-update default add dns-txt '<txt name="example" value="example value"/>' and if I got the following error message: Operation not supported: can't update 'ip' section of network 'default' I knew that arguments are swapped (because 'add' command has value 3, 'dns-txt' section has value 11 and 'ip' section has value 3). >From the results I've constructed the following tables: | libvirtd (case 1) | libvirtd + swap (case 2) | libvirtd + RPC (case 3) --------------+-------------------+--------------------------+------------------------ client | 1 | 0 | 0 client + swap | 0 | 1 | 1 client + RPC | 0 | 1 | 1 Both client and libvirtd were tested for all three cases as described above; 1 means success (API returned without an error), 0 means the error message from above was observed. For libvirtd I've tested just qemu:///system, because network:///system has to yield the same results. For split daemon (SD) case: qemu:///system | SD (case 1) | SD + swap (case 2) | SD + RPC (case 3) --------------+-------------+--------------------+------------------ client | 0 | 0 | 0 client + swap | 1 | 1 | 1 client + RPC | 1 | 1 | 1 network:///system | SD (case 1) | SD + swap (case 2) | SD + RPC (case 3) --------------+-------------+--------------------+------------------ client | 1 | 0 | 0 client + swap | 0 | 1 | 1 client + RPC | 0 | 1 | 1 Therefore, what I am trying to say is, there is no case where plain swap (= case 2) would not help and including RPC change (= case 3) would help. Maybe I'm missing something? Michal Prívozník (2): lib: Debug print all arguments of virNetworkUpdate() lib: Fix calling of virNetworkUpdate() driver callback src/libvirt-network.c | 6 +++--- src/remote/remote_protocol.x | 7 ++++++- src/remote_protocol-structs | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) -- 2.26.2

2 6

[PATCH] qemu_process: Use accessor for def->mem.total_memory
by Michal Privoznik 16 Mar '21

16 Mar '21

When connecting to the monitor, a timeout is calculated that is bigger the more memory guest has (because QEMU has to allocate and possibly zero out the memory and what not, empirically deducted). However, when computing the timeout the @total_memory mmember is accessed directly even though virDomainDefGetMemoryTotal() should have been used. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 800b7b197d..f6da5afb48 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2077,7 +2077,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, * handing them over to qemu. This can be very time * consuming. Therefore, add a second to timeout for each * 1GiB of guest RAM. */ - timeout = vm->def->mem.total_memory / (1024 * 1024); + timeout = virDomainDefGetMemoryTotal(vm->def) / (1024 * 1024); ignore_value(virTimeMillisNow(&priv->monStart)); -- 2.26.2

2 1

[PATCH] coding-style: Don't encourage virXXXPtr typedefs
by Michal Privoznik 16 Mar '21

16 Mar '21

We don't like virXXXPtr typedefs really and they are going away shortly, possibly. Do not encourage new code to put in the typedefs. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/coding-style.rst | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/coding-style.rst b/docs/coding-style.rst index 22de86a657..470c61860f 100644 --- a/docs/coding-style.rst +++ b/docs/coding-style.rst @@ -53,13 +53,10 @@ Struct type names All structs should have a 'vir' prefix in their typedef name, and each following word should have its first letter in uppercase. The struct name should be the same as the typedef - name with a leading underscore. A second typedef should be - given for a pointer to the struct with a 'Ptr' suffix. - + name with a leading underscore. :: typedef struct _virHashTable virHashTable; - typedef virHashTable *virHashTablePtr; struct _virHashTable { ... }; @@ -426,11 +423,11 @@ Conditional expressions For readability reasons new code should avoid shortening comparisons to 0 for numeric types. Boolean and pointer -comparisions may be shortened. All long forms are okay: +comparisons may be shortened. All long forms are okay: :: - virFooPtr foos = NULL; + virFoo *foos = NULL; size nfoos = 0; bool hasFoos = false; -- 2.26.2

2 1

[PATCH] meson: Don't check for addr2line
by Michal Privoznik 15 Mar '21

15 Mar '21

In the past, we used to have this oomtrace.pl script that attempted to print the stack trace of where an OOM error occurred and it used addr2line for that. But since v5.8.0-rc1~189 we don't really care about OOM anymore and the script is long gone so there's no need to check for addr2line program either. Fixes: 2c52ecd96086b4643b99b4570b5823d40ce2787b Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index c81c6ab205..69a7b4c88e 100644 --- a/meson.build +++ b/meson.build @@ -925,7 +925,6 @@ endforeach # optional programs optional_programs = [ - 'addr2line', 'augparse', 'dmidecode', 'dnsmasq', -- 2.26.2

2 1

[PATCH v2 00/13] deprecations: remove many old deprecations
by Daniel P. Berrangé 15 Mar '21

15 Mar '21

This is an update to https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg07558.html The following features have been deprecated for well over the 2 release cycle we promise ``-drive file=3Djson:{...{'driver':'file'}}`` (since 3.0) ``-vnc acl`` (since 4.0.0) ``-mon ...,control=3Dreadline,pretty=3Don|off`` (since 4.1) ``migrate_set_downtime`` and ``migrate_set_speed`` (since 2.8.0) ``query-named-block-nodes`` result ``encryption_key_missing`` (since 2.10.0) ``query-block`` result ``inserted.encryption_key_missing`` (since 2.10.0) ``migrate-set-cache-size`` and ``query-migrate-cache-size`` (since 2.11.0) ``query-named-block-nodes`` and ``query-block`` result dirty-bitmaps[i].sta= tus (since 4.0) ``query-cpus`` (since 2.12.0) ``query-cpus-fast`` ``arch`` output member (since 3.0.0) ``query-events`` (since 4.0) chardev client socket with ``wait`` option (since 4.0) ``acl_show``, ``acl_reset``, ``acl_policy``, ``acl_add``, ``acl_remove`` (s= ince 4.0.0) ``ide-drive`` (since 4.2) ``scsi-disk`` (since 4.2) AFAICT, libvirt has ceased to use all of these too. These patches all have reviews now, and I'll send a pull request tomorrow for soft freeze unless I hear from subsystem maintainers with any negative feedback. In v2: - Dropped -usbdevice removal, as that's spun off into separate debate - Fixed misplaced hunk in scsi-disk patch - Fixed non-default iotest jobs in dirty-bitmap code Daniel P. Berrang=C3=A9 (13): ui, monitor: remove deprecated VNC ACL option and HMP commands monitor: raise error when 'pretty' option is used with HMP monitor: remove 'query-events' QMP command migrate: remove QMP/HMP commands for speed, downtime and cache size machine: remove 'query-cpus' QMP command machine: remove 'arch' field from 'query-cpus-fast' QMP command chardev: reject use of 'wait' flag for socket client chardevs hw/ide: remove 'ide-drive' device hw/scsi: remove 'scsi-disk' device block: remove 'encryption_key_missing' flag from QAPI block: remove dirty bitmaps 'status' field block: remove 'dirty-bitmaps' field from 'BlockInfo' struct block: remove support for using "file" driver with block/char devices block/dirty-bitmap.c | 38 -- block/file-posix.c | 17 +- block/qapi.c | 6 - chardev/char-socket.c | 12 +- docs/devel/migration.rst | 2 +- docs/qdev-device-use.txt | 2 +- docs/rdma.txt | 2 +- docs/system/deprecated.rst | 108 ----- docs/system/removed-features.rst | 109 +++++ docs/xbzrle.txt | 5 - hmp-commands-info.hx | 13 - hmp-commands.hx | 121 ------ hw/core/machine-hmp-cmds.c | 8 +- hw/core/machine-qmp-cmds.c | 120 ------ hw/i386/pc.c | 2 - hw/ide/qdev.c | 38 -- hw/ppc/mac_newworld.c | 13 - hw/ppc/mac_oldworld.c | 13 - hw/scsi/scsi-disk.c | 62 --- hw/sparc64/sun4u.c | 15 - include/block/dirty-bitmap.h | 1 - include/monitor/hmp.h | 4 - migration/migration.c | 45 --- migration/ram.c | 2 +- monitor/hmp-cmds.c | 34 -- monitor/misc.c | 187 --------- monitor/monitor.c | 4 +- monitor/qmp-cmds-control.c | 24 -- qapi/block-core.json | 64 +-- qapi/control.json | 45 --- qapi/machine.json | 181 +-------- qapi/migration.json | 98 ----- qemu-options.hx | 5 +- scripts/device-crash-test | 2 - softmmu/vl.c | 1 - tests/acceptance/pc_cpu_hotplug_props.py | 2 +- tests/acceptance/x86_cpu_model_versions.py | 2 +- tests/migration/guestperf/engine.py | 18 +- tests/qemu-iotests/051 | 4 - tests/qemu-iotests/051.pc.out | 20 - tests/qemu-iotests/124 | 4 - tests/qemu-iotests/181 | 2 +- tests/qemu-iotests/184.out | 6 +- tests/qemu-iotests/191.out | 48 +-- tests/qemu-iotests/194 | 4 +- tests/qemu-iotests/194.out | 4 +- tests/qemu-iotests/226.out | 10 +- tests/qemu-iotests/236 | 2 +- tests/qemu-iotests/236.out | 42 +- tests/qemu-iotests/246 | 3 +- tests/qemu-iotests/246.out | 66 +-- tests/qemu-iotests/254 | 2 +- tests/qemu-iotests/254.out | 9 +- tests/qemu-iotests/257.out | 378 ++++++------------ tests/qemu-iotests/260 | 5 +- tests/qemu-iotests/273.out | 15 +- .../tests/migrate-bitmaps-postcopy-test | 6 +- tests/qtest/migration-test.c | 48 --- tests/qtest/numa-test.c | 6 +- tests/qtest/qmp-test.c | 6 +- tests/qtest/test-hmp.c | 6 +- tests/qtest/test-x86-cpuid-compat.c | 4 +- tests/qtest/vhost-user-test.c | 8 +- ui/vnc.c | 38 -- 64 files changed, 370 insertions(+), 1801 deletions(-) --=20 2.30.2

2 15

[libvirt PATCH v3 00/10] ci: Add helper script
by Andrea Bolognani 15 Mar '21

15 Mar '21

Changes from [v2]: * address review feedback; * wrap more Makefile functionality; * split into smaller, easier to review patches. Changes from [v1]: * implement (partial) support for running builds and spawning shells inside the container; * make the code more maintainable by using a couple of classes. [v2] https://listman.redhat.com/archives/libvir-list/2021-February/msg00922.html [v1] https://listman.redhat.com/archives/libvir-list/2021-February/msg00900.html Andrea Bolognani (10): syntax-check: Allow exceptions for sc_prohibit_nonreentrant ci: Fix name for ci-test target in help output ci: Add helper script ci: Implement 'refresh' helper action ci: Implement 'list-images' helper action ci: Implement 'shell' helper action ci: Implement 'build' helper action ci: Implement 'test' helper action ci: Delete refresh scripts ci: Discourage users from using the Makefile directly build-aux/syntax-check.mk | 1 + ci/Makefile | 13 +- ci/cirrus/refresh | 22 ---- ci/containers/refresh | 41 ------ ci/helper | 260 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 273 insertions(+), 64 deletions(-) delete mode 100755 ci/cirrus/refresh delete mode 100755 ci/containers/refresh create mode 100755 ci/helper -- 2.26.2

2 16

[libvirt PATCH 0/2] Coverity diaries
by Ján Tomko 15 Mar '21

15 Mar '21

two minor bug fixes Ján Tomko (2): cmdList: mark title as autofree nss: findLease: do not leak path tools/nss/libvirt_nss.c | 4 +++- tools/virsh-domain-monitor.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.29.2

2 3

[libvirt PATCH 0/9] docs: Convert html.in to rst (volume 1)
by Erik Skultety 15 Mar '21

15 Mar '21

'#itsfriday' Erik Skultety (9): docs: html.in: Convert aclpolkit to rst docs: html.in: Convert api_extension to rst docs: html.in: Convert api to rst docs: html.in: Convert apps to rst docs: html.in: Convert architecture to rst docs: html.in: Convert auditlog to rst docs: html.in: Convert auth to rst docs: html.in: Convert bindings to rst docs: html.in: Convert 'compiling' to rst docs/aclpolkit.html.in | 523 ------------------------------------- docs/aclpolkit.rst | 310 ++++++++++++++++++++++ docs/api.html.in | 380 --------------------------- docs/api.rst | 265 +++++++++++++++++++ docs/api_extension.html.in | 376 -------------------------- docs/api_extension.rst | 291 +++++++++++++++++++++ docs/apps.html.in | 488 ---------------------------------- docs/apps.rst | 348 ++++++++++++++++++++++++ docs/architecture.html.in | 82 ------ docs/architecture.rst | 83 ++++++ docs/auditlog.html.in | 375 -------------------------- docs/auditlog.rst | 321 +++++++++++++++++++++++ docs/auth.html.in | 368 -------------------------- docs/auth.rst | 343 ++++++++++++++++++++++++ docs/bindings.html.in | 101 ------- docs/bindings.rst | 62 +++++ docs/compiling.html.in | 115 -------- docs/compiling.rst | 95 +++++++ docs/meson.build | 18 +- 19 files changed, 2127 insertions(+), 2817 deletions(-) delete mode 100644 docs/aclpolkit.html.in create mode 100644 docs/aclpolkit.rst delete mode 100644 docs/api.html.in create mode 100644 docs/api.rst delete mode 100644 docs/api_extension.html.in create mode 100644 docs/api_extension.rst delete mode 100644 docs/apps.html.in create mode 100644 docs/apps.rst delete mode 100644 docs/architecture.html.in create mode 100644 docs/architecture.rst delete mode 100644 docs/auditlog.html.in create mode 100644 docs/auditlog.rst delete mode 100644 docs/auth.html.in create mode 100644 docs/auth.rst delete mode 100644 docs/bindings.html.in create mode 100644 docs/bindings.rst delete mode 100644 docs/compiling.html.in create mode 100644 docs/compiling.rst -- 2.29.2

2 21

[libvirt PATCH v2 0/4] qemu: Only raise memlock limit if necessary
by Andrea Bolognani 15 Mar '21

15 Mar '21

This feature has been requested by KubeVirt developers and will make it possible for them to make some VFIO-related features, such as migration and hotplug, work correctly. https://bugzilla.redhat.com/show_bug.cgi?id=1916346 Changes from [v1]: * prep patches have been pushed; * parsing /proc file is now explicitly restricted to Linux only and only uses safe libvirt helpers; * the qemu.conf knob has been dropped in favor of adopting a behavior that should work correctly in all scenarios. [v1] https://listman.redhat.com/archives/libvir-list/2021-March/msg00293.html Andrea Bolognani (4): util: Try to get limits from /proc qemu: Don't ignore virProcessGetMaxMemLock() errors qemu: Refactor qemuDomainAdjustMaxMemLock() qemu: Only raise memlock limit if necessary src/qemu/qemu_domain.c | 36 +++++++++------ src/util/virprocess.c | 102 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 13 deletions(-) -- 2.26.2

2 10

[PATCH v3 00/30] qapi/qom: QAPIfy --object and object-add
by Kevin Wolf 15 Mar '21

15 Mar '21

This series adds a QAPI type for the properties of all user creatable QOM types and finally makes the --object command line option (in all binaries) and the object-add monitor commands (in QMP and HMP) use the new ObjectOptions union. This change improves things in more than just one way: 1. Documentation for QOM object types has always been lacking. Adding the schema, we get documentation for every property. 2. It prevents bugs by performing parts of the input validation (e.g. checking presence of mandatory properties) already in QAPI instead of relying on separate manual implementations in each class. 3. It provides QAPI introspection for user creatable objects. 4. Non-scalar properties are now supported everywhere because the command line parsers (including HMP) use the keyval parser now. If you are in the CC list and didn't expect this series, it's probably because you're the maintainer of one of the objects for which I'm adding a QAPI schema description. Please just have a look at the specific patch for your object and check whether the schema and its documentation make sense to you. You can ignore all other patches. In a next step after this series, we can add make use of the QAPI structs in the implementation of the object and separate their configuration from the runtime state. Specifically, the plan is to add a .configure() callback to ObjectClass that allows configuring the object in one place at creation time and keeping QOM property setters only for properties that can actually be changed at runtime. Paolo made an example of what the state could look like after this: https://wiki.qemu.org/Features/QOM-QAPI_integration Finally, the intention is to extend the QAPI schema to have separate 'object' entities and generate some of the code that was written manually in the intermediate state before. This series is available as a git tag at: https://repo.or.cz/qemu/kevin.git qapi-object-v3 v3: - Removed now useless QAuthZListRuleListHack - Made some more ObjectOptions branches conditional - Improved documentation for some properties - Fixed 'qemu-img compare' exit code for option parsing failure v2: - Convert not only object-add, but all external interfaces so that the schema will always be enforced and mismatch between implementation and schema can't go unnoticed. - Rebased, covering properties and object types added since v1 (yes, things do become outdated rather quickly when you touch all user creatable objects) - Changed the "Since:" version number in the schema documentation to refer to the version when the object was introduced rather than 6.0 where the schema will (hopefully) be added - Probably some other minor changes Kevin Wolf (30): qapi/qom: Drop deprecated 'props' from object-add qapi/qom: Add ObjectOptions for iothread qapi/qom: Add ObjectOptions for authz-* qapi/qom: Add ObjectOptions for cryptodev-* qapi/qom: Add ObjectOptions for dbus-vmstate qapi/qom: Add ObjectOptions for memory-backend-* qapi/qom: Add ObjectOptions for rng-*, deprecate 'opened' qapi/qom: Add ObjectOptions for throttle-group qapi/qom: Add ObjectOptions for secret*, deprecate 'loaded' qapi/qom: Add ObjectOptions for tls-*, deprecate 'loaded' qapi/qom: Add ObjectOptions for can-* qapi/qom: Add ObjectOptions for colo-compare qapi/qom: Add ObjectOptions for filter-* qapi/qom: Add ObjectOptions for pr-manager-helper qapi/qom: Add ObjectOptions for confidential-guest-support qapi/qom: Add ObjectOptions for input-* qapi/qom: Add ObjectOptions for x-remote-object qapi/qom: QAPIfy object-add qom: Make "object" QemuOptsList optional qemu-storage-daemon: Implement --object with qmp_object_add() qom: Remove user_creatable_add_dict() qom: Factor out user_creatable_process_cmdline() qemu-io: Use user_creatable_process_cmdline() for --object qemu-nbd: Use user_creatable_process_cmdline() for --object qom: Add user_creatable_add_from_str() qemu-img: Use user_creatable_process_cmdline() for --object hmp: QAPIfy object_add qom: Add user_creatable_parse_str() vl: QAPIfy -object qom: Drop QemuOpts based interfaces qapi/authz.json | 61 ++- qapi/block-core.json | 27 ++ qapi/common.json | 52 +++ qapi/crypto.json | 159 +++++++ qapi/machine.json | 22 +- qapi/net.json | 20 - qapi/qom.json | 644 ++++++++++++++++++++++++++- qapi/ui.json | 13 +- docs/system/deprecated.rst | 25 +- docs/system/removed-features.rst | 5 + include/qom/object_interfaces.h | 106 ++--- hw/block/xen-block.c | 16 +- monitor/hmp-cmds.c | 17 +- monitor/misc.c | 2 - qemu-img.c | 251 ++--------- qemu-io.c | 33 +- qemu-nbd.c | 34 +- qom/object_interfaces.c | 168 +++---- qom/qom-qmp-cmds.c | 28 +- softmmu/vl.c | 109 +++-- storage-daemon/qemu-storage-daemon.c | 27 +- tests/check-qom-proplist.c | 42 +- hmp-commands.hx | 2 +- storage-daemon/qapi/qapi-schema.json | 1 + 24 files changed, 1231 insertions(+), 633 deletions(-) -- 2.29.2

7 77

[libvirt PATCH] qemu_driver: fix setting vcpu_quota if not all vCPUs are online
by Pavel Hrdina 15 Mar '21

15 Mar '21

When switching to g_autoptr this was incorrectly changed from 'continue;' into 'return -1;' resulting into an error when user tries to set vcpu_quota of running VM: error: An error occurred, but the cause is unknown Fixes: e4a8bbfaf2b4cdd741bb441873bb730f9134b714 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b7c89a826a..16c5ccae45 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9204,7 +9204,7 @@ qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup, virDomainVcpuDefPtr vcpu = virDomainDefGetVcpu(vm->def, i); if (!vcpu->online) - return -1; + continue; if (virCgroupNewThread(cgroup, VIR_CGROUP_THREAD_VCPU, i, false, &cgroup_vcpu) < 0) -- 2.30.2

2 1

[libvirt PATCH v2 0/1] ci: Add helper script
by Andrea Bolognani 15 Mar '21

15 Mar '21

Changes from [v1]: * implement (partial) support for running builds and spawning shells inside the container; * make the code more maintainable by using a couple of classes. [v1] https://listman.redhat.com/archives/libvir-list/2021-February/msg00900.h= tml Andrea Bolognani (1): ci: Add helper script ci/cirrus/refresh | 22 ----- ci/containers/refresh | 41 --------- ci/helper | 187 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+), 63 deletions(-) delete mode 100755 ci/cirrus/refresh delete mode 100755 ci/containers/refresh create mode 100755 ci/helper --=20 2.26.2

2 4

[PATCH 00/14] deprecations: remove many old deprecations
by Daniel P. Berrangé 15 Mar '21

15 Mar '21

The following features have been deprecated for well over the 2 release cycle we promise ``-usbdevice`` (since 2.10.0) ``-drive file=3Djson:{...{'driver':'file'}}`` (since 3.0) ``-vnc acl`` (since 4.0.0) ``-mon ...,control=3Dreadline,pretty=3Don|off`` (since 4.1) ``migrate_set_downtime`` and ``migrate_set_speed`` (since 2.8.0) ``query-named-block-nodes`` result ``encryption_key_missing`` (since 2.10.0) ``query-block`` result ``inserted.encryption_key_missing`` (since 2.10.0) ``migrate-set-cache-size`` and ``query-migrate-cache-size`` (since 2.11.0) ``query-named-block-nodes`` and ``query-block`` result dirty-bitmaps[i].sta= tus (ince 4.0) ``query-cpus`` (since 2.12.0) ``query-cpus-fast`` ``arch`` output member (since 3.0.0) ``query-events`` (since 4.0) chardev client socket with ``wait`` option (since 4.0) ``acl_show``, ``acl_reset``, ``acl_policy``, ``acl_add``, ``acl_remove`` (s= ince 4.0.0) ``ide-drive`` (since 4.2) ``scsi-disk`` (since 4.2) AFAICT, libvirt has ceased to use all of these too. There are many more similarly old deprecations not (yet) tackled. Daniel P. Berrang=C3=A9 (14): ui, monitor: remove deprecated VNC ACL option and HMP commands monitor: raise error when 'pretty' option is used with HMP monitor: remove 'query-events' QMP command softmmu: remove '-usbdevice' command line option migrate: remove QMP/HMP commands for speed, downtime and cache size machine: remove 'query-cpus' QMP command machine: remove 'arch' field from 'query-cpus-fast' QMP command chardev: reject use of 'wait' flag for socket client chardevs hw/ide: remove 'ide-drive' device hw/scsi: remove 'scsi-disk' device block: remove 'encryption_key_missing' flag from QAPI block: remove dirty bitmaps 'status' field block: remove 'dirty-bitmaps' field from 'BlockInfo' struct block: remove support for using "file" driver with block/char devices block/dirty-bitmap.c | 38 --- block/file-posix.c | 17 +- block/qapi.c | 6 - chardev/char-socket.c | 12 +- docs/devel/migration.rst | 2 +- docs/qdev-device-use.txt | 2 +- docs/rdma.txt | 2 +- docs/system/deprecated.rst | 117 ------- docs/system/removed-features.rst | 123 +++++++ docs/xbzrle.txt | 5 - hmp-commands-info.hx | 13 - hmp-commands.hx | 121 ------- hw/core/machine-hmp-cmds.c | 8 +- hw/core/machine-qmp-cmds.c | 120 ------- hw/i386/pc.c | 2 - hw/ide/qdev.c | 38 --- hw/ppc/mac_newworld.c | 13 - hw/ppc/mac_oldworld.c | 13 - hw/scsi/scsi-disk.c | 62 ---- hw/sparc64/sun4u.c | 15 - include/block/dirty-bitmap.h | 1 - include/monitor/hmp.h | 4 - migration/migration.c | 45 --- migration/ram.c | 2 +- monitor/hmp-cmds.c | 34 -- monitor/misc.c | 187 ---------- monitor/monitor.c | 4 +- monitor/qmp-cmds-control.c | 24 -- qapi/block-core.json | 64 +--- qapi/control.json | 45 --- qapi/machine.json | 181 +--------- qapi/migration.json | 98 ------ qemu-options.hx | 5 +- scripts/device-crash-test | 2 - softmmu/vl.c | 43 --- tests/acceptance/pc_cpu_hotplug_props.py | 2 +- tests/acceptance/x86_cpu_model_versions.py | 2 +- tests/migration/guestperf/engine.py | 18 +- tests/qemu-iotests/051 | 4 - tests/qemu-iotests/051.pc.out | 20 -- tests/qemu-iotests/124 | 4 - tests/qemu-iotests/181 | 2 +- tests/qemu-iotests/184.out | 6 +- tests/qemu-iotests/191.out | 48 +-- tests/qemu-iotests/194 | 4 +- tests/qemu-iotests/194.out | 4 +- tests/qemu-iotests/226.out | 10 +- tests/qemu-iotests/236 | 2 +- tests/qemu-iotests/236.out | 42 +-- tests/qemu-iotests/246 | 3 +- tests/qemu-iotests/246.out | 66 ++-- tests/qemu-iotests/254 | 2 +- tests/qemu-iotests/254.out | 9 +- tests/qemu-iotests/257.out | 378 +++++++-------------- tests/qemu-iotests/260 | 5 +- tests/qemu-iotests/273.out | 15 +- tests/qtest/migration-test.c | 48 --- tests/qtest/numa-test.c | 6 +- tests/qtest/qmp-test.c | 6 +- tests/qtest/test-hmp.c | 6 +- tests/qtest/test-x86-cpuid-compat.c | 4 +- tests/qtest/vhost-user-test.c | 8 +- ui/vnc.c | 38 --- 63 files changed, 380 insertions(+), 1850 deletions(-) --=20 2.29.2

13 47

[PATCH] bhyve: add <os firmware='efi'> support
by Roman Bogorodskiy 15 Mar '21

15 Mar '21

Implement "<os firmware='efi'>" support for bhyve driver. As there are not really lot of options, try to find "BHYVE_UEFI.fd" firmware which is installed by the sysutils/uefi-edk2-bhyve FreeBSD port. If not found, just use the first found firmware in the firmwares directory (which is configurable via config file). Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- Not extremely happy about the LIBVIRT_BHYVE_FIRMWARE_DIR_OVERRIDE knob, but not sure how to test this otherwise. po/POTFILES.in | 1 + src/bhyve/bhyve_domain.c | 5 + src/bhyve/bhyve_firmware.c | 91 +++++++++++++++++++ src/bhyve/bhyve_firmware.h | 30 ++++++ src/bhyve/bhyve_process.c | 15 +++ src/bhyve/bhyve_process.h | 5 + src/bhyve/meson.build | 1 + .../bhyvexml2argv-firmware-efi.args | 11 +++ .../bhyvexml2argv-firmware-efi.ldargs | 1 + .../bhyvexml2argv-firmware-efi.xml | 22 +++++ tests/bhyvexml2argvtest.c | 83 ++++++++++++++--- 11 files changed, 254 insertions(+), 11 deletions(-) create mode 100644 src/bhyve/bhyve_firmware.c create mode 100644 src/bhyve/bhyve_firmware.h create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml diff --git a/po/POTFILES.in b/po/POTFILES.in index 80c5f145be..413783ee35 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,6 +14,7 @@ @SRCDIR@src/bhyve/bhyve_command.c @SRCDIR@src/bhyve/bhyve_domain.c @SRCDIR@src/bhyve/bhyve_driver.c +@SRCDIR@src/bhyve/bhyve_firmware.c @SRCDIR@src/bhyve/bhyve_monitor.c @SRCDIR@src/bhyve/bhyve_parse_command.c @SRCDIR@src/bhyve/bhyve_process.c diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 8fbc554a0a..209e4d3905 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -64,6 +64,9 @@ bhyveDomainDefNeedsISAController(virDomainDefPtr def) if (def->os.bootloader == NULL && def->os.loader) return true; + if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) + return true; + if (def->nserials || def->nconsoles) return true; @@ -230,6 +233,8 @@ virDomainDefParserConfig virBhyveDriverDomainDefParserConfig = { .domainPostParseCallback = bhyveDomainDefPostParse, .assignAddressesCallback = bhyveDomainDefAssignAddresses, .deviceValidateCallback = bhyveDomainDeviceDefValidate, + + .features = VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT, }; static void diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c new file mode 100644 index 0000000000..ccc3a5ffc8 --- /dev/null +++ b/src/bhyve/bhyve_firmware.c @@ -0,0 +1,91 @@ +/* + * bhyve_firmware.c: bhyve firmware management + * + * Copyright (C) 2021 Roman Bogorodskiy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> +#include <dirent.h> + +#include "viralloc.h" +#include "virlog.h" +#include "virfile.h" +#include "bhyve_conf.h" +#include "bhyve_firmware.h" + +#define VIR_FROM_THIS VIR_FROM_BHYVE + +VIR_LOG_INIT("bhyve.bhyve_firmware"); + + +#define BHYVE_DEFAULT_FIRMWARE "BHYVE_UEFI.fd" + +int +bhyveFirmwareFillDomain(bhyveConnPtr driver, + virDomainDefPtr def, + unsigned int flags) +{ + g_autoptr(DIR) dir = NULL; + virBhyveDriverConfigPtr cfg = virBhyveDriverGetConfig(driver); + const char *firmware_dir_cfg = cfg->firmwareDir; + const char *firmware_dir_env = NULL, *firmware_dir = NULL; + struct dirent *entry; + char *matching_firmware = NULL; + char *first_found = NULL; + + virCheckFlags(0, -1); + + if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) + return 0; + + if (virDirOpenIfExists(&dir, firmware_dir_cfg) > 0) { + while ((virDirRead(dir, &entry, firmware_dir)) > 0) { + if (STREQ(entry->d_name, BHYVE_DEFAULT_FIRMWARE)) { + matching_firmware = g_strdup(entry->d_name); + break; + } + if (!first_found) + first_found = g_strdup(entry->d_name); + } + } + + if (!matching_firmware) { + if (!first_found) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("no firmwares found in %s"), + firmware_dir_cfg); + return -1; + } else { + matching_firmware = first_found; + } + } + + if (!def->os.loader) + def->os.loader = g_new0(virDomainLoaderDef, 1); + + def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_PFLASH; + def->os.loader->readonly = VIR_TRISTATE_BOOL_YES; + + VIR_FREE(def->os.loader->path); + + firmware_dir_env = g_getenv("LIBVIRT_BHYVE_FIRMWARE_DIR_OVERRIDE"); + firmware_dir = firmware_dir_env ? firmware_dir_env : firmware_dir_cfg; + def->os.loader->path = g_build_filename(firmware_dir, matching_firmware, NULL); + + return 0; +} diff --git a/src/bhyve/bhyve_firmware.h b/src/bhyve/bhyve_firmware.h new file mode 100644 index 0000000000..ae4bc98676 --- /dev/null +++ b/src/bhyve/bhyve_firmware.h @@ -0,0 +1,30 @@ +/* + * bhyve_firmware.h: bhyve firmware management + * + * Copyright (C) 2021 Roman Bogorodskiy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +#include "domain_conf.h" +#include "bhyve_utils.h" + +int +bhyveFirmwareFillDomain(bhyveConnPtr driver, + virDomainDefPtr def, + unsigned int flags); diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 060018bc70..0cfe69688c 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -33,6 +33,7 @@ #include "bhyve_device.h" #include "bhyve_driver.h" #include "bhyve_command.h" +#include "bhyve_firmware.h" #include "bhyve_monitor.h" #include "bhyve_process.h" #include "datatypes.h" @@ -251,6 +252,17 @@ virBhyveProcessStartImpl(bhyveConnPtr driver, return ret; } +int +bhyveProcessPrepareDomain(bhyveConnPtr driver, + virDomainObjPtr vm, + unsigned int flags) +{ + if (bhyveFirmwareFillDomain(driver, vm->def, flags) < 0) + return -1; + + return 0; +} + int virBhyveProcessStart(virConnectPtr conn, virDomainObjPtr vm, @@ -268,6 +280,9 @@ virBhyveProcessStart(virConnectPtr conn, conn, bhyveProcessAutoDestroy) < 0) return -1; + if (bhyveProcessPrepareDomain(driver, vm, flags) < 0) + return -1; + return virBhyveProcessStartImpl(driver, vm, reason); } diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h index d7b4e0bd4e..133863c1e0 100644 --- a/src/bhyve/bhyve_process.h +++ b/src/bhyve/bhyve_process.h @@ -23,6 +23,11 @@ #include "bhyve_utils.h" +int +bhyveProcessPrepareDomain(bhyveConnPtr driver, + virDomainObjPtr vm, + unsigned int flags); + int virBhyveProcessStart(virConnectPtr conn, virDomainObjPtr vm, virDomainRunningReason reason, diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 2b65eecf5e..b3551477b7 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -2,6 +2,7 @@ bhyve_sources = files( 'bhyve_capabilities.c', 'bhyve_command.c', 'bhyve_conf.c', + 'bhyve_firmware.c', 'bhyve_parse_command.c', 'bhyve_device.c', 'bhyve_domain.c', diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args new file mode 100644 index 0000000000..40bc84ef27 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args @@ -0,0 +1,11 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,test_firmware_dir/BHYVE_UEFI.fd \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml new file mode 100644 index 0000000000..302326cb26 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.xml @@ -0,0 +1,22 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os firmware='efi'> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 197334f9c4..13b8e34c2b 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -7,17 +7,20 @@ # include "datatypes.h" # include "bhyve/bhyve_capabilities.h" +# include "bhyve/bhyve_conf.h" # include "bhyve/bhyve_domain.h" # include "bhyve/bhyve_utils.h" # include "bhyve/bhyve_command.h" +# include "bhyve/bhyve_process.h" # define VIR_FROM_THIS VIR_FROM_BHYVE static bhyveConn driver; typedef enum { - FLAG_EXPECT_FAILURE = 1 << 0, - FLAG_EXPECT_PARSE_ERROR = 1 << 1, + FLAG_EXPECT_FAILURE = 1 << 0, + FLAG_EXPECT_PARSE_ERROR = 1 << 1, + FLAG_EXPECT_PREPARE_ERROR = 1 << 2, } virBhyveXMLToArgvTestFlags; static int testCompareXMLToArgvFiles(const char *xml, @@ -29,7 +32,7 @@ static int testCompareXMLToArgvFiles(const char *xml, g_autofree char *actualargv = NULL; g_autofree char *actualld = NULL; g_autofree char *actualdm = NULL; - g_autoptr(virDomainDef) vmdef = NULL; + g_autoptr(virDomainObj) vm = NULL; g_autoptr(virCommand) cmd = NULL; g_autoptr(virCommand) ldcmd = NULL; g_autoptr(virConnect) conn = NULL; @@ -38,7 +41,10 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(conn = virGetConnect())) goto out; - if (!(vmdef = virDomainDefParseFile(xml, driver.xmlopt, + if (!(vm = virDomainObjNew(driver.xmlopt))) + return -1; + + if (!(vm->def = virDomainDefParseFile(xml, driver.xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { if (flags & FLAG_EXPECT_PARSE_ERROR) { ret = 0; @@ -54,11 +60,20 @@ static int testCompareXMLToArgvFiles(const char *xml, conn->privateData = &driver; - cmd = virBhyveProcessBuildBhyveCmd(&driver, vmdef, false); - if (vmdef->os.loader) + if (bhyveProcessPrepareDomain(&driver, vm, 0) < 0) { + if (flags & FLAG_EXPECT_PREPARE_ERROR) { + ret = 0; + VIR_TEST_DEBUG("Got expected error: %s", + virGetLastErrorMessage()); + } + goto out; + } + + cmd = virBhyveProcessBuildBhyveCmd(&driver, vm->def, false); + if (vm->def->os.loader) ldcmd = virCommandNew("dummy"); else - ldcmd = virBhyveProcessBuildLoadCmd(&driver, vmdef, "<device.map>", + ldcmd = virBhyveProcessBuildLoadCmd(&driver, vm->def, "<device.map>", &actualdm); if ((cmd == NULL) || (ldcmd == NULL)) { @@ -94,10 +109,10 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; out: - if (vmdef && - vmdef->ngraphics == 1 && - vmdef->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) - virPortAllocatorRelease(vmdef->graphics[0]->data.vnc.port); + if (vm && vm->def && + vm->def->ngraphics == 1 && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) + virPortAllocatorRelease(vm->def->graphics[0]->data.vnc.port); return ret; } @@ -128,10 +143,16 @@ testCompareXMLToArgvHelper(const void *data) return testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flags); } +# define FAKEFIRMWAREDIRTEMPLATE abs_builddir "/bhyvefakefirmwaredir-XXXXXX" + static int mymain(void) { int ret = 0; + g_autofree char *fakefirmwaredir = NULL; + g_autofree char *emptyfirmwaredir = NULL; + const char *firmwares[] = {"BHYVE_UEFI.fd", "BHYVE_UEFI_CSM.fd", "refind_x64.efi", NULL}; + size_t i; if ((driver.caps = virBhyveCapsBuild()) == NULL) return EXIT_FAILURE; @@ -142,6 +163,35 @@ mymain(void) if (!(driver.remotePorts = virPortAllocatorRangeNew("display", 5900, 65535))) return EXIT_FAILURE; + if (!(driver.config = virBhyveDriverConfigNew())) + return EXIT_FAILURE; + + fakefirmwaredir = g_strdup(FAKEFIRMWAREDIRTEMPLATE); + + if (!g_mkdtemp(fakefirmwaredir)) { + fprintf(stderr, "Cannot create fakefirmwaredir"); + abort(); + } + driver.config->firmwareDir = fakefirmwaredir; + + emptyfirmwaredir = g_strdup(FAKEFIRMWAREDIRTEMPLATE); + + if (!g_mkdtemp(emptyfirmwaredir)) { + fprintf(stderr, "Cannot create emptyfirmwaredir"); + abort(); + } + + i = 0; + while (firmwares[i]) { + g_autofree char *firmware_path = g_strdup_printf("%s/%s", fakefirmwaredir, firmwares[i++]); + + if (virFileTouch(firmware_path, 0600) < 0) { + fprintf(stderr, "Cannot create firmware file"); + abort(); + } + } + + g_setenv("LIBVIRT_BHYVE_FIRMWARE_DIR_OVERRIDE", "test_firmware_dir", TRUE); # define DO_TEST_FULL(name, flags) \ do { \ @@ -162,6 +212,9 @@ mymain(void) # define DO_TEST_PARSE_ERROR(name) \ DO_TEST_FULL(name, FLAG_EXPECT_PARSE_ERROR) +# define DO_TEST_PREPARE_ERROR(name) \ + DO_TEST_FULL(name, FLAG_EXPECT_PREPARE_ERROR) + driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; driver.bhyvecaps = BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT | \ BHYVE_CAP_NET_E1000 | BHYVE_CAP_LPC_BOOTROM | \ @@ -209,6 +262,10 @@ mymain(void) DO_TEST("sound"); DO_TEST("isa-controller"); DO_TEST_FAILURE("isa-multiple-controllers"); + DO_TEST("firmware-efi"); + g_unsetenv("LIBVIRT_BHYVE_FIRMWARE_DIR_OVERRIDE"); + driver.config->firmwareDir = emptyfirmwaredir; + DO_TEST_PREPARE_ERROR("firmware-efi"); DO_TEST("fs-9p"); DO_TEST("fs-9p-readonly"); DO_TEST_FAILURE("fs-9p-unsupported-type"); @@ -264,9 +321,13 @@ mymain(void) driver.bhyvecaps &= ~BHYVE_CAP_VNC_PASSWORD; DO_TEST_FAILURE("vnc-password"); + virFileDeleteTree(fakefirmwaredir); + virFileDeleteTree(emptyfirmwaredir); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); virPortAllocatorRangeFree(driver.remotePorts); + virObjectUnref(driver.config); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.30.0

3 2

[PATCH v3 00/13] Prepare for -object QAPIfication
by Peter Krempa 12 Mar '21

12 Mar '21

v3 now uses JSON to configure objects which is possible with the following qemu patch: https://lists.gnu.org/archive/html/qemu-devel/2021-03/msg04436.html The use of JSON completely avoids problems with conversion of the JSON definition which we create regardless (especially bitmaps/arrays for the host-nodes property) to command line arguments which was lossy with the traditional arguments. Peter Krempa (13): qemuxml2argvdata: Remove unused output file 'disk-network-tlsx509.x86_64-latest.args' virQEMUQAPISchemaTraverse: Fix quoting in comment qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED qemu: monitor: Make wrapping of 'props' of 'object-add' optional qemuMonitorCreateObjectPropsWrap: Open-code in qemuBuildMemoryBackendProps qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED qemu: command: Use JSON for QAPIfied -object directly tests: qemuxml2argv: Validate generation of JSON props for object-add qemumonitorjsontest: Remove tripwire guarding object-add QAPIfication tests: qemucapabilities: Update qemu caps for object-add qapification qemuxml2argvtest: Add DO_CAPS_LATEST variant of 'numatune-memnode' qemuxml2argvtest: Pin examples of -object usage to qemu-5.2 caps qemu: capabilities: Enable detection of QEMU_CAPS_OBJECT_QAPIFIED src/libvirt_private.syms | 1 - src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 98 +- src/qemu/qemu_monitor.c | 78 +- src/qemu/qemu_monitor.h | 4 - src/qemu/qemu_qapi.c | 2 +- src/util/virqemu.c | 38 - src/util/virqemu.h | 3 - .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.replies | 3262 ++++++++++++----- .../caps_6.0.0.x86_64.xml | 89 +- tests/qemumonitorjsontest.c | 14 - .../audio-alsa-best.x86_64-latest.args | 6 +- .../audio-alsa-full.x86_64-latest.args | 6 +- .../audio-alsa-minimal.x86_64-latest.args | 6 +- .../audio-coreaudio-best.x86_64-latest.args | 6 +- .../audio-coreaudio-full.x86_64-latest.args | 6 +- ...audio-coreaudio-minimal.x86_64-latest.args | 6 +- ...udio-default-nographics.x86_64-latest.args | 6 +- .../audio-default-sdl.x86_64-latest.args | 6 +- .../audio-default-spice.x86_64-latest.args | 6 +- .../audio-default-vnc.x86_64-latest.args | 6 +- .../audio-file-best.x86_64-latest.args | 6 +- .../audio-file-full.x86_64-latest.args | 6 +- .../audio-file-minimal.x86_64-latest.args | 6 +- .../audio-jack-full.x86_64-latest.args | 6 +- .../audio-jack-minimal.x86_64-latest.args | 6 +- .../audio-many-backends.x86_64-latest.args | 6 +- .../audio-none-best.x86_64-latest.args | 6 +- .../audio-none-full.x86_64-latest.args | 6 +- .../audio-none-minimal.x86_64-latest.args | 6 +- .../audio-oss-best.x86_64-latest.args | 6 +- .../audio-oss-full.x86_64-latest.args | 6 +- .../audio-oss-minimal.x86_64-latest.args | 6 +- .../audio-pulseaudio-best.x86_64-latest.args | 6 +- .../audio-pulseaudio-full.x86_64-latest.args | 6 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 6 +- .../audio-sdl-best.x86_64-latest.args | 6 +- .../audio-sdl-full.x86_64-latest.args | 6 +- .../audio-sdl-minimal.x86_64-latest.args | 6 +- .../audio-spice-best.x86_64-latest.args | 6 +- .../audio-spice-full.x86_64-latest.args | 6 +- .../audio-spice-minimal.x86_64-latest.args | 6 +- .../blkdeviotune-group-num.x86_64-latest.args | 6 +- ...blkdeviotune-max-length.x86_64-latest.args | 6 +- .../blkdeviotune-max.x86_64-latest.args | 6 +- .../channel-unix-guestfwd.x86_64-latest.args | 6 +- .../console-virtio-unix.x86_64-latest.args | 6 +- .../controller-virtio-scsi.x86_64-latest.args | 6 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 6 +- .../cpu-translation.x86_64-latest.args | 6 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 6 +- .../cputune-cpuset-big-id.x86_64-latest.args | 6 +- .../disk-aio-io_uring.x86_64-latest.args | 6 +- .../disk-aio.x86_64-latest.args | 6 +- ...-backing-chains-noindex.x86_64-latest.args | 12 +- .../disk-cache.x86_64-latest.args | 6 +- .../disk-cdrom-bus-other.x86_64-latest.args | 6 +- ...m-empty-network-invalid.x86_64-latest.args | 6 +- .../disk-cdrom-network.x86_64-latest.args | 6 +- .../disk-cdrom-tray.x86_64-latest.args | 6 +- .../disk-cdrom.x86_64-latest.args | 6 +- .../disk-copy_on_read.x86_64-latest.args | 6 +- .../disk-detect-zeroes.x86_64-latest.args | 6 +- .../disk-discard.x86_64-latest.args | 6 +- .../disk-error-policy.x86_64-latest.args | 6 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 6 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 6 +- .../disk-floppy.x86_64-latest.args | 6 +- .../disk-metadata-cache.x86_64-latest.args | 6 +- .../disk-network-gluster.x86_64-latest.args | 6 +- .../disk-network-http.x86_64-latest.args | 18 +- .../disk-network-iscsi.x86_64-latest.args | 18 +- .../disk-network-nbd.x86_64-latest.args | 6 +- .../disk-network-nfs.x86_64-latest.args | 6 +- .../disk-network-rbd.x86_64-latest.args | 12 +- .../disk-network-sheepdog.x86_64-latest.args | 6 +- ...isk-network-source-auth.x86_64-latest.args | 24 +- ...disk-network-tlsx509-nbd.x86_64-5.2.0.args | 50 + ...isk-network-tlsx509-nbd.x86_64-latest.args | 18 +- .../disk-network-tlsx509.x86_64-latest.args | 90 - .../disk-nvme.x86_64-latest.args | 12 +- .../disk-readonly-disk.x86_64-latest.args | 6 +- .../disk-scsi-device-auto.x86_64-latest.args | 6 +- .../disk-scsi.x86_64-latest.args | 6 +- .../disk-shared.x86_64-latest.args | 6 +- .../disk-slices.x86_64-latest.args | 18 +- .../disk-transient.x86_64-latest.args | 6 +- .../disk-vhostuser.x86_64-latest.args | 8 +- ...virtio-scsi-reservations.x86_64-5.2.0.args | 55 + ...irtio-scsi-reservations.x86_64-latest.args | 14 +- .../eoi-disabled.x86_64-latest.args | 6 +- .../eoi-enabled.x86_64-latest.args | 6 +- .../fips-enabled.x86_64-latest.args | 6 +- .../floppy-drive-fat.x86_64-latest.args | 6 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +- .../genid-auto.x86_64-latest.args | 6 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 6 +- ...egl-headless-rendernode.x86_64-latest.args | 6 +- .../graphics-egl-headless.x86_64-latest.args | 6 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 6 +- .../graphics-vnc-power.x86_64-latest.args | 6 +- .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 42 + ...graphics-vnc-tls-secret.x86_64-latest.args | 17 +- .../graphics-vnc-tls.x86_64-latest.args | 10 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 6 +- ...play-spice-egl-headless.x86_64-latest.args | 6 +- ...ev-display-spice-opengl.x86_64-latest.args | 6 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 6 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +- .../hostdev-scsi-lsi.x86_64-latest.args | 18 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 18 +- .../hugepages-memaccess3.x86_64-latest.args | 11 +- .../hugepages-nvdimm.x86_64-latest.args | 14 +- .../hyperv-off.x86_64-latest.args | 6 +- .../hyperv-panic.x86_64-latest.args | 6 +- .../hyperv-stimer-direct.x86_64-latest.args | 6 +- .../hyperv.x86_64-latest.args | 6 +- .../intel-iommu-aw-bits.x86_64-latest.args | 6 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 6 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 6 +- .../intel-iommu-eim.x86_64-latest.args | 6 +- .../intel-iommu.x86_64-latest.args | 6 +- ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 57 + ...threads-virtio-scsi-pci.x86_64-latest.args | 10 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 6 +- .../luks-disks-source-qcow2.x86_64-5.2.0.args | 112 + ...luks-disks-source-qcow2.x86_64-latest.args | 54 +- ...memory-default-hugepage.x86_64-latest.args | 9 +- .../memfd-memory-numa.x86_64-latest.args | 9 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 10 +- ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 44 + ...ry-hotplug-nvdimm-align.x86_64-latest.args | 11 +- ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 44 + ...ry-hotplug-nvdimm-label.x86_64-latest.args | 10 +- ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 44 + ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 10 +- ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 44 + ...hotplug-nvdimm-readonly.x86_64-latest.args | 10 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 10 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 45 + ...ory-hotplug-virtio-pmem.x86_64-latest.args | 10 +- .../mlock-off.x86_64-latest.args | 6 +- .../mlock-on.x86_64-latest.args | 6 +- .../net-vdpa.x86_64-latest.args | 6 +- .../net-vhostuser.x86_64-latest.args | 6 +- .../numatune-hmat.x86_64-latest.args | 16 +- .../numatune-memnode.x86_64-5.2.0.args | 43 + .../numatune-memnode.x86_64-latest.args | 43 + .../os-firmware-bios.x86_64-latest.args | 6 +- ...os-firmware-efi-secboot.x86_64-latest.args | 6 +- .../os-firmware-efi.x86_64-latest.args | 6 +- .../parallel-unix-chardev.x86_64-latest.args | 6 +- ...cie-root-port-nohotplug.x86_64-latest.args | 6 +- .../pv-spinlock-disabled.x86_64-latest.args | 6 +- .../pv-spinlock-enabled.x86_64-latest.args | 6 +- .../qemu-ns.x86_64-latest.args | 6 +- .../serial-unix-chardev.x86_64-latest.args | 6 +- ...rtcard-passthrough-unix.x86_64-latest.args | 6 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +- .../tpm-emulator-tpm2.x86_64-latest.args | 6 +- .../tpm-emulator.x86_64-latest.args | 6 +- .../tpm-passthrough-crb.x86_64-latest.args | 6 +- .../tpm-passthrough.x86_64-latest.args | 6 +- .../tseg-explicit-size.x86_64-latest.args | 6 +- .../usb-redir-unix.x86_64-latest.args | 6 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 10 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 10 +- ...host-user-gpu-secondary.x86_64-latest.args | 7 +- .../vhost-user-vga.x86_64-latest.args | 7 +- .../vhost-vsock-auto.x86_64-latest.args | 6 +- .../vhost-vsock.x86_64-latest.args | 6 +- ...eo-bochs-display-device.x86_64-latest.args | 6 +- ...video-qxl-device-vram64.x86_64-latest.args | 6 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 6 +- ...eo-ramfb-display-device.x86_64-latest.args | 6 +- .../virtio-9p-createmode.x86_64-latest.args | 6 +- .../virtio-9p-multidevs.x86_64-latest.args | 6 +- ...virtio-non-transitional.x86_64-latest.args | 8 +- ...-options-controller-ats.x86_64-latest.args | 6 +- ...ptions-controller-iommu.x86_64-latest.args | 6 +- ...tions-controller-packed.x86_64-latest.args | 6 +- ...virtio-options-disk-ats.x86_64-latest.args | 6 +- ...rtio-options-disk-iommu.x86_64-latest.args | 6 +- ...tio-options-disk-packed.x86_64-latest.args | 6 +- .../virtio-options-fs-ats.x86_64-latest.args | 6 +- ...virtio-options-fs-iommu.x86_64-latest.args | 6 +- ...irtio-options-fs-packed.x86_64-latest.args | 6 +- ...irtio-options-input-ats.x86_64-latest.args | 6 +- ...tio-options-input-iommu.x86_64-latest.args | 6 +- ...io-options-input-packed.x86_64-latest.args | 6 +- ...-options-memballoon-ats.x86_64-latest.args | 6 +- ...loon-freepage-reporting.x86_64-latest.args | 6 +- ...ptions-memballoon-iommu.x86_64-latest.args | 6 +- ...tions-memballoon-packed.x86_64-latest.args | 6 +- .../virtio-options-net-ats.x86_64-latest.args | 6 +- ...irtio-options-net-iommu.x86_64-latest.args | 6 +- ...rtio-options-net-packed.x86_64-latest.args | 6 +- .../virtio-options-rng-ats.x86_64-latest.args | 10 +- ...irtio-options-rng-iommu.x86_64-latest.args | 10 +- ...rtio-options-rng-packed.x86_64-latest.args | 10 +- ...irtio-options-video-ats.x86_64-latest.args | 6 +- ...tio-options-video-iommu.x86_64-latest.args | 6 +- ...io-options-video-packed.x86_64-latest.args | 6 +- .../virtio-options.x86_64-latest.args | 8 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 38 + .../virtio-rng-builtin.x86_64-latest.args | 8 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 39 + .../virtio-rng-egd-unix.x86_64-latest.args | 8 +- .../virtio-transitional.x86_64-latest.args | 8 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 6 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 6 +- .../x86_64-pc-graphics.x86_64-latest.args | 8 +- .../x86_64-pc-headless.x86_64-latest.args | 8 +- .../x86_64-q35-graphics.x86_64-latest.args | 8 +- .../x86_64-q35-headless.x86_64-latest.args | 8 +- tests/qemuxml2argvtest.c | 32 + 223 files changed, 4071 insertions(+), 1781 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args -- 2.29.2

1 13

[PATCH 0/4] Couple of qemu:///embed related fixes
by Michal Privoznik 12 Mar '21

12 Mar '21

*** BLURB HERE *** Michal Prívozník (4): qemu_shim: Don't hang if failed to start domain docs: Lift restriction on running API from the event loop thread virConnectOpen: Require root dir to be absolute path qemu_shim: Always pre-create root dir docs/drvqemu.html.in | 8 ++++++-- src/libvirt.c | 6 ++++++ src/qemu/qemu_shim.c | 20 ++++++++++++++------ 3 files changed, 26 insertions(+), 8 deletions(-) -- 2.26.2

3 13

[PATCH 0/2] Fix exec-restart of virtlogd and virtlockd
by Peter Krempa 12 Mar '21

12 Mar '21

Peter Krempa (2): virnetdaemon: Introduce virNetDaemonQuitExecRestart virtlo(g|ck)d: Fix exec-restart src/libvirt_remote.syms | 1 + src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/rpc/virnetdaemon.c | 19 +++++++++++++++++++ src/rpc/virnetdaemon.h | 1 + 5 files changed, 23 insertions(+), 2 deletions(-) -- 2.29.2

3 9

[PATCH v2] qemu_shim: Don't hang if failed to start domain
by Michal Privoznik 12 Mar '21

12 Mar '21

The qemu shim spawns a separate thread in which the event loop is ran. The virEventRunDefaultImpl() call is wrapped in a while() loop, just like it should. There are few lines of code around which try to ensure that domain is destroyed (when quitting) and that the last round of event loop is ran after the virDomainDestroy() call. Only after that the loop is quit from and the thread quits. However, if domain creation fails, there is no @dom to call destroy over, the @quit flag is never set and while() never exits. Set the flag regardless of @dom pointer. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1920337 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2021-March/msg00011.html Thanks to Andrea who made me realize that this can be written better. diff to v1: - Instead of exiting from while() early, let the event loop run another iteration (it should be no-op anyway). src/qemu/qemu_shim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index d85497bd3a..8b3afd0324 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -45,9 +45,9 @@ qemuShimEventLoop(void *opaque G_GNUC_UNUSED) while (!quit) { g_mutex_lock(&eventLock); if (eventQuitFlag && !eventPreventQuitFlag) { + quit = true; if (dom) { virDomainDestroy(dom); - quit = true; } } g_mutex_unlock(&eventLock); -- 2.26.2

1 0

[PATCH] virConfLoadConfig: Refactor cleanup
by Yi Li 12 Mar '21

12 Mar '21

Switch to using the 'g_auto*' helpers. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/util/virconf.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index 16107bce96..11046a1d45 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1505,26 +1505,19 @@ virConfLoadConfigPath(const char *name) int virConfLoadConfig(virConfPtr *conf, const char *name) { - char *path = NULL; - int ret = -1; + g_autofree char *path = NULL; *conf = NULL; if (!(path = virConfLoadConfigPath(name))) - goto cleanup; + return -1; - if (!virFileExists(path)) { - ret = 0; - goto cleanup; - } + if (!virFileExists(path)) + return 0; VIR_DEBUG("Loading config file '%s'", path); if (!(*conf = virConfReadFile(path, 0))) - goto cleanup; - - ret = 0; + return -1; - cleanup: - VIR_FREE(path); - return ret; + return 0; } -- 2.25.3

2 3

[PATCH 0/2] virlockspace: Fix two more crashes of virtlockd on the exec-restart code path
by Peter Krempa 12 Mar '21

12 Mar '21

Peter Krempa (2): virLockSpacePreExecRestart: Avoid use-after-free virLockSpaceNewPostExecRestart: Fix out-of-bounds array access src/util/virlockspace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.29.2

2 3