- Devel - libvirt List Archives

[PATCH] libxl: Don't autostart domains on driver reload
by Jim Fehlig 14 Sep '21

14 Sep '21

When libxlAutostartDomain was introduced with commit fb92307f0d, one hunk mistakenly added a call site in libxlStateReload. Domains should not be autostarted when reloading the driver, so remove the offending hunk. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index c5dbcaafa5..7ea157f9c4 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -825,10 +825,6 @@ libxlStateReload(void) libxl_driver->xmlopt, NULL, libxl_driver); - virDomainObjListForEach(libxl_driver->domains, false, - libxlAutostartDomain, - libxl_driver); - virObjectUnref(cfg); return 0; } -- 2.33.0

2 1

[PATCH] node_device_conf: Don't prealloc @vfs in virNodeDeviceGetPCISRIOVCaps()
by Michal Privoznik 14 Sep '21

14 Sep '21

The array of virtual functions @vfs in virNodeDeviceGetPCISRIOVCaps() is allocated twice: the first time during its declaration and the second time inside virPCIGetVirtualFunctions() which leads to a memleak: ==16691== 1,128 bytes in 47 blocks are definitely lost in loss record 1,771 of 1,803 ==16691== at 0x4844CC1: calloc (vg_replace_malloc.c:1117) ==16691== by 0x4E50070: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.6800.3) ==16691== by 0x4A7B034: virNodeDeviceGetPCISRIOVCaps (node_device_conf.c:2649) ==16691== by 0x4A7B5E2: virNodeDeviceGetPCIDynamicCaps (node_device_conf.c:2762) ==16691== by 0xA7F6E18: udevProcessPCI (node_device_udev.c:418) Fixes: c97518d9b833a607f29b9bb02e3fbe74c011c088 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/node_device_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index b4c1acb6a5..9bbff97ffd 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2646,7 +2646,7 @@ static int virNodeDeviceGetPCISRIOVCaps(const char *sysfsPath, virNodeDevCapPCIDev *pci_dev) { - g_autoptr(virPCIVirtualFunctionList) vfs = g_new0(virPCIVirtualFunctionList, 1); + g_autoptr(virPCIVirtualFunctionList) vfs = NULL; size_t i; int ret; -- 2.32.0

2 1

[PATCH] docs: Format @variable properly
by Michal Privoznik 14 Sep '21

14 Sep '21

When documenting our public API in some places we use '@' to refer to the variable. For instance: * This API tries to set guest time to the given value. The time * to set (@seconds and @nseconds) should be in seconds relative * to the Epoch of 1970-01-01 00:00:00 in UTC. However, when generating HTML documentation these tokens are copied verbatim. What we can do is drop the '@' character and wrap the variable in <code/> so that it is formatted properly. Due to the way we 'parse' docs a token might actually be slightly more than just '@variable'. For instance in the example above we will have the following tokens: '(@seconds' and '@nseconds)'. Thus we need to handle possible substring before and after variable. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/newapi.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 7ac8caa35d..e56a5f2a27 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -139,6 +139,12 @@ </a> <xsl:value-of select="substring-after($token, '>')"/> </xsl:when> + <xsl:when test="contains($token, '@')"> + <xsl:variable name="prologue" select="substring-before($token, '@')"/> + <xsl:value-of select="$prologue"/> + <code><xsl:value-of select="$stem"/></code> + <xsl:value-of select="substring($token, string-length($prologue) + string-length($stem) + 2)"/> + </xsl:when> <xsl:otherwise> <xsl:value-of select="$token"/> </xsl:otherwise> -- 2.32.0

2 1

[PATCH] libxl: Fix driver reload
by Jim Fehlig 14 Sep '21

14 Sep '21

On reload, the libxl driver calls virDomainObjListLoadAllConfigs to load all configs from /etc/libvirt/libxl/ but incorrectly passes 'true' for the liveStatus parameter, resulting in error messages such as libvirtd[21053]: XML error: unexpected root element <domain>, expecting <domstatus> libvirtd[21053]: Failed to load config for domain 'sles15sp3' Fix by not requesting live status when re-reading the persistent VM config files. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6a3938ead4..c5dbcaafa5 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -821,7 +821,7 @@ libxlStateReload(void) virDomainObjListLoadAllConfigs(libxl_driver->domains, cfg->configDir, cfg->autostartDir, - true, + false, libxl_driver->xmlopt, NULL, libxl_driver); -- 2.33.0

2 2

question on vhost, limiting kernel threads and NPROC
by Mike Christie 14 Sep '21

14 Sep '21

Hi, The goal of this email is to try and figure how we want to track/limit the number of kernel threads created by vhost devices. Background: ----------- For vhost-scsi, we've hit a issue where the single vhost worker thread can't handle all IO the being sent from multiple queues. IOPs is stuck at around 500K. To fix this, we did this patchset: https://lore.kernel.org/linux-scsi/20210525180600.6349-1-michael.christie@o… which allows userspace to create N threads and map them to a dev's virtqueues. With this we can get around 1.4M IOPs. Problem: -------- While those patches were being reviewed, a concern about tracking all these new possible threads was raised here: https://lore.kernel.org/linux-scsi/YL45CfpHyzSEcAJv@stefanha-x1.localdomain/ To save you some time, the question is what does other kernel code using the kthread API do to track the number of kernel threads created on behalf of a userspace thread. The answer is they don't do anything so we will have to add that code. I started to do that here: https://lkml.org/lkml/2021/6/23/1233 where those patches would charge/check the vhost device owner's RLIMIT_NPROC value. But, the question of if we really want to do this has come up which is why I'm bugging lists like libvirt now. Question/Solution: ------------------ I'm bugging everyone so we can figure out: If we need to specifically track the number of kernel threads being made for the vhost kernel use case by the RLIMIT_NPROC limit? Or, is it ok to limit the number of devices with the RLIMIT_NOFILE limit. Then each device has a limit on the number of threads it can create.

4 4

[libvirt PATCH 0/2] ci: Add Debian 11 builds
by Andrea Bolognani 14 Sep '21

14 Sep '21

It's been out for a bit. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/368763275 Andrea Bolognani (2): ci: Add Debian 11 builds ci: Regenerate configuration from manifest .../debian-11-cross-aarch64.Dockerfile | 126 +++++++++++++++++ .../debian-11-cross-armv6l.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-armv7l.Dockerfile | 126 +++++++++++++++++ ci/containers/debian-11-cross-i686.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-mips64el.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-mipsel.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-ppc64le.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-s390x.Dockerfile | 125 +++++++++++++++++ ci/containers/debian-11.Dockerfile | 106 ++++++++++++++ ci/gitlab.yml | 130 ++++++++++++++---- ci/manifest.yml | 42 +++++- 11 files changed, 1248 insertions(+), 32 deletions(-) create mode 100644 ci/containers/debian-11-cross-aarch64.Dockerfile create mode 100644 ci/containers/debian-11-cross-armv6l.Dockerfile create mode 100644 ci/containers/debian-11-cross-armv7l.Dockerfile create mode 100644 ci/containers/debian-11-cross-i686.Dockerfile create mode 100644 ci/containers/debian-11-cross-mips64el.Dockerfile create mode 100644 ci/containers/debian-11-cross-mipsel.Dockerfile create mode 100644 ci/containers/debian-11-cross-ppc64le.Dockerfile create mode 100644 ci/containers/debian-11-cross-s390x.Dockerfile create mode 100644 ci/containers/debian-11.Dockerfile -- 2.31.1

2 3

[PATCH] qemuxml2argvdata: Remove unused '.err' files
by Peter Krempa 14 Sep '21

14 Sep '21

These are no longer referenced by any existing test as of: os-firmware-invalid-type -> a9b1375d7d2f7d240dce09c5f8b62e568e386051 tseg-explicit-size -> 604990a1758bfdc302f3c576c5766c0763912dfd Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err | 1 - tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err | 1 - 2 files changed, 2 deletions(-) delete mode 100644 tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err delete mode 100644 tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err diff --git a/tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err b/tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err deleted file mode 100644 index c8174b1c8b..0000000000 --- a/tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: firmware attribute and firmware type has to be the same diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err deleted file mode 100644 index 82f8685a90..0000000000 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: Setting TSEG size is not supported with this QEMU binary -- 2.31.1

2 1

[libvirt PATCH 0/2] docs: virtiofs: move legacy docs to the bottom
by Stefan Hajnoczi 14 Sep '21

14 Sep '21

The virtiofs kbase article includes a lot of information that is only relevant to old versions of QEMU and libvirt. Setting up virtiofs can seem intimidating but it's actually easier than the article lets on. Move the legacy information out of the way. Stefan Hajnoczi (2): docs: virtiofs: move legacy docs to the bottom docs: virtiofs: use the preferred virtiofs spelling docs/kbase/virtiofs.rst | 183 +++++++++++++++++++++------------------- 1 file changed, 97 insertions(+), 86 deletions(-) -- 2.31.1

3 8

[libvirt PATCH v2 00/12] Automatic mutex management
by Tim Wiederhake 14 Sep '21

14 Sep '21

V1: https://listman.redhat.com/archives/libvir-list/2021-August/msg00823.html Changes since V1: * Replaced vir_g_auto* macros with redefinitions of g_auto* if compiled with clang (patch 1). * Split up VIR_XPATH_NODE_AUTORESTORE simplification differently (patches 2 and 3). * Added virObjectLockGuard / VIR_WITH_OBJECT_LOCK_GUARD for automatic mutex management of virObjectLockable variables. * Used different set of example cleanups (patches 9 - 12). Regards, Tim Tim Wiederhake (12): glibcompat: Add G_GNUC_UNUSED to g_auto* definitions for clang virxml: Simplify VIR_XPATH_NODE_AUTORESTORE VIR_XPATH_NODE_AUTORESTORE: Require semicolon internal: Add CONCAT macro virthread: Introduce virLockGuard virthread: Introduce VIR_WITH_MUTEX_LOCK_GUARD virobject: Introduce virObjectLockGuard virobject: Introduce VIR_WITH_OBJECT_LOCK_GUARD virChrdevFDStreamCloseCb: Use virLockGuardNew virChrdevFree: Use VIR_WITH_MUTEX_LOCK bhyveAutostartDomain: Use virObjectLockGuard lxcDomainDetachDeviceHostdevUSBLive: Use VIR_WITH_OBJECT_LOCK_GUARD src/bhyve/bhyve_driver.c | 4 +- src/conf/backup_conf.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 140 ++++++++++++++--------------- src/conf/interface_conf.c | 8 +- src/conf/netdev_vlan_conf.c | 2 +- src/conf/network_conf.c | 14 +-- src/conf/networkcommon_conf.c | 2 +- src/conf/node_device_conf.c | 42 ++++----- src/conf/numa_conf.c | 6 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_adapter_conf.c | 2 +- src/conf/storage_conf.c | 4 +- src/conf/storage_encryption_conf.c | 4 +- src/conf/storage_source_conf.c | 2 +- src/conf/virchrdev.c | 12 ++- src/conf/virsavecookie.c | 2 +- src/cpu/cpu_map.c | 4 +- src/cpu/cpu_x86.c | 2 +- src/internal.h | 3 + src/libvirt_private.syms | 4 + src/lxc/lxc_domain.c | 2 +- src/lxc/lxc_driver.c | 6 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_domainjob.c | 2 +- src/qemu/qemu_migration_cookie.c | 8 +- src/util/glibcompat.h | 19 ++++ src/util/virobject.c | 16 ++++ src/util/virobject.h | 24 +++++ src/util/virthread.c | 26 ++++++ src/util/virthread.h | 30 +++++++ src/util/virxml.h | 4 +- 34 files changed, 265 insertions(+), 147 deletions(-) -- 2.31.1

3 22

[PATCH 0/3] Resend after following review: qemu: add virtio-blk queue-size option
by Hiroki Narukawa 14 Sep '21

14 Sep '21

This is resubmit of "qemu: add virtio-blk queue-size option" after following the review. The option "queue-size" in virtio-blk was added in qemu-2.12.0, and default value increased from qemu-5.0.0. However, increasing this value may lead to drop of random access performance. This is configurable value, so we want to use it via libvirt. Hiroki Narukawa (3): qemu: accept queue_size XML element qemu: add QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE capability qemu: add virtio-blk queue-size option docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 6 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_validate.c | 6 ++++ .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../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.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../disk-virtio-queue-size.args | 29 +++++++++++++++ .../disk-virtio-queue-size.xml | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../disk-virtio-queue-size.xml | 35 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 46 files changed, 160 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-queue-size.xml -- 2.17.1

2 7

[PATCH v1] qemu: Add support for librbd encryption
by Or Ozeri 14 Sep '21

14 Sep '21

Starting from ceph Pacific, RBD has built-in support for image-level encryption. qemu 6.1 added support for this encryption using a new "encrypt" property to the RBD qdict. This commit extends the libvirt XML API to allow the user to choose between the existing qemu encryption engine, and the new librbd encryption engine. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- docs/formatstorageencryption.html.in | 8 +++- docs/schemas/domainbackup.rng | 7 ++++ docs/schemas/storagecommon.rng | 8 ++++ src/conf/storage_encryption_conf.c | 30 +++++++++++++- src/conf/storage_encryption_conf.h | 11 +++++ src/qemu/qemu_block.c | 40 +++++++++++++++++++ src/qemu/qemu_domain.c | 3 +- .../backup-pull-encrypted.xml | 6 +-- .../backup-pull-internal-invalid.xml | 6 +-- .../backup-push-encrypted.xml | 6 +-- tests/qemustatusxml2xmldata/upgrade-out.xml | 6 +-- tests/qemuxml2argvdata/disk-nvme.xml | 2 +- tests/qemuxml2argvdata/disk-slices.xml | 4 +- .../qemuxml2argvdata/encrypted-disk-usage.xml | 2 +- tests/qemuxml2argvdata/encrypted-disk.xml | 2 +- .../luks-disks-source-qcow2.xml | 14 +++---- tests/qemuxml2argvdata/luks-disks-source.xml | 10 ++--- tests/qemuxml2argvdata/luks-disks.xml | 4 +- tests/qemuxml2argvdata/user-aliases.xml | 2 +- .../disk-slices.x86_64-latest.xml | 4 +- tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +- .../luks-disks-source-qcow2.x86_64-latest.xml | 14 +++---- .../qemuxml2xmloutdata/luks-disks-source.xml | 10 ++--- .../storagevolxml2xmlout/vol-luks-cipher.xml | 2 +- tests/storagevolxml2xmlout/vol-luks.xml | 2 +- .../vol-qcow2-encryption.xml | 2 +- tests/storagevolxml2xmlout/vol-qcow2-luks.xml | 2 +- 27 files changed, 154 insertions(+), 55 deletions(-) diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index 7215c307d7..e0eb8697aa 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -18,11 +18,17 @@ is <code>encryption</code>, with a mandatory attribute <code>format</code>. Currently defined values of <code>format</code> are <code>default</code>, <code>qcow</code>, - and <code>luks</code>. + <code>luks</code>, and <code>luks2</code>. Each value of <code>format</code> implies some expectations about the content of the <code>encryption</code> tag. Other format values may be defined in the future. </p> + <p> + The <code>encryption</code> tag supports an optional <code>engine</code> + tag, which allows selecting which component actually handles + the encryption. Currently defined values of <code>engine</code> are + <code>qemu</code> (default) and <code>librbd</code>. + </p> <p> The <code>encryption</code> tag can currently contain a sequence of <code>secret</code> tags, each with mandatory attributes <code>type</code> diff --git a/docs/schemas/domainbackup.rng b/docs/schemas/domainbackup.rng index c03455a5a7..05cc28ab00 100644 --- a/docs/schemas/domainbackup.rng +++ b/docs/schemas/domainbackup.rng @@ -14,6 +14,13 @@ <value>luks</value> </choice> </attribute> + <optional> + <attribute name="engine"> + <choice> + <value>qemu</value> + </choice> + </attribute> + </optional> <interleave> <ref name="secret"/> <optional> diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng index 9ebb27700d..3ddff02e43 100644 --- a/docs/schemas/storagecommon.rng +++ b/docs/schemas/storagecommon.rng @@ -15,6 +15,14 @@ <value>luks</value> </choice> </attribute> + <optional> + <attribute name="engine"> + <choice> + <value>qemu</value> + <value>librbd</value> + </choice> + </attribute> + </optional> <interleave> <ref name="secret"/> <optional> diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 9112b96cc7..64044057bf 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -44,7 +44,12 @@ VIR_ENUM_IMPL(virStorageEncryptionSecret, VIR_ENUM_IMPL(virStorageEncryptionFormat, VIR_STORAGE_ENCRYPTION_FORMAT_LAST, - "default", "qcow", "luks", + "default", "qcow", "luks", "luks2", +); + +VIR_ENUM_IMPL(virStorageEncryptionEngine, + VIR_STORAGE_ENCRYPTION_ENGINE_LAST, + "qemu", "librbd", ); static void @@ -217,6 +222,7 @@ virStorageEncryptionParseNode(xmlNodePtr node, xmlNodePtr *nodes = NULL; virStorageEncryption *encdef = NULL; virStorageEncryption *ret = NULL; + g_autofree char *engine_str = NULL; g_autofree char *format_str = NULL; int n; size_t i; @@ -239,6 +245,18 @@ virStorageEncryptionParseNode(xmlNodePtr node, goto cleanup; } + if (!(engine_str = virXPathString("string(./@engine)", ctxt))) { + encdef->engine = VIR_STORAGE_ENCRYPTION_ENGINE_QEMU; + } else { + if ((encdef->engine = + virStorageEncryptionEngineTypeFromString(engine_str)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown volume encryption engine type %s"), + engine_str); + goto cleanup; + } + } + if ((n = virXPathNodeSet("./secret", ctxt, &nodes)) < 0) goto cleanup; @@ -327,15 +345,23 @@ int virStorageEncryptionFormat(virBuffer *buf, virStorageEncryption *enc) { + const char *engine; const char *format; size_t i; + if (!(engine = virStorageEncryptionEngineTypeToString(enc->engine))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unexpected encryption engine")); + return -1; + } + if (!(format = virStorageEncryptionFormatTypeToString(enc->format))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected encryption format")); return -1; } - virBufferAsprintf(buf, "<encryption format='%s'>\n", format); + virBufferAsprintf(buf, "<encryption format='%s' engine='%s'>\n", format, + engine); virBufferAdjustIndent(buf, 2); for (i = 0; i < enc->nsecrets; i++) { diff --git a/src/conf/storage_encryption_conf.h b/src/conf/storage_encryption_conf.h index 34adbd5f7b..bd8787be98 100644 --- a/src/conf/storage_encryption_conf.h +++ b/src/conf/storage_encryption_conf.h @@ -51,11 +51,21 @@ struct _virStorageEncryptionInfoDef { char *ivgen_hash; }; +typedef enum { + /* "default" is only valid for volume creation */ + VIR_STORAGE_ENCRYPTION_ENGINE_QEMU = 0, /* default */ + VIR_STORAGE_ENCRYPTION_ENGINE_LIBRBD, + + VIR_STORAGE_ENCRYPTION_ENGINE_LAST, +} virStorageEncryptionEngineType; +VIR_ENUM_DECL(virStorageEncryptionEngine); + typedef enum { /* "default" is only valid for volume creation */ VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT = 0, VIR_STORAGE_ENCRYPTION_FORMAT_QCOW, /* Both qcow and qcow2 */ VIR_STORAGE_ENCRYPTION_FORMAT_LUKS, + VIR_STORAGE_ENCRYPTION_FORMAT_LUKS2, VIR_STORAGE_ENCRYPTION_FORMAT_LAST, } virStorageEncryptionFormatType; @@ -63,6 +73,7 @@ VIR_ENUM_DECL(virStorageEncryptionFormat); typedef struct _virStorageEncryption virStorageEncryption; struct _virStorageEncryption { + int engine; /* virStorageEncryptionEngineType */ int format; /* virStorageEncryptionFormatType */ int payload_offset; diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 0bc92f6a23..e064e5a490 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -875,6 +875,8 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src, qemuDomainStorageSourcePrivate *srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); g_autoptr(virJSONValue) servers = NULL; virJSONValue *ret = NULL; + g_autoptr(virJSONValue) encrypt = NULL; + const char *encformat; const char *username = NULL; g_autoptr(virJSONValue) authmodes = NULL; g_autoptr(virJSONValue) mode = NULL; @@ -899,12 +901,47 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src, return NULL; } + if (src->encryption && + src->encryption->engine == VIR_STORAGE_ENCRYPTION_ENGINE_LIBRBD) { + switch ((virStorageEncryptionFormatType) src->encryption->format) { + case VIR_STORAGE_ENCRYPTION_FORMAT_LUKS: + encformat = "luks"; + break; + + case VIR_STORAGE_ENCRYPTION_FORMAT_LUKS2: + encformat = "luks2"; + break; + + case VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT: + case VIR_STORAGE_ENCRYPTION_FORMAT_QCOW: + case VIR_STORAGE_ENCRYPTION_FORMAT_LAST: + default: + virReportEnumRangeError(virStorageEncryptionFormatType, + src->encryption->format); + return NULL; + } + + if (!srcPriv || !srcPriv->encinfo || !srcPriv->encinfo->s.aes.alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing secret info for rbd encryption driver")); + return NULL; + } + + encrypt = virJSONValueNewObject(); + if (virJSONValueObjectAdd(encrypt, + "s:format", encformat, + "s:key-secret", srcPriv->encinfo->s.aes.alias, + NULL) < 0) + return NULL; + } + if (virJSONValueObjectCreate(&ret, "s:pool", src->volume, "s:image", src->path, "S:snapshot", src->snapshot, "S:conf", src->configFile, "A:server", &servers, + "A:encrypt", &encrypt, "S:user", username, "A:auth-client-required", &authmodes, "S:key-secret", keysecret, @@ -1318,6 +1355,7 @@ qemuBlockStorageSourceGetCryptoProps(virStorageSource *src, * VIR_DOMAIN_SECRET_INFO_TYPE_AES works here. The correct type needs to be * instantiated elsewhere. */ if (!src->encryption || + src->encryption->engine != VIR_STORAGE_ENCRYPTION_ENGINE_QEMU || !srcpriv || !srcpriv->encinfo || srcpriv->encinfo->type != VIR_DOMAIN_SECRET_INFO_TYPE_AES) @@ -1333,6 +1371,7 @@ qemuBlockStorageSourceGetCryptoProps(virStorageSource *src, break; case VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT: + case VIR_STORAGE_ENCRYPTION_FORMAT_LUKS2: case VIR_STORAGE_ENCRYPTION_FORMAT_LAST: default: virReportEnumRangeError(virStorageEncryptionFormatType, @@ -1453,6 +1492,7 @@ qemuBlockStorageSourceGetBlockdevFormatProps(virStorageSource *src) * put a raw layer on top */ case VIR_STORAGE_FILE_RAW: if (src->encryption && + src->encryption->engine == VIR_STORAGE_ENCRYPTION_ENGINE_QEMU && src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) { if (qemuBlockStorageSourceGetFormatLUKSProps(src, props) < 0) return NULL; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 25b7f03204..cd7d19a0c5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1354,7 +1354,8 @@ static bool qemuDomainDiskHasEncryptionSecret(virStorageSource *src) { if (!virStorageSourceIsEmpty(src) && src->encryption && - src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS && + (src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS || + src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS2) && src->encryption->nsecrets > 0) return true; diff --git a/tests/domainbackupxml2xmlout/backup-pull-encrypted.xml b/tests/domainbackupxml2xmlout/backup-pull-encrypted.xml index 42051d1d24..e975feddc5 100644 --- a/tests/domainbackupxml2xmlout/backup-pull-encrypted.xml +++ b/tests/domainbackupxml2xmlout/backup-pull-encrypted.xml @@ -5,7 +5,7 @@ <disk name='vda' backup='yes' type='file' backupmode='incremental' incremental='1525889631' exportname='test-vda' exportbitmap='blah'> <driver type='qcow2'/> <scratch file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </scratch> @@ -13,7 +13,7 @@ <disk name='vdb' backup='yes' type='file' backupmode='incremental' incremental='1525889631' exportname='test-vda' exportbitmap='blah'> <driver type='qcow2'/> <scratch file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdb'/> </encryption> </scratch> @@ -21,7 +21,7 @@ <disk name='vdc' backup='yes' type='block' backupmode='incremental' incremental='1525889631'> <driver type='qcow2'/> <scratch dev='/dev/block'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdc'/> </encryption> </scratch> diff --git a/tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml b/tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml index 092b6bf8a7..80c2c8f7d8 100644 --- a/tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml +++ b/tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml @@ -5,7 +5,7 @@ <disk name='vda' backup='yes' state='running' type='file' backupmode='incremental' incremental='1525889631' exportname='test-vda' exportbitmap='blah'> <driver type='qcow2'/> <scratch file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </scratch> @@ -13,7 +13,7 @@ <disk name='vdb' backup='yes' state='complete' type='file' backupmode='incremental' incremental='1525889631' exportname='test-vda' exportbitmap='blah'> <driver type='qcow2'/> <scratch file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdb'/> </encryption> </scratch> @@ -21,7 +21,7 @@ <disk name='vdc' backup='yes' state='running' type='block' backupmode='incremental' incremental='1525889631'> <driver type='qcow2'/> <scratch dev='/dev/block'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdc'/> </encryption> </scratch> diff --git a/tests/domainbackupxml2xmlout/backup-push-encrypted.xml b/tests/domainbackupxml2xmlout/backup-push-encrypted.xml index 3b664b0dcb..95cf16a4b3 100644 --- a/tests/domainbackupxml2xmlout/backup-push-encrypted.xml +++ b/tests/domainbackupxml2xmlout/backup-push-encrypted.xml @@ -4,7 +4,7 @@ <disk name='vda' backup='yes' type='file' backupmode='incremental' incremental='1525889631'> <driver type='qcow2'/> <target file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </target> @@ -12,7 +12,7 @@ <disk name='vdb' backup='yes' type='file' backupmode='incremental' incremental='1525889631'> <driver type='raw'/> <target file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdb'/> </encryption> </target> @@ -20,7 +20,7 @@ <disk name='vdc' backup='yes' type='block' backupmode='incremental' incremental='1525889631'> <driver type='qcow2'/> <target dev='/dev/block'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdc'/> </encryption> </target> diff --git a/tests/qemustatusxml2xmldata/upgrade-out.xml b/tests/qemustatusxml2xmldata/upgrade-out.xml index f9476731f6..5218092cb9 100644 --- a/tests/qemustatusxml2xmldata/upgrade-out.xml +++ b/tests/qemustatusxml2xmldata/upgrade-out.xml @@ -316,7 +316,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/b.qcow2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <privateData> @@ -333,7 +333,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/c.qcow2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <privateData> @@ -354,7 +354,7 @@ <auth username='testuser-iscsi'> <secret type='iscsi' usage='testuser-iscsi-secret'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <privateData> diff --git a/tests/qemuxml2argvdata/disk-nvme.xml b/tests/qemuxml2argvdata/disk-nvme.xml index 1ccbbfd598..9a5fafce7d 100644 --- a/tests/qemuxml2argvdata/disk-nvme.xml +++ b/tests/qemuxml2argvdata/disk-nvme.xml @@ -42,7 +42,7 @@ <driver name='qemu' type='qcow2' cache='none'/> <source type='pci' managed='no' namespace='2'> <address domain='0x0001' bus='0x02' slot='0x00' function='0x0'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2argvdata/disk-slices.xml b/tests/qemuxml2argvdata/disk-slices.xml index 016aa1b905..849809f05a 100644 --- a/tests/qemuxml2argvdata/disk-slices.xml +++ b/tests/qemuxml2argvdata/disk-slices.xml @@ -44,7 +44,7 @@ <slices> <slice type='storage' offset='1234' size='321'/> </slices> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -69,7 +69,7 @@ <slices> <slice type='storage' offset='1234' size='321'/> </slices> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.xml b/tests/qemuxml2argvdata/encrypted-disk-usage.xml index 7c2da9ee83..d2b87b94b6 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.xml +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'/> <target dev='vda' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2argvdata/encrypted-disk.xml b/tests/qemuxml2argvdata/encrypted-disk.xml index e996cde889..a75ed7ebf4 100644 --- a/tests/qemuxml2argvdata/encrypted-disk.xml +++ b/tests/qemuxml2argvdata/encrypted-disk.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'/> <target dev='vda' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.xml b/tests/qemuxml2argvdata/luks-disks-source-qcow2.xml index 7192ca00bd..46d2036cc3 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.xml +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.xml @@ -17,7 +17,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -27,7 +27,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> </source> @@ -41,7 +41,7 @@ <auth username='myname'> <secret type='iscsi' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80e80'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f77'/> </encryption> </source> @@ -50,7 +50,7 @@ <disk type='volume' device='disk'> <driver name='qemu' type='qcow2'/> <source pool='pool-iscsi' volume='unit:0:0:3' mode='direct'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f80'/> </encryption> </source> @@ -62,7 +62,7 @@ <host name='mon1.example.org' port='6321'/> <host name='mon2.example.org' port='6322'/> <host name='mon3.example.org' port='6322'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80fb0'/> </encryption> </source> @@ -71,14 +71,14 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk5'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> <backingStore type='file'> <format type='qcow2'/> <source file='/storage/guest_disks/base.qcow2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2argvdata/luks-disks-source.xml b/tests/qemuxml2argvdata/luks-disks-source.xml index 293877df9e..72d97d2f4b 100644 --- a/tests/qemuxml2argvdata/luks-disks-source.xml +++ b/tests/qemuxml2argvdata/luks-disks-source.xml @@ -17,7 +17,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -27,7 +27,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> </source> @@ -41,7 +41,7 @@ <auth username='myname'> <secret type='iscsi' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80e80'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f77'/> </encryption> </source> @@ -50,7 +50,7 @@ <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='pool-iscsi' volume='unit:0:0:3' mode='direct'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f80'/> </encryption> </source> @@ -62,7 +62,7 @@ <host name='mon1.example.org' port='6321'/> <host name='mon2.example.org' port='6322'/> <host name='mon3.example.org' port='6322'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80fb0'/> </encryption> </source> diff --git a/tests/qemuxml2argvdata/luks-disks.xml b/tests/qemuxml2argvdata/luks-disks.xml index ae6d3d996c..1c76f0dc26 100644 --- a/tests/qemuxml2argvdata/luks-disks.xml +++ b/tests/qemuxml2argvdata/luks-disks.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk'/> <target dev='vda' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> @@ -27,7 +27,7 @@ <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk2'/> <target dev='vdb' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxml2argvdata/user-aliases.xml index 47bfc56e73..10b7749521 100644 --- a/tests/qemuxml2argvdata/user-aliases.xml +++ b/tests/qemuxml2argvdata/user-aliases.xml @@ -55,7 +55,7 @@ <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/OtherDemo.img'/> <target dev='vdb' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/> </encryption> <alias name='ua-myEncryptedDisk1'/> diff --git a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml index be5cd25084..a058cbad61 100644 --- a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml @@ -49,7 +49,7 @@ <slices> <slice type='storage' offset='1234' size='321'/> </slices> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -75,7 +75,7 @@ <slices> <slice type='storage' offset='1234' size='321'/> </slices> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.xml b/tests/qemuxml2xmloutdata/encrypted-disk.xml index 06f2c5b47c..e30c8a36e8 100644 --- a/tests/qemuxml2xmloutdata/encrypted-disk.xml +++ b/tests/qemuxml2xmloutdata/encrypted-disk.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'/> <target dev='vda' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml index 5f600f5ba7..7f98dd597e 100644 --- a/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml @@ -20,7 +20,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -30,7 +30,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> </source> @@ -44,7 +44,7 @@ <auth username='myname'> <secret type='iscsi' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80e80'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f77'/> </encryption> </source> @@ -54,7 +54,7 @@ <disk type='volume' device='disk'> <driver name='qemu' type='qcow2'/> <source pool='pool-iscsi' volume='unit:0:0:3' mode='direct'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f80'/> </encryption> </source> @@ -67,7 +67,7 @@ <host name='mon1.example.org' port='6321'/> <host name='mon2.example.org' port='6322'/> <host name='mon3.example.org' port='6322'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80fb0'/> </encryption> </source> @@ -77,14 +77,14 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk5'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> <backingStore type='file'> <format type='qcow2'/> <source file='/storage/guest_disks/base.qcow2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2xmloutdata/luks-disks-source.xml b/tests/qemuxml2xmloutdata/luks-disks-source.xml index 5333d4ac6e..891b5d9d17 100644 --- a/tests/qemuxml2xmloutdata/luks-disks-source.xml +++ b/tests/qemuxml2xmloutdata/luks-disks-source.xml @@ -17,7 +17,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -27,7 +27,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> </source> @@ -41,7 +41,7 @@ <auth username='myname'> <secret type='iscsi' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80e80'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f77'/> </encryption> </source> @@ -51,7 +51,7 @@ <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='pool-iscsi' volume='unit:0:0:3' mode='direct'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f80'/> </encryption> </source> @@ -64,7 +64,7 @@ <host name='mon1.example.org' port='6321'/> <host name='mon2.example.org' port='6322'/> <host name='mon3.example.org' port='6322'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80fb0'/> </encryption> </source> diff --git a/tests/storagevolxml2xmlout/vol-luks-cipher.xml b/tests/storagevolxml2xmlout/vol-luks-cipher.xml index fd99793612..b3fbcbe9a3 100644 --- a/tests/storagevolxml2xmlout/vol-luks-cipher.xml +++ b/tests/storagevolxml2xmlout/vol-luks-cipher.xml @@ -12,7 +12,7 @@ <group>0</group> <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> <cipher name='serpent' size='256' mode='cbc' hash='sha256'/> <ivgen name='plain64' hash='sha256'/> diff --git a/tests/storagevolxml2xmlout/vol-luks.xml b/tests/storagevolxml2xmlout/vol-luks.xml index c011d4cc62..8ff345ecb3 100644 --- a/tests/storagevolxml2xmlout/vol-luks.xml +++ b/tests/storagevolxml2xmlout/vol-luks.xml @@ -12,7 +12,7 @@ <group>0</group> <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> </encryption> </target> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml b/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml index 837adf41b1..d9a34492bb 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml @@ -12,7 +12,7 @@ <group>0</group> <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> - <encryption format='qcow'> + <encryption format='qcow' engine='qemu'> <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/> </encryption> </target> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-luks.xml b/tests/storagevolxml2xmlout/vol-qcow2-luks.xml index 78edc4239c..63f2bdf9b2 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-luks.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-luks.xml @@ -12,7 +12,7 @@ <group>0</group> <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/> </encryption> </target> -- 2.25.1

2 1

[libvirt PATCH 0/2] ci: Some minor adjustments
by Andrea Bolognani 14 Sep '21

14 Sep '21

After recent changes. Andrea Bolognani (2): ci: Restore information about Coverity integration ci: Avoid use of magic constants ci/README.rst | 22 ++++++++++++++++++++++ ci/util.py | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) -- 2.31.1

3 4

[libvirt PATCH v2 0/4] report interface infomation in guestinfo command
by zhanglei 14 Sep '21

14 Sep '21

zhanglei (4): domain: add interface information to 'virDomainGetGuestInfo' virsh: add interface information to guestinfo command qemu: report guest interface information in 'qemuDomainGetGuestInfo' NEWS: qemu: report guest interfaces information in 'virDomainGetGuestInfo' NEWS.rst | 5 ++ docs/manpages/virsh.rst | 12 ++++- include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 13 +++++ src/qemu/qemu_agent.c | 9 ++-- src/qemu/qemu_agent.h | 3 +- src/qemu/qemu_driver.c | 89 +++++++++++++++++++++++++++++++- tests/qemuagenttest.c | 2 +- tools/virsh-domain.c | 6 +++ 9 files changed, 131 insertions(+), 9 deletions(-) -- 2.31.1

2 7

[PATCH] libxl: Improve reporting of die_id in capabilities
by Jim Fehlig 14 Sep '21

14 Sep '21

On Xen, libvirt runs in a VM (typically dom0) and does not have an accurate picture of numa and cpu topology of the underlying physical machine using the "usual" mechanisms. numa info and cpu toplogy are retrieved from libxl and used to populate the libvirt conterparts. Commit 7b79ee2f78b introduced support for reporting die_id in capabilities, but did not account for special handling of numa and cpu topology in libxl. Currently, Xen does not report die_id in the libxl_cputopology structure. In the meantime, set die_id to 0, which was suggested by the Xen developers and is slightly better than random garbage such as <cpu id='1' socket_id='0' die_id='-1073069552' core_id='0' siblings='0-1'/> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index b4bd1d7e62..4afed71436 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -292,6 +292,8 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCaps *caps) cpus[node][nr_cpus_node[node]-1].id = i; cpus[node][nr_cpus_node[node]-1].socket_id = cpu_topo[i].socket; cpus[node][nr_cpus_node[node]-1].core_id = cpu_topo[i].core; + /* Until Xen reports die_id, 0 is better than random garbage */ + cpus[node][nr_cpus_node[node]-1].die_id = 0; /* Allocate the siblings maps. We will be filling them later */ cpus[node][nr_cpus_node[node]-1].siblings = virBitmapNew(nr_cpus); } -- 2.33.0

2 1

[PATCH v4 for v7.6.0 00/14] Introduce virtio-mem <memory/> model
by Michal Privoznik 13 Sep '21

13 Sep '21

v4 of: https://listman.redhat.com/archives/libvir-list/2021-April/msg01138.html diff to v3: - Rebased code on the top of master - Tried to work in all Peter's review suggestions - Fixed a bug where adjusting <requested/> was viewed as hotplug of new <memory/> by XML validator and thus if <maxMemory/> was close enough to <currentMemory/> the validator reported an error (this was reported by David). You can also find these patches on my branch: https://gitlab.com/MichalPrivoznik/libvirt/-/tree/virtio_mem_v4 Michal Prívozník (14): virhostmem: Introduce virHostMemGetTHPSize() qemu_capabilities: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI conf: Introduce virtio-mem <memory/> model qemu: Build command line for virtio-mem qemu: Wire up <memory/> live update Introduce <actual/> property to virtio-mem conf: Introduce virDomainMemoryFindByDeviceAlias() qemu: Wire up MEMORY_DEVICE_SIZE_CHANGE event qemu: Refresh the actual size of virtio-mem on monitor reconnect qemu: Account for both memballoon and virtio-mem qemuDomainSetMemoryFlags: Take virtio-mem into consideration virsh: Introduce update-memory-device command news: document recent virtio memory addition kbase: Document virtio-mem NEWS.rst | 12 + docs/formatdomain.rst | 45 +++- docs/kbase/index.rst | 4 + docs/kbase/memorydevices.rst | 150 +++++++++++ docs/kbase/meson.build | 1 + docs/manpages/virsh.rst | 30 +++ docs/schemas/domaincommon.rng | 16 ++ examples/c/misc/event-test.c | 17 ++ include/libvirt/libvirt-domain.h | 23 ++ src/conf/domain_conf.c | 118 ++++++++- src/conf/domain_conf.h | 15 ++ src/conf/domain_event.c | 84 ++++++ src/conf/domain_event.h | 10 + src/conf/domain_validate.c | 39 +++ src/libvirt_private.syms | 5 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +- src/qemu/qemu_domain.c | 33 ++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 38 ++- src/qemu/qemu_driver.c | 240 +++++++++++++++++- src/qemu/qemu_hotplug.c | 18 ++ src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 37 +++ src/qemu/qemu_monitor.h | 28 ++ src/qemu/qemu_monitor_json.c | 97 +++++-- src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 72 ++++++ src/qemu/qemu_validate.c | 8 + src/remote/remote_daemon_dispatch.c | 30 +++ src/remote/remote_driver.c | 32 +++ src/remote/remote_protocol.x | 14 +- src/remote_protocol-structs | 7 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + src/util/virhostmem.c | 54 ++++ src/util/virhostmem.h | 3 + tests/domaincapsmock.c | 9 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + ...mory-hotplug-virtio-mem.x86_64-latest.args | 41 +++ .../memory-hotplug-virtio-mem.xml | 67 +++++ tests/qemuxml2argvtest.c | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 169 ++++++++++++ 51 files changed, 1562 insertions(+), 53 deletions(-) create mode 100644 docs/kbase/memorydevices.rst create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml -- 2.31.1

4 21

[RFC REPOST 0/7] introduce support for live appid updates
by Pavel Hrdina 13 Sep '21

13 Sep '21

Rebased on top of current master. I'm posting this as an RFC mainly because I'm not sure how to model the new API. This patches introduce a new naive API that will change only the APPID and nothing else. Currently there are no other known features related to Fibre Channel resources so this non-extendable API will be sufficient, however the appid lives in <resource> element in the XML where we currently have root cgroup partition. Even though changing the partition will not be supported and we don't know about anything else that could be placed here it doesn't mean it will not happen in the future. In that case we would have to add new API as well. So I'm wondering if we should create a more generic API that would take typed parameters as arguments: int virDomainSetResource(virDomainPtr domain, virTypedParameterPtr params, int nparams, unsigned int flags) Any ideas? Pavel Hrdina (7): conf: extract appid validation to virDomainDefResourceAppidValidate cgroup: extract setting fibre channel appid into virCgroupSetFCAppid virCgroupSetFCAppid: properly handle when appid is NULL src: introduce virDomainSetFibreChannelAppid API remote: add RPC support for the virDomainSetFibreChannelAppid API qemu: implement virDomainSetFibreChannelAppid API tools: introduce virsh setappid command docs/manpages/virsh.rst | 14 ++++++ include/libvirt/libvirt-domain.h | 4 ++ src/conf/domain_validate.c | 42 ++++++++++-------- src/conf/domain_validate.h | 2 + src/driver-hypervisor.h | 6 +++ src/libvirt-domain.c | 44 +++++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 1 + src/qemu/qemu_cgroup.c | 17 +------- src/qemu/qemu_driver.c | 75 ++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 +++++- src/remote_protocol-structs | 6 +++ src/util/vircgroup.c | 24 ++++++++++ src/util/vircgroup.h | 3 ++ tools/virsh-domain.c | 65 +++++++++++++++++++++++++++ 16 files changed, 286 insertions(+), 34 deletions(-) -- 2.31.1

3 22

device-specific VFIO drivers
by Laine Stump 13 Sep '21

13 Sep '21

The Linux kernel has recently added support for device-specific VFIO drivers to be used (instead of the current generic, one-size-fits-all vfio_pci driver) when assigning a device to a guest with VFIO. The intent of this is to (for example) support APIs for device-specific setup that needs to be done before the device is handed over to the guest, and to support migration of guests using these devices. More details can be found in the comments of the patch emails here: https://lore.kernel.org/kvm/20210826103912.128972-1-yishaih@nvidia.com/ There are a couple of issues that need to be resolved before that will work well with libvirt-managed guests: 1) Although they've outlined a system for determining the best / most specific driver for a device by extending the existing modules aliases, the kernel people have left it up to userspace to actually parse the module.aliases info to determine the best driver for a device. They've even "thrown us a bone" in the form of an example python script to do just that: https://github.com/maxgurtovoy/linux_tools/blob/main/vfio/bind_vfio_pci_dri… Currently, if a device is assigned to a guest with <hostdev managed='yes'> (the default) then libvirt will unbind the device from whatever host driver its bound to, and bind it to the vfio_pci driver (since, up to now, that has been the only driver available). In the future, if we want to be able to take advantage of the extended capabilities provided by the device-specific vfio drivers, we will need to figure out which driver to load. I personally don't like the idea of embedding the logic from the above example program into libvirt - this really seems to me like something that should be implemented in one place for use by many consumers (libvirt being one of the consumers). One suggestion made by Alex Williamson (in a private discussion, not on a mailing list) was that possibly we could get the driverctl utility to add this functionality, and then call driverctl to learn the name of the best-fit vfio driver for a device. I haven't yet looked at it, but I've been told that driverctl is a bash script :-O. If we decide that's a good route, perhaps we could also convince someone to convert drivertctl to rust, similar to what jjongsma did with mdevctl (nudge nudge, hint hint). Or maybe I'm making it into a bigger deal than it needs to be, and we should just implement the logic of the python script up above directly in libvirt. Does anyone have an opinion? (NB: If a device is assigned to a guest by libvirt with <hostdev managed='no'> then libvirt will just blindly assume that it is already bound to the correct driver, so until we get internal support for using the device-specific drivers, users can still get the same functionality by binding their devices to the device-specific vfio driver externally to libvirt). ===== 2) There may be cases where, in spite of a device-specific driver being available, the user prefers to use the generic vfio_pci driver. To support that we will need to have a place in our config to set the driver name. We already have a <driver> subelement of <hostdev> that was originally added to allow choosing between VFIO device assignment and legacy KVM device assignment: <driver name='vfio|kvm'/> All support for KVM device assignment was removed a few years ago, so in practice the driver name is always "vfio". The most natural looking way to support device-specific drivers would be to use this name attribute to specify the driver name, e.g. if you wanted to let libvirt select the best driver, you would use: <driver name='vfio'/> (what it's currently set to in everyone's configs). But if you wanted to force use of the generic driver, you'd use: <driver name='vfio_pci'/> or if you wanted to force use of another driver that wasn't the 'best fit' according to the module aliases, you could use, e.g.: <driver name='vfio_pci_xyzzy'/> I'm uncomfortable with the fact that we're effectively "re-using" the name attribute for a new purpose though - up until now it has been "which device assignment method?", but this changes it to "which vfio driver should be loaded?". So maybe we need a new element. I'm not sure what to call it though. How about this? <driver name='vfio' modname='vfio_pci'/> Does anyone have a better idea for the name?

2 1

[PATH v2 0/2] qemu: don't change ownership of cache directory
by Peng Liang 13 Sep '21

13 Sep '21

See path 2 for detail. v1 -> v2: - Add commit message for path1 [Peter] Peng Liang (2): qemu: move temp file of screenshot and memorypeek to autoDumpPath qemu: don't change ownership of cache directory src/qemu/qemu_driver.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- 2.31.1

2 4

[PATCH] docs: Fix dimm example
by Michal Privoznik 13 Sep '21

13 Sep '21

In the example for <memory model='dimm'/> we show how to configure hugepages as backend. In the example we show 4MiB hugepages which are non-standard and thus at the first glance may mislead users thinking that a regular sized pages (4K) will be used. Use 2MiB as the value instead. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 67cb934881..7dc93d6abe 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -7745,7 +7745,7 @@ Example: usage of the memory devices </memory> <memory model='dimm'> <source> - <pagesize unit='KiB'>4096</pagesize> + <pagesize unit='KiB'>2048</pagesize> <nodemask>1-3</nodemask> </source> <target> -- 2.32.0

2 1

[libvirt PATCH 0/4] qemu: replace -device sga with -M graphics=off
by Daniel P. Berrangé 13 Sep '21

13 Sep '21

SeaBIOS >= 1.11 / QEMU >= 2.11 no longer requires the 'sga' device for serial console output from the BIOS. It can be done directly with graphics=off machine option. This appears to be live migration compatible, despite changing the number of option ROMS loaded, though I need a little more testing to fully confirm this. Daniel P. Berrangé (4): qemu: prevent use of <bios useserial='yes'> on non-x86 arches qemu: tweak error message to be more general purpose qemu: switch to use -M graphics=off instead of -device sga qemu: stop probing for '-device sga' support src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 25 ++++++++----------- src/qemu/qemu_validate.c | 15 ++++++++--- .../caps_2.11.0.x86_64.xml | 1 - .../caps_2.12.0.x86_64.xml | 1 - .../caps_3.0.0.x86_64.xml | 1 - .../caps_3.1.0.x86_64.xml | 1 - .../caps_4.0.0.x86_64.xml | 1 - .../caps_4.1.0.x86_64.xml | 1 - .../caps_4.2.0.x86_64.xml | 1 - .../caps_5.0.0.x86_64.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.x86_64.xml | 1 - .../caps_6.0.0.x86_64.xml | 1 - .../caps_6.1.0.x86_64.xml | 1 - tests/qemuxml2argvdata/bios.args | 3 +-- tests/qemuxml2argvtest.c | 3 +-- 18 files changed, 25 insertions(+), 38 deletions(-) -- 2.31.1

3 7

[PATCH 0/2] qemu: don't change ownership of cache directory
by Peng Liang 13 Sep '21

13 Sep '21

See path 2 for detail. Peng Liang (2): qemu: move temp file of screenshot and memorypeek to autoDumpPath qemu: don't change ownership of cache directory src/qemu/qemu_driver.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- 2.31.1

2 3

Libvirt with Firecracker
by Puscasu, Felix 12 Sep '21

12 Sep '21

Hello Libvirt team, For the last couple of months, as an AWS intern I have been reading and learning how to use libvirt. I have been working on integrating Firecracker<https://github.com/firecracker-microvm/firecracker>, an open source virtual machine monitor into libvirt as a hypervisor driver, believing its design would be a great addition to the fleet of already existing drivers. One question I have is regarding testing, I couldn’t properly use the libvirt-test-API repository, and neither the libvirt-TCK one. I am now looking at the testing done In the libvirt repository itself and wanted to ask if integration-like tests would be achievable here, and if it is in line with the project’s direction. We would like to have tests to be as “end to end” as they can. Another mention is this contribution is more of a proof of concept than a production ready patch/series of patches as it doesn’t have (yet) tests in any way. It can be a starting point for future contributions (that can also be from the open source community). I wanted to check with you if this integration collides with any of your ongoing work and what would be some of your initial thoughts. Kind regards, Felix Puscasu Amazon Development Center (Romania) S.R.L. registered office: 27A Sf. Lazar Street, UBC5, floor 2, Iasi, Iasi County, 700045, Romania. Registered in Romania. Registration number J22/2621/2005. Amazon Development Center (Romania) S.R.L. registered office: 27A Sf. Lazar Street, UBC5, floor 2, Iasi, Iasi County, 700045, Romania. Registered in Romania. Registration number J22/2621/2005.

3 2

[PATCH v2 0/4] Add support for two i386 pm options which control acpi hotplug
by Ani Sinha 12 Sep '21

12 Sep '21

Hi: I added some negative xml2argv tests as well as new xml2xml tests. In the process, I also fixed a bug where I had not added appropriate code to generate the output xml correctly. The patch series is sent again as v2. Kindly, please provide inputs and review them. [PATCH v2 1/4] pm/i386: add support for two options that controls [PATCH v2 2/4] tests: add positive xml2argv tests to exercize pm acpi [PATCH v2 3/4] tests: add negative xml2argv tests to exercize pm acpi [PATCH v2 4/4] tests: add xml2xml tests to exercize pm acpi hotplug

2 8

[PATCH] src: network_conf: propagate only bool to virNetworkDefParseString()
by Kristina Hanicova 10 Sep '21

10 Sep '21

We don't need to propagate all public flags, only the information about the presence of the validation one, which can differ from function to function. This patch makes it easier and more readable in case of a future additions of validation flags. This change was suggested by Daniel. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 12 ++++++------ src/conf/network_conf.h | 2 +- src/esx/esx_network_driver.c | 2 +- src/network/bridge_driver.c | 5 +++-- src/qemu/qemu_process.c | 2 +- src/test/test_driver.c | 5 +++-- src/vbox/vbox_network.c | 3 ++- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cb9e7218ff..858f6f923a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30523,7 +30523,7 @@ virDomainNetResolveActualType(virDomainNetDef *iface) if (!(xml = virNetworkGetXMLDesc(net, 0))) goto cleanup; - if (!(def = virNetworkDefParseString(xml, NULL, 0))) + if (!(def = virNetworkDefParseString(xml, NULL, false))) goto cleanup; switch ((virNetworkForwardType) def->forward.type) { diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f23599abac..7a0f6f02c3 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -318,7 +318,7 @@ virNetworkDefCopy(virNetworkDef *def, if (!(xml = virNetworkDefFormat(def, xmlopt, flags))) return NULL; - return virNetworkDefParseString(xml, xmlopt, 0); + return virNetworkDefParseString(xml, xmlopt, false); } @@ -2086,14 +2086,14 @@ static virNetworkDef * virNetworkDefParse(const char *xmlStr, const char *filename, virNetworkXMLOption *xmlopt, - unsigned int flags) + bool validate_flag) { g_autoptr(xmlDoc) xml = NULL; virNetworkDef *def = NULL; int keepBlanksDefault = xmlKeepBlanksDefault(0); if ((xml = virXMLParse(filename, xmlStr, _("(network_definition)"), - "network.rng", flags & VIR_NETWORK_DEFINE_VALIDATE))) + "network.rng", validate_flag))) def = virNetworkDefParseNode(xml, xmlDocGetRootElement(xml), xmlopt); xmlKeepBlanksDefault(keepBlanksDefault); @@ -2104,9 +2104,9 @@ virNetworkDefParse(const char *xmlStr, virNetworkDef * virNetworkDefParseString(const char *xmlStr, virNetworkXMLOption *xmlopt, - unsigned int flags) + bool validate_flag) { - return virNetworkDefParse(xmlStr, NULL, xmlopt, flags); + return virNetworkDefParse(xmlStr, NULL, xmlopt, validate_flag); } @@ -2114,7 +2114,7 @@ virNetworkDef * virNetworkDefParseFile(const char *filename, virNetworkXMLOption *xmlopt) { - return virNetworkDefParse(NULL, filename, xmlopt, 0); + return virNetworkDefParse(NULL, filename, xmlopt, false); } diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 30958eff64..1dda45b25c 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -329,7 +329,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, virNetworkDef * virNetworkDefParseString(const char *xmlStr, virNetworkXMLOption *xmlopt, - unsigned int flags); + bool validate_flag); virNetworkDef * virNetworkDefParseFile(const char *filename, diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 673ed5421f..8acf7591cf 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -298,7 +298,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char *xml, return NULL; /* Parse network XML */ - def = virNetworkDefParseString(xml, NULL, flags); + def = virNetworkDefParseString(xml, NULL, flags & VIR_NETWORK_DEFINE_VALIDATE); if (!def) return NULL; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 06822fb3a0..4b6daf19a8 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3474,7 +3474,7 @@ networkCreateXML(virConnectPtr conn, virNetworkPtr net = NULL; virObjectEvent *event = NULL; - if (!(newDef = virNetworkDefParseString(xml, network_driver->xmlopt, 0))) + if (!(newDef = virNetworkDefParseString(xml, network_driver->xmlopt, false))) goto cleanup; if (virNetworkCreateXMLEnsureACL(conn, newDef) < 0) @@ -3529,7 +3529,8 @@ networkDefineXMLFlags(virConnectPtr conn, virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL); - if (!(def = virNetworkDefParseString(xml, network_driver->xmlopt, flags))) + if (!(def = virNetworkDefParseString(xml, network_driver->xmlopt, + flags & VIR_NETWORK_DEFINE_VALIDATE))) goto cleanup; if (virNetworkDefineXMLFlagsEnsureACL(conn, def) < 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 207129a556..51d02e9fb6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4778,7 +4778,7 @@ qemuProcessGetNetworkAddress(const char *netname, if (!xml) goto cleanup; - netdef = virNetworkDefParseString(xml, NULL, 0); + netdef = virNetworkDefParseString(xml, NULL, false); if (!netdef) goto cleanup; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2f19b7c520..33f611081c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5581,7 +5581,7 @@ testNetworkCreateXML(virConnectPtr conn, const char *xml) virNetworkPtr net = NULL; virObjectEvent *event = NULL; - if ((newDef = virNetworkDefParseString(xml, NULL, 0)) == NULL) + if ((newDef = virNetworkDefParseString(xml, NULL, false)) == NULL) goto cleanup; if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef, @@ -5620,7 +5620,8 @@ testNetworkDefineXMLFlags(virConnectPtr conn, virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL); - if ((newDef = virNetworkDefParseString(xml, NULL, flags)) == NULL) + if (!(newDef = virNetworkDefParseString(xml, NULL, + flags & VIR_NETWORK_DEFINE_VALIDATE))) goto cleanup; if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef, 0))) diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index c554b052c9..c0694d42d5 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -397,7 +397,8 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start, VBOX_IID_INITIALIZE(&vboxnetiid); - if (!(def = virNetworkDefParseString(xml, NULL, flags)) || + if (!(def = virNetworkDefParseString(xml, NULL, + flags & VIR_NETWORK_DEFINE_VALIDATE)) || (def->forward.type != VIR_NETWORK_FORWARD_NONE) || (def->nips == 0 || !def->ips)) goto cleanup; -- 2.31.1

2 1

[PATCH] qemuProcessQMPInit: Use long options for '-qmp' when probing qemu.
by Peter Krempa 10 Sep '21

10 Sep '21

'-qmp' in this case behaves the same as '-chardev' so it should have been converted the same way as others were in 43c9c0859f2d53321 since short options are deprecated. Signed-off-by: Peter Krempa <pkrempa(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 207129a556..df1f481433 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9045,7 +9045,7 @@ qemuProcessQMPInit(qemuProcessQMP *proc) proc->monpath = g_strdup_printf("%s/%s", proc->uniqDir, "qmp.monitor"); - proc->monarg = g_strdup_printf("unix:%s,server,nowait", proc->monpath); + proc->monarg = g_strdup_printf("unix:%s,server=on,wait=off", proc->monpath); /* * Normally we'd use runDir for pid files, but because we're using -- 2.31.1

2 1

[libvirt PATCH 0/7] gitlab: convert to use the lcitool manifest feature
by Daniel P. Berrangé 10 Sep '21

10 Sep '21

This switches our CI rules to be largely auto-generated by the lcitool manifest command, so that they share a consistent design with all other projects and are simpler to modify in future. Daniel P. Berrangé (7): gitlab: move codestyle job to the sanity_checks stage gitlab: refresh containers / cirrus files with latest content gitlab: fold sanitizer jobs into regular ubuntu jobs gitlab: define a manifest file to express the CI config ci: re-generate containers/gitlab config from manifest ci: remove obsolete refresh documentation ci: remove obsolete logic for refreshing containers/cirrus .gitlab-ci.yml | 539 +--------------- ci/cirrus/freebsd-12.vars | 8 +- ci/cirrus/freebsd-13.vars | 8 +- ci/cirrus/freebsd-current.vars | 8 +- ci/cirrus/macos-11.vars | 4 +- ci/containers/README.rst | 36 -- ci/containers/centos-8.Dockerfile | 5 +- ci/containers/centos-stream-8.Dockerfile | 5 +- .../debian-10-cross-aarch64.Dockerfile | 8 +- .../debian-10-cross-armv6l.Dockerfile | 8 +- .../debian-10-cross-armv7l.Dockerfile | 8 +- ci/containers/debian-10-cross-i686.Dockerfile | 8 +- ci/containers/debian-10-cross-mips.Dockerfile | 8 +- .../debian-10-cross-mips64el.Dockerfile | 8 +- .../debian-10-cross-mipsel.Dockerfile | 8 +- .../debian-10-cross-ppc64le.Dockerfile | 8 +- .../debian-10-cross-s390x.Dockerfile | 8 +- ci/containers/debian-10.Dockerfile | 8 +- .../debian-sid-cross-aarch64.Dockerfile | 5 +- .../debian-sid-cross-armv6l.Dockerfile | 5 +- .../debian-sid-cross-armv7l.Dockerfile | 5 +- .../debian-sid-cross-i686.Dockerfile | 5 +- .../debian-sid-cross-mips64el.Dockerfile | 5 +- .../debian-sid-cross-mipsel.Dockerfile | 5 +- .../debian-sid-cross-ppc64le.Dockerfile | 5 +- .../debian-sid-cross-s390x.Dockerfile | 5 +- ci/containers/debian-sid.Dockerfile | 5 +- ci/containers/fedora-33.Dockerfile | 5 +- ci/containers/fedora-34.Dockerfile | 5 +- .../fedora-rawhide-cross-mingw32.Dockerfile | 4 +- .../fedora-rawhide-cross-mingw64.Dockerfile | 4 +- ci/containers/fedora-rawhide.Dockerfile | 5 +- ci/containers/opensuse-leap-152.Dockerfile | 5 +- ci/containers/opensuse-tumbleweed.Dockerfile | 5 +- ci/containers/ubuntu-1804.Dockerfile | 5 +- ci/containers/ubuntu-2004.Dockerfile | 5 +- ci/gitlab.yml | 602 ++++++++++++++++++ ci/helper | 121 +--- ci/manifest.yml | 153 +++++ ci/util.py | 32 +- 40 files changed, 871 insertions(+), 818 deletions(-) delete mode 100644 ci/containers/README.rst create mode 100644 ci/gitlab.yml create mode 100644 ci/manifest.yml -- 2.31.1

2 8

[PATCH] libvirt-domain.c: Fix typo in virDomainAttachDevice doc
by Michal Privoznik 10 Sep '21

10 Sep '21

In the documentation to virDomainAttachDevice() we refer to a non-existent virDomainUpdateDeviceFlag() function. The correct name is virDomainUpdateDeviceFlags(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a8a386e839..57baef6889 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8309,7 +8309,7 @@ virDomainGetMetadata(virDomainPtr domain, * * For compatibility, this method can also be used to change the media * in an existing CDROM/Floppy device, however, applications are - * recommended to use the virDomainUpdateDeviceFlag method instead. + * recommended to use the virDomainUpdateDeviceFlags method instead. * * Be aware that hotplug changes might not persist across a domain going * into S4 state (also known as hibernation) unless you also modify the -- 2.32.0

1 0

[PATCH] hw/misc: deprecate the 'sga' device
by Daniel P. Berrangé 10 Sep '21

10 Sep '21

This is obsolete since SeaBIOS 1.11.0 introduced native support for sending messages to the serial console. The new support can be activated using -machine graphics=off on x86 targets. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/about/deprecated.rst | 10 ++++++++++ hw/misc/sga.c | 2 ++ 2 files changed, 12 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 9ee355ec0b..cafca05826 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -280,6 +280,16 @@ full SCSI support. Use virtio-scsi instead when SCSI passthrough is required. Note this also applies to ``-device virtio-blk-pci,scsi=on|off``, which is an alias. +``-device sga`` (since 6.2) +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``sga`` device loads an option ROM for x86 targets which enables +SeaBIOS to send messages to the serial console. SeaBIOS 1.11.0 onwards +contains native support for this feature and thus use of the option +ROM approach is obsolete. The native SeaBIOS support can be activated +by using ``-machine graphics=off``. + + Block device options '''''''''''''''''''' diff --git a/hw/misc/sga.c b/hw/misc/sga.c index 4dbe6d78f9..1d04672b01 100644 --- a/hw/misc/sga.c +++ b/hw/misc/sga.c @@ -30,6 +30,7 @@ #include "hw/loader.h" #include "qemu/module.h" #include "qom/object.h" +#include "qemu/error-report.h" #define SGABIOS_FILENAME "sgabios.bin" @@ -42,6 +43,7 @@ struct ISASGAState { static void sga_realizefn(DeviceState *dev, Error **errp) { + warn_report("-device sga is deprecated, use -machine graphics=off"); rom_add_vga(SGABIOS_FILENAME); } -- 2.31.1

2 1

[PATCH 0/9] Fix image labels lost after migration with shared fs
by Peng Liang 10 Sep '21

10 Sep '21

When migrating using shared fs, the dst host will remember the image labels again before launching the VM and the src host will remove the image labels after migration. It leads to that the image labels lost after migration. Patch 7-9 are the real fix patches. Peng Liang (9): security: add virSecurityUpdateTimestampIfexists security: add virSecurityManagerUpdateImageLabel security: implement domainUpdateSecurityImageLabel for stack security: implement domainUpdateSecurityImageLabel for DAC qemu: add qemuSecurityUpdateImageLabel security: rename virSecurityDACSetImageLabelInternal to virSecurityDACSetImageLabelSingle migration: don't remember image labels when migrating with shared fs migration: don't remove image labels after migration migration: update image labels in dst after migration src/libvirt_private.syms | 1 + src/qemu/qemu_migration.c | 12 +++++++ src/qemu/qemu_process.c | 5 ++- src/qemu/qemu_security.c | 10 ++++++ src/qemu/qemu_security.h | 5 +++ src/security/security_dac.c | 58 +++++++++++++++++++++++++-------- src/security/security_driver.h | 5 +++ src/security/security_manager.c | 29 +++++++++++++++++ src/security/security_manager.h | 5 +++ src/security/security_stack.c | 20 ++++++++++++ src/security/security_util.c | 32 ++++++++++++++++++ src/security/security_util.h | 4 +++ 12 files changed, 172 insertions(+), 14 deletions(-) -- 2.31.1

2 18

[libvirt PATCH] docs: virtiofs: remove extra slash
by Ján Tomko 09 Sep '21

09 Sep '21

Reported-by: Richard W.M. Jones <rjones(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/kbase/virtiofs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/virtiofs.rst b/docs/kbase/virtiofs.rst index b89de0c57a..9123fc2316 100644 --- a/docs/kbase/virtiofs.rst +++ b/docs/kbase/virtiofs.rst @@ -81,7 +81,7 @@ control and need to be set by the application running virtiofsd. :: - <filesystem type='mount'/> + <filesystem type='mount'> <driver type='virtiofs' queue='1024'/> <source socket='/var/virtiofsd.sock'/> <target dir='tag'/> -- 2.31.1

1 0

[libvirt PATCH] docs: virtiofs: provide more context for elements
by Ján Tomko 09 Sep '21

09 Sep '21

Suggested-by: Richard W.M. Jones <rjones(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/kbase/virtiofs.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/kbase/virtiofs.rst b/docs/kbase/virtiofs.rst index d728a1358c..b89de0c57a 100644 --- a/docs/kbase/virtiofs.rst +++ b/docs/kbase/virtiofs.rst @@ -62,11 +62,14 @@ More optional elements can be specified :: - <driver type='virtiofs' queue='1024'/> - <binary path='/usr/libexec/virtiofsd' xattr='on'> - <cache mode='always'/> - <lock posix='on' flock='on'/> - </binary> + <filesystem type='mount' accessmode='passthrough'> + <driver type='virtiofs' queue='1024'/> + ... + <binary path='/usr/libexec/virtiofsd' xattr='on'> + <cache mode='always'/> + <lock posix='on' flock='on'/> + </binary> + </filesystem> Externally-launched virtiofsd ============================= -- 2.31.1

1 0

[libvirt PATCH 00/24] tests: use g_auto more (glib chronicles)
by Ján Tomko 09 Sep '21

09 Sep '21

Ján Tomko (24): tests: virnetdaemontest: split variable declarations conf: add cleanup func for virNetworkXMLOption conf: add cleanup func for virMacMap tests: use g_autoptr instead of virObjectUnref tests: qemu: use g_autofree tests: network: use g_autofree tests: libxl: use g_autofree tests: nwfilter: use g_autofree tests: vmx: use g_autofree tests: vir: use g_autofree tests: use g_autofree tests: use g_autoptr instead of virJSONValueFree tests: use g_auto for virCPUDataFree tests: use g_auto instead of VIR_FORCE_FCLOSE tests: use VIR_AUTOCLOSE tests: use g_auto instead of vshTableFree tests: use g_auto instead of virDomainFree tests: qemu: remove pointless labels tests: vmx: remove pointless labels tests: libxl: remove pointless labels tests: nwfilter: remove pointless labels tests: vshtabletest: remove pointless labels tests: vir: remove pointless labels tests: remove pointless labels src/conf/network_conf.h | 1 + src/util/virmacmap.h | 2 + tests/cputest.c | 51 ++++------- tests/domaincapstest.c | 60 +++++-------- tests/domainconftest.c | 18 ++-- tests/eventtest.c | 3 +- tests/fchosttest.c | 70 +++++---------- tests/fdstreamtest.c | 24 ++--- tests/genericxml2xmltest.c | 6 +- tests/interfacexml2xmltest.c | 9 +- tests/libxlxml2domconfigtest.c | 18 ++-- tests/lxcconf2xmltest.c | 37 +++----- tests/lxcxml2xmltest.c | 6 +- tests/metadatatest.c | 37 +++----- tests/networkxml2conftest.c | 19 ++-- tests/networkxml2firewalltest.c | 9 +- tests/networkxml2xmltest.c | 13 +-- tests/networkxml2xmlupdatetest.c | 16 ++-- tests/nodedevxml2xmltest.c | 9 +- tests/nsstest.c | 4 +- tests/nwfilterebiptablestest.c | 84 ++++++----------- tests/nwfilterxml2firewalltest.c | 12 +-- tests/nwfilterxml2xmltest.c | 10 +-- tests/openvzutilstest.c | 23 ++--- tests/qemuagenttest.c | 31 ++----- tests/qemucapsprobemock.c | 12 +-- tests/qemucommandutiltest.c | 15 ++-- tests/qemumonitorjsontest.c | 116 +++++++++--------------- tests/qemumonitortestutils.c | 45 +++------- tests/qemuxml2argvtest.c | 24 ++--- tests/scsihosttest.c | 37 +++----- tests/secretxml2xmltest.c | 7 +- tests/securityselinuxlabeltest.c | 27 ++---- tests/sockettest.c | 4 +- tests/testutils.c | 8 +- tests/testutilslxc.c | 4 +- tests/vboxsnapshotxmltest.c | 12 +-- tests/vircapstest.c | 20 ++--- tests/vircgrouptest.c | 3 +- tests/virconftest.c | 44 ++++----- tests/vircryptotest.c | 35 +++----- tests/virfilecachetest.c | 3 +- tests/virfilemock.c | 3 +- tests/virfiletest.c | 61 +++++-------- tests/virhostcputest.c | 42 +++------ tests/viriscsitest.c | 18 ++-- tests/virkmodtest.c | 39 +++----- tests/virmacmaptest.c | 49 ++++------ tests/virnetdaemontest.c | 13 ++- tests/virnetsockettest.c | 6 +- tests/virnettlshelpers.c | 4 +- tests/virnetworkportxml2xmltest.c | 23 ++--- tests/virnumamock.c | 14 +-- tests/virnwfilterbindingxml2xmltest.c | 7 +- tests/virpcimock.c | 4 +- tests/virpcitest.c | 56 +++++------- tests/virresctrltest.c | 34 +++---- tests/virrotatingfiletest.c | 4 +- tests/virscsitest.c | 31 ++----- tests/virstringtest.c | 44 +++------ tests/virsystemdtest.c | 29 ++---- tests/virtestmock.c | 10 +-- tests/viruritest.c | 3 +- tests/virusbmock.c | 7 +- tests/virusbtest.c | 6 +- tests/vmwarevertest.c | 20 ++--- tests/vmx2xmltest.c | 35 +++----- tests/vshtabletest.c | 125 ++++++++++---------------- tests/xlconfigtest.c | 85 +++++++----------- tests/xmconfigtest.c | 62 +++++-------- tests/xml2vmxtest.c | 32 +++---- 71 files changed, 628 insertions(+), 1226 deletions(-) -- 2.31.1

2 32

[libvirt PATCH v3 0/7] Enable autostarting mediated devices
by Jonathon Jongsma 09 Sep '21

09 Sep '21

This first version of this series was reviewed quite a while ago and all patches were ACKed except the second one. I posted a second series with changes noted below but it was never ACKed and I dropped the ball for a little while. Subsequently there were questions about whether physical devices (e.g. pci, usb, etc) should return 'true' or 'false' for the GetAutostart()/IsPersistent() calls. I had initially marked them as persistent=true and autostart=true because they superficially act a bit like persistently-defined devices. But Boris convinced me that this is not a very accurate classification since if the physical device is unplugged, there will be no record of it left behind. So I've switched all non-mdev devices to be persistent=false and autostart=false. This is also imperfect, but it seems relatively harmless. Comments welcome. A reminder of what is included in this series: - new API consistent with existing libvirt objects: - virNodeDeviceGetAutostart() - virNodeDeviceSetAutostart() - virNodeDeviceIsPersistent() - virNodeDeviceIsActive - new virsh commands - nodedev-info - nodedev-autostart Changes in version 2: - Parse the autostart property from mdevctl output. Changes in version 3: - switch physical devices to autostart=false, persistent=false - rebase to upstream - update version numbers for new API, etc - fix accidental copy-paste error in virsh command descriptions Jonathon Jongsma (7): api: add virNodeDevice(Get|Set)Autostart() nodedev: implement virNodeDevice(Get|Set)Autostart() nodedev: Add tests for mdevctl autostart command virsh: add nodedev-autostart api: add virNodeDeviceIsPersistent()/IsActive() nodedev: Implement virNodeDeviceIsPersistent()/IsActive() virsh: add nodedev-info docs/manpages/virsh.rst | 27 +++ include/libvirt/libvirt-nodedev.h | 10 + src/conf/node_device_conf.h | 1 + src/conf/virnodedeviceobj.c | 16 ++ src/conf/virnodedeviceobj.h | 6 + src/driver-nodedev.h | 18 ++ src/libvirt-nodedev.c | 141 +++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 4 + src/node_device/node_device_driver.c | 189 +++++++++++++++++- src/node_device/node_device_driver.h | 19 ++ src/node_device/node_device_udev.c | 22 +- src/remote/remote_driver.c | 6 +- src/remote/remote_protocol.x | 60 +++++- src/remote_protocol-structs | 26 +++ .../nodedevmdevctldata/mdevctl-autostart.argv | 8 + tests/nodedevmdevctltest.c | 55 +++++ tools/virsh-nodedev.c | 139 +++++++++++++ 18 files changed, 740 insertions(+), 9 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdevctl-autostart.argv -- 2.31.1

2 9

[PATCH] virsh: Display vhostuser socket path in domblklist
by dinglimin 09 Sep '21

09 Sep '21

The domblklist command is designed to show a brief information about the blocks of a domain. One piece of information that is shows is "Target "and "Source". Before the modification, the Vhost disk of SPDK is displayed as "-". After the modification, the socket associated with it can be displayed Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- tools/virsh-domain-monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index f7cf82acdf..eb3e0ef11a 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -644,7 +644,8 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) "|./source/@dev" "|./source/@dir" "|./source/@name" - "|./source/@volume)", ctxt); + "|./source/@volume" + "|./source/@path)", ctxt); } if (details) { -- 2.18.2

2 1

[PATCH] qemu_driver:report guest interface informations
by scuzhanglei 09 Sep '21

09 Sep '21

Signed-off-by: scuzhanglei <greatzhanglei(a)gmail.com> --- NEWS.rst | 5 ++ include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 12 +++++ src/qemu/qemu_agent.c | 9 ++-- src/qemu/qemu_agent.h | 3 +- src/qemu/qemu_driver.c | 88 +++++++++++++++++++++++++++++++- tests/qemuagenttest.c | 2 +- tools/virsh-domain.c | 2 + 8 files changed, 115 insertions(+), 7 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 21df0e1602..fde781b320 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -19,6 +19,11 @@ v7.7.0 (unreleased) * **Improvements** + * qemu: Report guest interfaces information in ``virDomainGetGuestInfo`` + + Libvirt is now able to report interfaces from the guest's + perspective (using guest agent). + * **Bug fixes** diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 7ef8ac51e5..b088847725 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -5074,6 +5074,7 @@ typedef enum { VIR_DOMAIN_GUEST_INFO_HOSTNAME = (1 << 3), /* return hostname information */ VIR_DOMAIN_GUEST_INFO_FILESYSTEM = (1 << 4), /* return filesystem information */ VIR_DOMAIN_GUEST_INFO_DISKS = (1 << 5), /* return disks information */ + VIR_DOMAIN_GUEST_INFO_INTERFACES = (1 << 6), /* return interfaces information */ } virDomainGuestInfoTypes; int virDomainGetGuestInfo(virDomainPtr domain, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a8a386e839..dfd84b4744 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12586,6 +12586,18 @@ virDomainSetVcpu(virDomainPtr domain, * virTypedParamsFree to free memory returned in @params. * * Returns 0 on success, -1 on error. + * VIR_DOMAIN_GUEST_INFO_INTERFACES: + * Returns information about the interfaces within the domain. the typed + * parameter keys are in this format: + * + * "if.count" - the number of interfaces defined on this domain + * as an unsigned int + * "if.<num>.name" - interface name in the guest + * "if.<num>.hwaddr" - hardware address of interface + * "if.<num>.addr.count - the number of ip addresses of interface + * "if.<num>.addr.<num>.type" - the type of ip address(e.g. ipv4) + * "if.<num>.addr.<num>.addr" - the ip address + * "if.<num>.addr.<num>.prefix" - the number of bits of ip address prefix */ int virDomainGetGuestInfo(virDomainPtr domain, unsigned int types, diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5f421be6f6..a7f943e0dc 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2245,17 +2245,20 @@ qemuAgentGetAllInterfaceAddresses(virDomainInterfacePtr **ifaces_ret, */ int qemuAgentGetInterfaces(qemuAgent *agent, - virDomainInterfacePtr **ifaces) + virDomainInterfacePtr **ifaces, + bool report_unsupported) { g_autoptr(virJSONValue) cmd = NULL; g_autoptr(virJSONValue) reply = NULL; virJSONValue *ret_array = NULL; + int rc; if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL))) return -1; - if (qemuAgentCommand(agent, cmd, &reply, agent->timeout) < 0) - return -1; + if ((rc = qemuAgentCommandFull(agent, cmd, &reply, agent->timeout, + report_unsupported)) < 0) + return rc; if (!(ret_array = virJSONValueObjectGetArray(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 81b45b8e5d..94eab9de9f 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -151,7 +151,8 @@ int qemuAgentSetTime(qemuAgent *mon, bool sync); int qemuAgentGetInterfaces(qemuAgent *mon, - virDomainInterfacePtr **ifaces); + virDomainInterfacePtr **ifaces, + bool report_unsupported); int qemuAgentSetUserPassword(qemuAgent *mon, const char *user, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f1f961c51c..0b803c392b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18957,7 +18957,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, goto endjob; agent = qemuDomainObjEnterAgent(vm); - ret = qemuAgentGetInterfaces(agent, ifaces); + ret = qemuAgentGetInterfaces(agent, ifaces, true); qemuDomainObjExitAgent(vm, agent); endjob: @@ -19903,7 +19903,8 @@ static const unsigned int qemuDomainGetGuestInfoSupportedTypes = VIR_DOMAIN_GUEST_INFO_TIMEZONE | VIR_DOMAIN_GUEST_INFO_HOSTNAME | VIR_DOMAIN_GUEST_INFO_FILESYSTEM | - VIR_DOMAIN_GUEST_INFO_DISKS; + VIR_DOMAIN_GUEST_INFO_DISKS | + VIR_DOMAIN_GUEST_INFO_INTERFACES; static int qemuDomainGetGuestInfoCheckSupport(unsigned int types, @@ -20102,6 +20103,69 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfo **fsinfo, } } +static void +virDomainInterfaceFormatParams(virDomainInterfacePtr *ifaces, +int nifaces, +virTypedParameterPtr *params, +int *nparams, int * maxparams) +{ + size_t i, j; + const char *type = NULL; + + if (virTypedParamsAddUInt(params, nparams, maxparams, + "if.count", nifaces) < 0) + return; + + for (i = 0; i < nifaces; i++) { + char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.name", i); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, ifaces[i]->name) < 0) + return; + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.hwaddr", i); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, ifaces[i]->hwaddr) < 0) + return; + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.addr.count", i); + if (virTypedParamsAddUInt(params, nparams, maxparams, + param_name, ifaces[i]->naddrs) < 0) + return; + + for (j = 0; j < ifaces[i]->naddrs; j++) { + switch (ifaces[i]->addrs[j].type) { + case VIR_IP_ADDR_TYPE_IPV4: + type = "ipv4"; + break; + case VIR_IP_ADDR_TYPE_IPV6: + type = "ipv6"; + break; + } + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.addr.%zu.type", i, j); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, type) < 0) + return; + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.addr.%zu.addr", i, j); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, ifaces[i]->addrs[j].addr) < 0) + return; + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.addr.%zu.prefix", i, j); + if (virTypedParamsAddUInt(params, nparams, maxparams, + param_name, ifaces[i]->addrs[j].prefix) < 0) + return; + } + } +} static int qemuDomainGetGuestInfo(virDomainPtr dom, @@ -20123,6 +20187,8 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuAgentFSInfo **agentfsinfo = NULL; size_t ndisks = 0; qemuAgentDiskInfo **agentdiskinfo = NULL; + virDomainInterfacePtr *ifaces = NULL; + size_t nifaces = 0; size_t i; virCheckFlags(0, -1); @@ -20188,6 +20254,15 @@ qemuDomainGetGuestInfo(virDomainPtr dom, } } + if (supportedTypes & VIR_DOMAIN_GUEST_INFO_INTERFACES) { + rc = qemuAgentGetInterfaces(agent, &ifaces, report_unsupported); + if (rc == -1) { + goto exitagent; + } else if (rc >= 0) { + nifaces = rc; + } + } + qemuDomainObjExitAgent(vm, agent); qemuDomainObjEndAgentJob(vm); @@ -20210,6 +20285,10 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); } + if (nifaces > 0) { + virDomainInterfaceFormatParams(ifaces, nifaces, params, nparams, &maxparams); + } + ret = 0; cleanup: @@ -20219,6 +20298,11 @@ qemuDomainGetGuestInfo(virDomainPtr dom, for (i = 0; i < ndisks; i++) qemuAgentDiskInfoFree(agentdiskinfo[i]); g_free(agentdiskinfo); + if (ifaces && nifaces > 0) { + for (i = 0; i < nifaces; i++) + virDomainInterfaceFree(ifaces[i]); + } + g_free(ifaces); virDomainObjEndAPI(&vm); return ret; diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index a447c93494..e0b22c042a 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -920,7 +920,7 @@ testQemuAgentGetInterfaces(const void *data) goto cleanup; if ((ifaces_count = qemuAgentGetInterfaces(qemuMonitorTestGetAgent(test), - &ifaces)) < 0) + &ifaces, true)) < 0) goto cleanup; if (ifaces_count != 4) { diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e5bd1fdd75..ea3ba58616 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13854,6 +13854,8 @@ cmdGuestInfo(vshControl *ctl, const vshCmd *cmd) types |= VIR_DOMAIN_GUEST_INFO_FILESYSTEM; if (vshCommandOptBool(cmd, "disk")) types |= VIR_DOMAIN_GUEST_INFO_DISKS; + if (vshCommandOptBool(cmd, "interface")) + types |= VIR_DOMAIN_GUEST_INFO_INTERFACES; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 2.31.1

2 2

[PATCHv4 0/9] ch: Add Console support
by William Douglas 09 Sep '21

09 Sep '21

This series enables console support in the cloud-hypervisor driver. Cloud-hypervisor only supports a single console or serial device at a time, hence the checks to ensure the domain configuration is only passing one or the other. Changes since v3: * Reset ch monitor's curl handle after a get info request * Improved PTY validation logic * Updated deviceValidateCallback to handle PTY validation * Added error reporting for unexpected PTY json data * Dropped the parallels scanning for PTY * Added a fix for handling deviceValidateCallback failures Changes since v2: * Squashed an additional patch. Changes since v1: * Added missing patch to add the virChrdev device * Added handling for multiple curl WRITEFUNCTION call backs * Added missing free for data.content * Removed redundant console configuration check * Improved handling of pty JSON data to make use of g_autoptr * Squashed two patches William Douglas (9): ch_domain: Add virChrdevs for console support ch_monitor: Make unused function static ch_monitor: Update virCHMonitorGet to handle accept a response ch_monitor: Use virCHMonitorGet to access cloud-hypervisor API ch_monitor: Add pty json builder function ch_process: Handle enabled console devices ch_domain: Allow controller and chr devices ch_driver: Add handler for console API ch_driver: Handle validation failure correctly src/ch/ch_domain.c | 40 +++++++++++++++++++- src/ch/ch_domain.h | 3 ++ src/ch/ch_driver.c | 76 ++++++++++++++++++++++++++++++++++++- src/ch/ch_monitor.c | 91 +++++++++++++++++++++++++++++++++++++++++++-- src/ch/ch_monitor.h | 3 ++ src/ch/ch_process.c | 84 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 290 insertions(+), 7 deletions(-) -- 2.31.1

2 14

[PATCH 00/24] virstoragetest: Re-instate testing of images without backing format
by Peter Krempa 09 Sep '21

09 Sep '21

Most of the series are refactors to make virstoragetest less archaic, the last commit then re-introduces testing of images which don't have backing format recorded in the metadata which can't be formatted using qemu-img any more but have security implications if we'd mishandle them. Peter Krempa (24): virstoragetest: Drop testing of RBD backends via parsing real images virstoragetest: Drop testing of NBD backends via parsing real images testutils: Introduce helper for stripping bulilddir/srcdir from test outputs virstoragetest: Store output of TEST_CHAIN in output files virstoragetest: Remove redundant arguments for chain lookup tests virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain virstoragetest: Test backing chain loops with hardcoded images virstoragetest: Use existing directory in the source tree for 'directory' probing tests virstoragetest: Use a pre-formatted QED file for testing backing store extraction virstoragetest: Use pre-formatted file for non-path extraction test virstoragetest: Use preformatted file for testing missing backing store virstoragetest: Use existing file for testing 'raw' image lookup virstoragetest: Convert symlink and relative image testing use preformatted images virstoragetest: Use preformatted qcow2 image for testing relative paths virstoragetest: Unify testing of QCOW2 images with absolute backing virstoragetest: Stop rewriting images in 'mymain' virstoragetest: Don't rewrite the 'qcow2' image virstoragetest: Assume that 'qemu-img' supports '-o compat=' virstoragetest: testPrepImages: Don't reuse 'cmd' pointer virstoragetest: testPrepImages: Use 'qemu-img' to format 'raw' image virstoragetest: testStorageChain: Skip test if filename is NULL virstoragetest: Don't skip the whole test when qemu-img fails to format images virstoragetest: Remove pointless goto from mymain virstoragetest: Reinstate testing of images without 'backing_fmt' build-aux/syntax-check.mk | 2 +- tests/testutils.c | 30 + tests/testutils.h | 3 + tests/virstoragetest.c | 906 ++++++------------ tests/virstoragetestdata/images/loop-1.qcow2 | Bin 0 -> 196616 bytes tests/virstoragetestdata/images/loop-2.qcow2 | Bin 0 -> 196616 bytes .../virstoragetestdata/images/loop-self.qcow2 | Bin 0 -> 196616 bytes tests/virstoragetestdata/images/qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_nbd-raw.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-auto_qcow2-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-missing.qcow2 | Bin 0 -> 196616 bytes ...2_qcow2-qcow2-symlink_raw-raw-reldir.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-qcow2_qcow2-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-qcow2_raw-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_raw-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_raw-raw-relative.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_raw-raw-reldir.qcow2 | Bin 0 -> 196616 bytes .../images/qed_raw-raw-relative | Bin 0 -> 327680 bytes tests/virstoragetestdata/images/raw | Bin 0 -> 1024 bytes tests/virstoragetestdata/images/sub/link1 | 1 + tests/virstoragetestdata/images/sub/link2 | 1 + tests/virstoragetestdata/lookup/qcow2 | 0 tests/virstoragetestdata/lookup/raw | 0 tests/virstoragetestdata/lookup/sub/link2 | 1 + tests/virstoragetestdata/lookup/wrap | 0 tests/virstoragetestdata/out/directory-dir | 9 + tests/virstoragetestdata/out/directory-none | 9 + tests/virstoragetestdata/out/directory-raw | 9 + .../out/qcow2-auto_qcow2-qcow2_raw-raw | 9 + .../out/qcow2-auto_raw-raw-relative | 9 + .../out/qcow2-qcow2_nbd-raw | 19 + .../out/qcow2-qcow2_qcow2-auto | 19 + .../out/qcow2-qcow2_qcow2-qcow2_qcow2-auto | 29 + .../out/qcow2-qcow2_qcow2-qcow2_raw-auto | 29 + .../out/qcow2-qcow2_qcow2-qcow2_raw-raw | 29 + .../out/qcow2-qcow2_raw-raw-relative | 19 + tests/virstoragetestdata/out/qcow2-symlinks | 29 + tests/virstoragetestdata/out/qed-auto_raw | 9 + tests/virstoragetestdata/out/qed-qed_raw | 19 + tests/virstoragetestdata/out/raw-auto | 9 + tests/virstoragetestdata/out/raw-raw | 9 + 42 files changed, 580 insertions(+), 628 deletions(-) create mode 100644 tests/virstoragetestdata/images/loop-1.qcow2 create mode 100644 tests/virstoragetestdata/images/loop-2.qcow2 create mode 100644 tests/virstoragetestdata/images/loop-self.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_nbd-raw.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-auto_qcow2-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-missing.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-qcow2-symlink_raw-raw-reldir.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-qcow2_qcow2-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-qcow2_raw-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_raw-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_raw-raw-reldir.qcow2 create mode 100644 tests/virstoragetestdata/images/qed_raw-raw-relative create mode 100644 tests/virstoragetestdata/images/raw create mode 120000 tests/virstoragetestdata/images/sub/link1 create mode 120000 tests/virstoragetestdata/images/sub/link2 create mode 100644 tests/virstoragetestdata/lookup/qcow2 create mode 100644 tests/virstoragetestdata/lookup/raw create mode 120000 tests/virstoragetestdata/lookup/sub/link2 create mode 100644 tests/virstoragetestdata/lookup/wrap create mode 100644 tests/virstoragetestdata/out/directory-dir create mode 100644 tests/virstoragetestdata/out/directory-none create mode 100644 tests/virstoragetestdata/out/directory-raw create mode 100644 tests/virstoragetestdata/out/qcow2-auto_qcow2-qcow2_raw-raw create mode 100644 tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-auto create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_qcow2-auto create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-auto create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative create mode 100644 tests/virstoragetestdata/out/qcow2-symlinks create mode 100644 tests/virstoragetestdata/out/qed-auto_raw create mode 100644 tests/virstoragetestdata/out/qed-qed_raw create mode 100644 tests/virstoragetestdata/out/raw-auto create mode 100644 tests/virstoragetestdata/out/raw-raw -- 2.31.1

2 26

[PATCH] qemu: remove unnecessary strlen for LINE_ENDING
by renlei1998＠163.com 08 Sep '21

08 Sep '21

From: Ren Lei <ren.lei4(a)zte.com.cn> the length of LINE_ENDING is static, it's a waste to call strlen every time. Signed-off-by: Ren Lei <ren.lei4(a)zte.com.cn> --- src/qemu/qemu_agent.c | 5 +++-- src/qemu/qemu_monitor_json.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5f421be6f6..3a453b4c58 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -47,6 +47,7 @@ VIR_LOG_INIT("qemu.qemu_agent"); #define LINE_ENDING "\n" +#define LINE_ENDING_LENGTH 1 #define DEBUG_IO 0 #define DEBUG_RAW_IO 0 @@ -341,11 +342,11 @@ static int qemuAgentIOProcessData(qemuAgent *agent, if (nl) { int got = nl - (data + used); - for (i = 0; i < strlen(LINE_ENDING); i++) + for (i = 0; i < LINE_ENDING_LENGTH; i++) data[used + got + i] = '\0'; if (qemuAgentIOProcessLine(agent, data + used, msg) < 0) return -1; - used += got + strlen(LINE_ENDING); + used += got + LINE_ENDING_LENGTH; } else { break; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8d3c4031a6..8b77b3cdaa 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -51,6 +51,7 @@ VIR_LOG_INIT("qemu.qemu_monitor_json"); #define QOM_CPU_PATH "/machine/unattached/device[0]" #define LINE_ENDING "\r\n" +#define LINE_ENDING_LENGTH 2 VIR_ENUM_IMPL(qemuMonitorJob, QEMU_MONITOR_JOB_TYPE_LAST, @@ -271,7 +272,7 @@ int qemuMonitorJSONIOProcess(qemuMonitor *mon, int got = nl - (data + used); char *line; line = g_strndup(data + used, got); - used += got + strlen(LINE_ENDING); + used += got + LINE_ENDING_LENGTH; line[got] = '\0'; /* kill \n */ if (qemuMonitorJSONIOProcessLine(mon, line, msg) < 0) { VIR_FREE(line); -- 2.27.0

2 1

[PATCH 0/6] qemu: Fix crash when validating a XML without disk's <target>
by Peter Krempa 08 Sep '21

08 Sep '21

Apart from fixing the crash the validation code is fixed to do the correct thing and a test case is added. Peter Krempa (6): qemuDomainDefValidateDiskLunSource: Unbreak error messages conf: validate: Move qemu-specific LUN disk validation to global validation conf: validate: Run global device definition validation before callbacks conf: Don't call 'virDomainDiskDefAssignAddress' when disk->dst is NULL virDomainDiskDefValidate: Move validation of disk target qemuxml2argvtest: Add test case for missing disk '<target>' src/conf/domain_conf.c | 1 + src/conf/domain_validate.c | 94 ++++++++++++++----- src/conf/domain_validate.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 50 ---------- src/qemu/qemu_domain.h | 3 - src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_validate.c | 3 - .../default-video-type-x86_64-caps-test-0.err | 2 +- .../disk-fdc-incompatible-address.err | 2 +- .../disk-ide-incompatible-address.err | 2 +- .../disk-missing-target-invalid.err | 1 + .../disk-missing-target-invalid.xml | 22 +++++ .../disk-sata-incompatible-address.err | 2 +- .../disk-scsi-incompatible-address.err | 2 +- .../pseries-default-phb-numa-node.err | 2 +- .../pseries-phb-invalid-target-index-1.err | 2 +- .../pseries-phb-invalid-target-index-2.err | 2 +- .../pseries-phb-invalid-target-index-3.err | 2 +- .../video-invalid-multiple-devices.err | 2 +- ...splay-device-pci-address.x86_64-latest.err | 2 +- tests/qemuxml2argvtest.c | 1 + 22 files changed, 109 insertions(+), 93 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-missing-target-invalid.err create mode 100644 tests/qemuxml2argvdata/disk-missing-target-invalid.xml -- 2.31.1

2 7

[PATCH v2 0/3] support for virtio-blk-pci discard option
by yuxiating＠huawei.com 08 Sep '21

08 Sep '21

From: yuxiating <yuxiating(a)huawei.com> v1->v2 add docs/formatdomain.rst for discard_enable add qemuxml2argvtest change virDomainDiskDiscardEnable to virTristateSwitch yuxiating (3): qemu: probe for virtio-blk-pci discard option support conf: support for virtio-blk-pci discard option qemu: command: support for virtio-blk-pci discard option docs/formatdomain.rst | 3 ++ docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 8 +++++ src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 6 ++++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++ .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../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.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../qemuxml2argvdata/disk-virtio-discard.args | 29 +++++++++++++++ .../qemuxml2argvdata/disk-virtio-discard.xml | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 36 files changed, 125 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.xml -- 2.27.0

2 6

[libvirt PATCH 0/6] libxl: remove enum libxlHwcapVersion
by Ján Tomko 08 Sep '21

08 Sep '21

While looking at users of virCPU.*Free, I found some code that is supposed to deal with Xen < 4.7. The minimum version is 4.9 since the following commit: commit 68940b3fb3c43b8aa03cb6fd2f1d00b1737c9b2c Author: Jim Fehlig <jfehlig(a)suse.com> CommitDate: 2021-06-17 10:11:56 -0600 Xen: Bump minimum supported Xen version to 4.9 Remove the code dealing with the old version and use g_auto moer. Ján Tomko (6): libxl: capabilities: assume Xen version >= 4.7 libxl: remove enum libxlHwcapVersion libxl: capsInitCPU: fail if we can't initialize host features libxl: refactor libxlCapsInitCPU libxl: use g_auto in libxlCapsNodeData libxl: use g_auto in libxlDomainGetEmulatorType src/libxl/libxl_capabilities.c | 119 ++++++++++----------------------- 1 file changed, 37 insertions(+), 82 deletions(-) -- 2.31.1

2 7

Re: [PATCH 2/2] qemu: support for virtio-blk-pci discard options
by y005616296 07 Sep '21

07 Sep '21

>On Tue, Aug 31, 2021 at 20:50:04 +0800, yuxiating wrote: >> DISCARD and WRITE_ZEROES features for machine type >= 4.0 is enabled by default since >> commit 5c81161f804144b146607f890e84613a4cbad95c >> virtio-blk: add "discard" and "write-zeroes" properties >> Sometimes guestos has bugs DISCARD need to be disabled. > >I'm not very persuaded by this commit message, could you please elaborate how the bugs show themselves? > >Specifically this fells like a hack/workaround rather so a proper justification would be great. > Virtio_blk kernel driver has a bug that causes memory corruption in virtblk_setup_discard_write_zeroes(); af822aa68fbd ("block: virtio_blk: fix handling single range discard request") has fix it. However, some operating systems are not fixed and need to disabled on the QEMU side. >> Signed-off-by: yuxiating <yuxiating(a)huawei.com> >> --- >> src/conf/domain_conf.c | 15 +++++++++++++++ >> src/conf/domain_conf.h | 9 +++++++++ >> src/conf/domain_validate.c | 6 ++++++ >> src/libvirt_private.syms | 3 ++- >> src/qemu/qemu_command.c | 11 +++++++++++ >> 5 files changed, 43 insertions(+), 1 deletion(-) > >Please split the conf/* changes from the qemu changes. > >Also you didn't add any documentation to docs/formatdomain.rst which describes the XML which is unacceptable. > >Additionally you are also missing test cases for qemuxml2argvtest. > I will add a description to docs/ formatDomain.rst. qemuxml2argvtest will be added in version V2. >> >> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index >> 6127513117..bfe4721e60 100644 >> --- a/src/conf/domain_conf.c >> +++ b/src/conf/domain_conf.c >> @@ -1278,6 +1278,13 @@ VIR_ENUM_IMPL(virDomainDiskDiscard, >> "ignore", >> ); >> >> +VIR_ENUM_IMPL(virDomainDiskDiscardEnable, >> + VIR_DOMAIN_DISK_DISCARD_ENABLE_LAST, >> + "default", >> + "off", >> + "on", > >NACK to this hunk, 'default' value feels weird, and for the rest we have the virTristateBool type. > > I find virTristateSwitch more appropriate. >> +); >> + >> VIR_ENUM_IMPL(virDomainDiskDetectZeroes, >> VIR_DOMAIN_DISK_DETECT_ZEROES_LAST, >> "default", >> @@ -8930,6 +8937,10 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def, >> if (virXMLPropUInt(cur, "queues", 10, VIR_XML_PROP_NONE, &def->queues) < 0) >> return -1; >> >> + if (virXMLPropEnum(cur, "discard_enable", virDomainDiskDiscardEnableTypeFromString, >> + VIR_XML_PROP_NONZERO, &def->discard_enable) < 0) >> + return -1; >> + >> return 0; >> } >> >> @@ -23416,6 +23427,10 @@ virDomainDiskDefFormatDriver(virBuffer *buf, >> if (disk->queues) >> virBufferAsprintf(&attrBuf, " queues='%u'", disk->queues); >> >> + if (disk->discard_enable) >> + virBufferAsprintf(&attrBuf, " discard_enable='%s'", >> + >> + virDomainDiskDiscardEnableTypeToString(disk->discard_enable)); > >It even behaves exactly like virTristateBool. > I'll use virTristateSwitch instead >> + >> virDomainVirtioOptionsFormat(&attrBuf, disk->virtio); >> >> if (disk->src->metadataCacheMaxSize > 0) { diff --git >> a/src/conf/domain_conf.h b/src/conf/domain_conf.h index >> c7e6df7981..c39694a19e 100644 >> --- a/src/conf/domain_conf.h >> +++ b/src/conf/domain_conf.h > >[...] > >> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index >> ab8a6c00c3..52a74dd2d5 100644 >> --- a/src/libvirt_private.syms >> +++ b/src/libvirt_private.syms >> @@ -1,5 +1,5 @@ >> -# >> # General private symbols. Add symbols here, and see src/meson.build >> for >> +# mainDiskDeviceTypeToString >> # more details. >> # >> # Keep this file sorted by header name, then by symbols with each header. > >NACK to this hunk too, you shouldn't need to modify the header here. > It was my mistake. >> @@ -377,6 +377,7 @@ virDomainDiskDefParseSource; >> virDomainDiskDetectZeroesTypeFromString; >> virDomainDiskDetectZeroesTypeToString; >> virDomainDiskDeviceTypeToString; >> +virDomainDiskDiscardEnableTypeToString; >> virDomainDiskDiscardTypeToString; >> virDomainDiskEmptySource; >> virDomainDiskErrorPolicyTypeFromString; >> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index >> b230314f7f..894c8b17b9 100644 >> --- a/src/qemu/qemu_command.c >> +++ b/src/qemu/qemu_command.c >> @@ -1739,6 +1739,17 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, >> virBufferAsprintf(&opt, ",num-queues=%u", disk->queues); >> } >> >> + if (disk->discard_enable) { >> + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_DISCARD)) >> + { > >This capability was also checked in the validator so you don't need to do this here. > >> + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", >> + _("virtio-blk discard property isn't supported by this " >> + "QEMU binary")); > > > I'm going to delete this check. >> + return NULL; >> + } >> + virBufferAsprintf(&opt, ",discard=%s", >> + virDomainDiskDiscardEnableTypeToString(disk->discard_enable)); >> + } >> + >> qemuBuildVirtioOptionsStr(&opt, disk->virtio); >> >> if (qemuBuildDeviceAddressStr(&opt, def, &disk->info) < 0) >> -- >> 2.27.0 >> >>

1 0

[PATCH] qemu_security: Set the label of monitor
by Peng Liang 07 Sep '21

07 Sep '21

Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> --- src/qemu/qemu_security.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index 19d957dd4b96..96755a62bd2c 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -52,6 +52,12 @@ qemuSecuritySetAllLabel(virQEMUDriver *driver, priv->chardevStdioLogd, migrated) < 0) goto cleanup; + if (priv->monConfig && + virSecurityManagerSetChardevLabel(driver->securityManager, + vm->def, + priv->monConfig, + priv->chardevStdioLogd) < 0) + goto cleanup; if (virSecurityManagerTransactionCommit(driver->securityManager, pid, priv->rememberOwner) < 0) -- 2.31.1

2 4

[libvirt PATCH 0/6] tests: refactor some functions (glib chronicles)
by Ján Tomko 06 Sep '21

06 Sep '21

Ján Tomko (6): tests: esxutils: refactor testParseDatastorePath tests: esxutils: reduce variable scope in testEscapeDatastoreItem tests: esxutils: reduce variable scope in testConvertWindows1252ToUTF8 tests: reduce variable scope in testSELinuxCheckLabels tests: refactor testSELinuxLoadDef virnetsockettest: refactor checkProtocols tests/esxutilstest.c | 46 +++++++++----------------------- tests/securityselinuxlabeltest.c | 41 +++++++++------------------- tests/virnetsockettest.c | 26 +++++++----------- 3 files changed, 34 insertions(+), 79 deletions(-) -- 2.31.1

2 7

[libvirt PATCH] secretxml2xmltest: refactor testCompareXMLToXMLFiles (glib chronicles)
by Ján Tomko 06 Sep '21

06 Sep '21

Use g_auto where possible and remove the pointless label. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tests/secretxml2xmltest.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 48f48416b5..99aaa9db15 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -10,25 +10,19 @@ static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml) { - char *actual = NULL; - int ret = -1; - virSecretDef *secret = NULL; + g_autofree char *actual = NULL; + g_autoptr(virSecretDef) secret = NULL; if (!(secret = virSecretDefParseFile(inxml))) - goto fail; + return -1; if (!(actual = virSecretDefFormat(secret))) - goto fail; + return -1; if (virTestCompareToFile(actual, outxml) < 0) - goto fail; + return -1; - ret = 0; - - fail: - VIR_FREE(actual); - virSecretDefFree(secret); - return ret; + return 0; } struct testInfo { -- 2.31.1

2 1

[libvirt PATCH 0/4] Reinstate -Wunused-but-set-variable
by Ján Tomko 06 Sep '21

06 Sep '21

Personally, I feel like all the cases caught by new Clang's -Wunused-but-set-variable behavior were also unnecessarily difficult to read for humans, we should be more obvious when relying purely on side effects of g_auto and the warning is worth keeping. Even if not, the first two patches should not be controversial. Ján Tomko (4): qemu: remove unused 'cfg' variables util: virIdentitySetCurrent: only unref the old identity on success rpc: mark source returned by virEventGLibAddSocketWatch as unused Revert "meson: avoid bogus warnings from clang and g_autoptr" build-aux/syntax-check.mk | 2 +- meson.build | 21 --------------------- src/qemu/qemu_driver.c | 9 --------- src/rpc/virnetclient.c | 6 +++--- src/util/viridentity.c | 4 +++- 5 files changed, 7 insertions(+), 35 deletions(-) -- 2.31.1

2 5

[libvirt PATCH 0/2] tests: bhyve: minor style tweaks for constants
by Ján Tomko 06 Sep '21

06 Sep '21

I found these lying around in a forgotten branch. Ján Tomko (2): tests: bhyve: remove magic constants tests: bhyve: use bitwise shift when defining flags tests/bhyveargv2xmltest.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.31.1

2 3

[PATCH] qemu_driver: Don't check for g_strdup_printf() retval
by Michal Privoznik 06 Sep '21

06 Sep '21

The g_strdup_printf() function can't fail really. There's no need to check for its return value. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 49 +++++++++--------------------------------- 1 file changed, 10 insertions(+), 39 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cbd48b1849..2ea67b941e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -357,13 +357,7 @@ qemuDomainSnapshotLoad(virDomainObj *vm, priv = vm->privateData; - if (!(snapDir = g_strdup_printf("%s/%s", baseDir, vm->def->name))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to allocate memory for " - "snapshot directory for domain %s"), - vm->def->name); - goto cleanup; - } + snapDir = g_strdup_printf("%s/%s", baseDir, vm->def->name); VIR_INFO("Scanning for snapshots for domain %s in %s", vm->def->name, snapDir); @@ -379,11 +373,7 @@ qemuDomainSnapshotLoad(virDomainObj *vm, kill the whole process */ VIR_INFO("Loading snapshot file '%s'", entry->d_name); - if (!(fullpath = g_strdup_printf("%s/%s", snapDir, entry->d_name))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to allocate memory for path")); - continue; - } + fullpath = g_strdup_printf("%s/%s", snapDir, entry->d_name); if (virFileReadAll(fullpath, 1024*1024*1, &xmlStr) < 0) { /* Nothing we can do here, skip this one */ @@ -464,13 +454,7 @@ qemuDomainCheckpointLoad(virDomainObj *vm, virObjectLock(vm); priv = vm->privateData; - if (!(chkDir = g_strdup_printf("%s/%s", baseDir, vm->def->name))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to allocate memory for " - "checkpoint directory for domain %s"), - vm->def->name); - goto cleanup; - } + chkDir = g_strdup_printf("%s/%s", baseDir, vm->def->name); VIR_INFO("Scanning for checkpoints for domain %s in %s", vm->def->name, chkDir); @@ -486,11 +470,7 @@ qemuDomainCheckpointLoad(virDomainObj *vm, kill the whole process */ VIR_INFO("Loading checkpoint file '%s'", entry->d_name); - if (!(fullpath = g_strdup_printf("%s/%s", chkDir, entry->d_name))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to allocate memory for path")); - continue; - } + fullpath = g_strdup_printf("%s/%s", chkDir, entry->d_name); if (virFileReadAll(fullpath, 1024*1024*1, &xmlStr) < 0) { /* Nothing we can do here, skip this one */ @@ -626,8 +606,7 @@ qemuStateInitialize(bool privileged, if (!(qemu_driver->config = cfg = virQEMUDriverConfigNew(privileged, root))) goto error; - if (!(driverConf = g_strdup_printf("%s/qemu.conf", cfg->configBaseDir))) - goto error; + driverConf = g_strdup_printf("%s/qemu.conf", cfg->configBaseDir); if (virQEMUDriverConfigLoadFile(cfg, driverConf, privileged) < 0) goto error; @@ -2953,13 +2932,9 @@ qemuDomainSave(virDomainPtr dom, const char *path) static char * qemuDomainManagedSavePath(virQEMUDriver *driver, virDomainObj *vm) { - char *ret; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - if (!(ret = g_strdup_printf("%s/%s.save", cfg->saveDir, vm->def->name))) - return NULL; - - return ret; + return g_strdup_printf("%s/%s.save", cfg->saveDir, vm->def->name); } static int @@ -3461,8 +3436,7 @@ qemuDomainScreenshot(virDomainPtr dom, } } - if (!(tmp = g_strdup_printf("%s/qemu.screendump.XXXXXX", cfg->cacheDir))) - goto endjob; + tmp = g_strdup_printf("%s/qemu.screendump.XXXXXX", cfg->cacheDir); if ((tmp_fd = g_mkstemp_full(tmp, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR)) == -1) { virReportSystemError(errno, _("g_mkstemp(\"%s\") failed"), tmp); @@ -5296,8 +5270,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver, bool threadAdded = false; bool objectAdded = false; - if (!(alias = g_strdup_printf("iothread%u", iothread_id))) - return -1; + alias = g_strdup_printf("iothread%u", iothread_id); if (qemuMonitorCreateObjectProps(&props, "iothread", alias, NULL) < 0) goto cleanup; @@ -5429,8 +5402,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriver *driver, int new_niothreads = 0; qemuMonitorIOThreadInfo **new_iothreads = NULL; - if (!(alias = g_strdup_printf("iothread%u", iothread_id))) - return -1; + alias = g_strdup_printf("iothread%u", iothread_id); qemuDomainObjEnterMonitor(driver, vm); @@ -10716,8 +10688,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (!(tmp = g_strdup_printf("%s/qemu.mem.XXXXXX", cfg->cacheDir))) - goto endjob; + tmp = g_strdup_printf("%s/qemu.mem.XXXXXX", cfg->cacheDir); /* Create a temporary filename. */ if ((fd = g_mkstemp_full(tmp, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR)) == -1) { -- 2.31.1

2 2

[PATCH 0/1] qemu: add virtio-blk queue-size option
by Hiroki Narukawa 06 Sep '21

06 Sep '21

Hello, The option "queue-size" in virtio-blk was added in qemu-2.12.0, and default value increased from qemu-5.0.0. However, increasing this value may lead to drop of random access performance. This is configurable value, so we want to use it via libvirt. Sorry, my previous e-mail had wrong CC address that is rejected, please reply to this message and not previous one. Could you review this patch? Hiroki Narukawa (1): qemu: add virtio-blk queue-size option docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 6 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 5 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_validate.c | 7 ++++ .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../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.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../disk-virtio-queue-size.args | 29 +++++++++++++++ .../disk-virtio-queue-size.xml | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../disk-virtio-queue-size.xml | 35 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 47 files changed, 165 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-queue-size.xml -- 2.17.1

2 3

[PATCH 2/2] qemu: support for virtio-blk-pci discard options
by yuxiating 06 Sep '21

06 Sep '21

DISCARD and WRITE_ZEROES features for machine type >= 4.0 is enabled by default since commit 5c81161f804144b146607f890e84613a4cbad95c virtio-blk: add "discard" and "write-zeroes" properties Sometimes guestos has bugs DISCARD need to be disabled. Signed-off-by: yuxiating <yuxiating(a)huawei.com> --- src/conf/domain_conf.c | 15 +++++++++++++++ src/conf/domain_conf.h | 9 +++++++++ src/conf/domain_validate.c | 6 ++++++ src/libvirt_private.syms | 3 ++- src/qemu/qemu_command.c | 11 +++++++++++ 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6127513117..bfe4721e60 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1278,6 +1278,13 @@ VIR_ENUM_IMPL(virDomainDiskDiscard, "ignore", ); +VIR_ENUM_IMPL(virDomainDiskDiscardEnable, + VIR_DOMAIN_DISK_DISCARD_ENABLE_LAST, + "default", + "off", + "on", +); + VIR_ENUM_IMPL(virDomainDiskDetectZeroes, VIR_DOMAIN_DISK_DETECT_ZEROES_LAST, "default", @@ -8930,6 +8937,10 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def, if (virXMLPropUInt(cur, "queues", 10, VIR_XML_PROP_NONE, &def->queues) < 0) return -1; + if (virXMLPropEnum(cur, "discard_enable", virDomainDiskDiscardEnableTypeFromString, + VIR_XML_PROP_NONZERO, &def->discard_enable) < 0) + return -1; + return 0; } @@ -23416,6 +23427,10 @@ virDomainDiskDefFormatDriver(virBuffer *buf, if (disk->queues) virBufferAsprintf(&attrBuf, " queues='%u'", disk->queues); + if (disk->discard_enable) + virBufferAsprintf(&attrBuf, " discard_enable='%s'", + virDomainDiskDiscardEnableTypeToString(disk->discard_enable)); + virDomainVirtioOptionsFormat(&attrBuf, disk->virtio); if (disk->src->metadataCacheMaxSize > 0) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c7e6df7981..c39694a19e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -457,6 +457,13 @@ typedef enum { VIR_DOMAIN_DISK_DISCARD_LAST } virDomainDiskDiscard; +typedef enum { + VIR_DOMAIN_DISK_DISCARD_ENABLE_DEFAULT = 0, + VIR_DOMAIN_DISK_DISCARD_ENABLE_OFF, + VIR_DOMAIN_DISK_DISCARD_ENABLE_ON, + VIR_DOMAIN_DISK_DISCARD_ENABLE_LAST +} virDomainDiskDiscardEnable; + typedef enum { VIR_DOMAIN_DISK_DETECT_ZEROES_DEFAULT = 0, VIR_DOMAIN_DISK_DETECT_ZEROES_OFF, @@ -589,6 +596,7 @@ struct _virDomainDiskDef { bool diskElementAuth; bool diskElementEnc; + virDomainDiskDiscardEnable discard_enable; }; @@ -3838,6 +3846,7 @@ VIR_ENUM_DECL(virDomainDiskIo); VIR_ENUM_DECL(virDomainDeviceSGIO); VIR_ENUM_DECL(virDomainDiskTray); VIR_ENUM_DECL(virDomainDiskDiscard); +VIR_ENUM_DECL(virDomainDiskDiscardEnable); VIR_ENUM_DECL(virDomainDiskDetectZeroes); VIR_ENUM_DECL(virDomainDiskModel); VIR_ENUM_DECL(virDomainDiskMirrorState); diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 60f7ccdddd..6eb346916a 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -612,6 +612,12 @@ virDomainDiskDefValidate(const virDomainDef *def, return -1; } + if (disk->discard_enable) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("discard_enable attribute in disk driver element is only supported by virtio-blk")); + return -1; + } + if (disk->event_idx != VIR_TRISTATE_SWITCH_ABSENT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk event_idx mode supported only for virtio bus")); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ab8a6c00c3..52a74dd2d5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1,5 +1,5 @@ -# # General private symbols. Add symbols here, and see src/meson.build for +# mainDiskDeviceTypeToString # more details. # # Keep this file sorted by header name, then by symbols with each header. @@ -377,6 +377,7 @@ virDomainDiskDefParseSource; virDomainDiskDetectZeroesTypeFromString; virDomainDiskDetectZeroesTypeToString; virDomainDiskDeviceTypeToString; +virDomainDiskDiscardEnableTypeToString; virDomainDiskDiscardTypeToString; virDomainDiskEmptySource; virDomainDiskErrorPolicyTypeFromString; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b230314f7f..894c8b17b9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1739,6 +1739,17 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAsprintf(&opt, ",num-queues=%u", disk->queues); } + if (disk->discard_enable) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_DISCARD)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio-blk discard property isn't supported by this " + "QEMU binary")); + return NULL; + } + virBufferAsprintf(&opt, ",discard=%s", + virDomainDiskDiscardEnableTypeToString(disk->discard_enable)); + } + qemuBuildVirtioOptionsStr(&opt, disk->virtio); if (qemuBuildDeviceAddressStr(&opt, def, &disk->info) < 0) -- 2.27.0

2 1