- Devel - libvirt List Archives

[PATCH v2 0/2] Support Link non uplink representors to PCI device
by Moshe Levi 26 Jan '21

26 Jan '21

Kernel 5.8 link VF representors to their parent PCI device similar to existing uplink representor netdevice [1]. This patch update the virPCIGetNetName to support kernel describe above. Updates in V2 per of Laine's comments 1. split v1 patch to 2 patches. first patch for the new util method 2. remove the regex argument. 3. explain that with phys_port_name, there is only a single netdev on the PCI device that can possibly be the PF. [1] - https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/ ?id=123f0f53dd64b67e34142485fe866a8a581f12f1 Dmytro Linkin (1): util: Add phys_port_name support on virPCIGetNetName Moshe Levi (1): util: add virNetDevGetPhysPortName src/util/virnetdev.c | 67 ++++++++++++++++++++++++++++++++++++-------- src/util/virnetdev.h | 4 +++ src/util/virpci.c | 38 ++++++++++++++++++++++++- src/util/virpci.h | 5 ++++ 4 files changed, 101 insertions(+), 13 deletions(-) -- 2.30.0

2 6

[RFC PATCH 0/7] To make <transient/> disk sharable
by Masayoshi Mizuma 25 Jan '21

25 Jan '21

From: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> This patch series is RFC to implement to make <transient/> disk sharable. Currently, <transient/> disk option for qemu uses blockdev-snapshot QMP command with overlay. In that case, qemu holds the write lock to the original disk, so we cannot share the original disks with the other qemu guests. This patch series tries to implement to make the disks, which have <transient/> disk option, sharable by using disk hot-plug. First, create the overlay disk with the original disk is set as the backingStore. Then, blockdev-del the StorageProgs and FormatProgs of the disk. That's because to fix the bootindex of the disk. Lastly, device_add the disks and CPUs start. The sharable transient disk has the same limitation as the current <transient/> disk option, and also has the following limitations: - qemu needs to have hotplug feature - All the disk bus is virtio Masayoshi Mizuma (7): qemu_hotplug: Add asynJob argument to qemuDomainAttachDiskGeneric qemu_hotplug: Add asyncJob argument to qemuDomainAttachDeviceDiskLiveInternal qemu_hotplug: Add asynJob argument to qemuDomainRemoveDiskDevice qemu_hotplug: Add bootindex argument to qemuDomainAttachDiskGeneric qemu_hotplug: make <transient/> disk sharable qemu: Add check whether the transient disks are sharable qemu: Add virtio disks as sharable transient disks src/qemu/qemu_command.c | 20 ++- src/qemu/qemu_domain.h | 3 + src/qemu/qemu_hotplug.c | 322 ++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.h | 3 + src/qemu/qemu_process.c | 38 ++++- 5 files changed, 368 insertions(+), 18 deletions(-) -- 2.27.0

3 16

[libvirt PATCH 0/2] meson: Fix cross-building of dtrace probes
by Andrea Bolognani 25 Jan '21

25 Jan '21

We didn't spot this issue before simply because we're not installing dtrace in the cross-building environments. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/244473178 libvirt-ci MR: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/82 Andrea Bolognani (1): ci: Refresh dockerfiles Helmut Grohne (1): meson: Fix cross-building of dtrace probes ci/containers/ci-centos-7.Dockerfile | 2 +- ci/containers/ci-centos-8.Dockerfile | 2 +- ci/containers/ci-centos-stream.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-aarch64.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-armv6l.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-armv7l.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-i686.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-mips.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-mips64el.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-mipsel.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-ppc64le.Dockerfile | 3 ++- ci/containers/ci-debian-10-cross-s390x.Dockerfile | 3 ++- ci/containers/ci-debian-10.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-aarch64.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-armv6l.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-armv7l.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-i686.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-mips64el.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-mipsel.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile | 3 ++- ci/containers/ci-debian-sid-cross-s390x.Dockerfile | 3 ++- ci/containers/ci-debian-sid.Dockerfile | 2 +- ci/containers/ci-fedora-32.Dockerfile | 2 +- ci/containers/ci-fedora-33.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide.Dockerfile | 2 +- ci/containers/ci-opensuse-152.Dockerfile | 2 +- ci/containers/ci-ubuntu-1804.Dockerfile | 2 +- ci/containers/ci-ubuntu-2004.Dockerfile | 2 +- meson.build | 1 + src/meson.build | 4 ++-- src/qemu/meson.build | 4 ++-- 33 files changed, 52 insertions(+), 34 deletions(-) -- 2.26.2

2 4

[PATCH] Fix format network dns doc
by Cédric Bosdonnat 25 Jan '21

25 Jan '21

The code block on the srv name in the formatnetwork page is confusing since the actual parameter is service. Moving the code block to the service work makes it better. --- docs/formatnetwork.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index f5a48d9b92..06ac63eeb5 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -1035,7 +1035,7 @@ <dd>The <code>dns</code> element can have also 0 or more <code>srv</code> record elements. Each <code>srv</code> record element defines a DNS SRV record and has 2 mandatory and 5 optional attributes. The mandatory attributes - are service <code>name</code> and <code>protocol</code> (tcp, udp) + are <code>service</code> name and <code>protocol</code> (tcp, udp) and the optional attributes are <code>target</code>, <code>port</code>, <code>priority</code>, <code>weight</code> and <code>domain</code> as defined in DNS server SRV RFC (RFC 2782). -- 2.29.2

2 1

[PATCH] spec: Increase meson test timeout 10x
by Cole Robinson 25 Jan '21

25 Jan '21

Tests time out when building in slow environments, like emulated s390x in Fedora copr. Bump up the test timeout Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0a8b0ebad4..1731aa8bd9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1288,7 +1288,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ %endif %check -VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check +# Building on slow archs, like emulated s390x in Fedora copr, requires +# raising the test timeout +VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10 %post libs %if 0%{?rhel} == 7 -- 2.29.2

5 5

[PATCH v4 0/7] migration/dirtyrate: Introduce APIs for getting domain memory dirty rate
by Hao Wang 25 Jan '21

25 Jan '21

V3 -> V4: define flags to unsigned int fix some compile warnings V2 -> V3: reorganize patchset to fix compile warning V1 -> V2: replace QEMU_JOB_ASYNC with QEMU_JOB_QUERY Sometimes domain's memory dirty rate is expected by user in order to decide whether it's proper to be migrated out or not. We have already completed the QEMU part of the capability: https://patchew.org/QEMU/1600237327-33618-1-git-send-email-zhengchuan@huawe… And this serial of patches introduce the corresponding LIBVIRT part -- DomainGetDirtyRateInfo API and corresponding virsh api -- "getdirtyrate". instructions: bash# virsh getdirtyrate --help NAME getdirtyrate - Get a vm's memory dirty rate SYNOPSIS getdirtyrate <domain> [--seconds <number>] [--calculate] [--query] DESCRIPTION Get memory dirty rate of a domain in order to decide whether it's proper to be migrated out or not. OPTIONS [--domain] <string> domain name, id or uuid --seconds <number> calculate memory dirty rate within specified seconds, a valid range of values is [1, 60], and would default to 1s. --calculate calculate dirty rate only, can be used together with --query, either or both is expected, otherwise would default to both. --query query dirty rate only, can be used together with --calculate, either or both is expected, otherwise would default to both. example: bash# virsh getdirtyrate --calculate --query --domain vm0 --seconds 1 status: measured startTime: 820148 calcTime: 1 s dirtyRate: 6 MB/s *** BLURB HERE *** Hao Wang (7): migration/dirtyrate: Introduce virDomainDirtyRateInfo structure migration/dirtyrate: set up framwork of domainGetDirtyRateInfo API migration/dirtyrate: Implement qemuDomainCalculateDirtyRate migration/dirtyrate: Implement qemuDomainQueryDirtyRate migration/dirtyrate: Implement qemuMonitorJSONExtractDirtyRateInfo migration/dirtyrate: Implement qemuDomainGetDirtyRateInfo migration/dirtyrate: Introduce getdirtyrate virsh api include/libvirt/libvirt-domain.h | 57 ++++++++++++++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 46 +++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 68 +++++++++++++++++++ src/qemu/qemu_migration.c | 59 ++++++++++++++++ src/qemu/qemu_migration.h | 10 +++ src/qemu/qemu_monitor.c | 24 +++++++ src/qemu/qemu_monitor.h | 8 +++ src/qemu/qemu_monitor_json.c | 97 ++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 +++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 21 +++++- tools/virsh-domain.c | 112 +++++++++++++++++++++++++++++++ 14 files changed, 522 insertions(+), 1 deletion(-) -- 2.23.0

4 25

[PATCH 1/2] qemu: introduce locking option for disk source of qemu
by Masayoshi Mizuma 25 Jan '21

25 Jan '21

From: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> Introduce locking option for disk source of qemu. It may be useful to avoid file lock issues. locking option supports three switches; 'auto', 'on' and 'off'. The default behaivor will work if locking option isn't set. Example of the usage: <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/tmp/QEMUGuest1.img' locking='off'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> Signed-off-by: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> --- docs/schemas/domaincommon.rng | 9 +++++++++ src/conf/domain_conf.c | 8 ++++++++ src/conf/storage_source_conf.c | 9 +++++++++ src/conf/storage_source_conf.h | 14 ++++++++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 5 +++++ 6 files changed, 46 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a4bddcf132..d33d853f31 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1676,6 +1676,15 @@ <ref name="devSeclabel"/> </zeroOrMore> </interleave> + <optional> + <attribute name="locking"> + <choice> + <value>auto</value> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> </element> </optional> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index dab4f10326..067ffa877b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8540,6 +8540,7 @@ virDomainStorageSourceParse(xmlNodePtr node, { VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr tmp; + char *locking; ctxt->node = node; @@ -8606,6 +8607,9 @@ virDomainStorageSourceParse(xmlNodePtr node, return -1; } + if ((locking = virXMLPropString(node, "locking"))) + src->locking = virStorageFileLockingTypeFromString(locking); + return 0; } @@ -24102,6 +24106,10 @@ virDomainDiskSourceFormat(virBufferPtr buf, return -1; } + if (src->locking != VIR_STORAGE_FILE_LOCKING_DEFAULT) + virBufferEscapeString(&attrBuf, " locking='%s'", + virStorageFileLockingTypeToString(src->locking)); + virDomainDiskSourceFormatSlices(&childBuf, src); if (src->type != VIR_STORAGE_TYPE_NETWORK) diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index dab5e855f5..3ac0c7f75b 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -49,6 +49,15 @@ VIR_ENUM_IMPL(virStorage, ); +VIR_ENUM_IMPL(virStorageFileLocking, + VIR_STORAGE_FILE_LOCKING_LAST, + "default", + "auto", + "on", + "off", +); + + VIR_ENUM_IMPL(virStorageFileFormat, VIR_STORAGE_FILE_LAST, "none", diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index e66ccdedef..6f5b165504 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -82,6 +82,18 @@ typedef enum { VIR_ENUM_DECL(virStorageFileFormat); +typedef enum { + VIR_STORAGE_FILE_LOCKING_DEFAULT = 0, + VIR_STORAGE_FILE_LOCKING_AUTO, + VIR_STORAGE_FILE_LOCKING_ON, + VIR_STORAGE_FILE_LOCKING_OFF, + + VIR_STORAGE_FILE_LOCKING_LAST, +} virStorageFileLocking; + +VIR_ENUM_DECL(virStorageFileLocking); + + typedef enum { VIR_STORAGE_FILE_FEATURE_LAZY_REFCOUNTS = 0, @@ -394,6 +406,8 @@ struct _virStorageSource { char *nfs_group; uid_t nfs_uid; gid_t nfs_gid; + + int locking; /* enum virStorageFileLocking */ }; G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageSource, virObjectUnref); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fbaf16704b..c72d2161b2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1068,6 +1068,7 @@ virStorageFileFeatureTypeFromString; virStorageFileFeatureTypeToString; virStorageFileFormatTypeFromString; virStorageFileFormatTypeToString; +virStorageFileLockingTypeToString; virStorageNetHostDefClear; virStorageNetHostDefCopy; virStorageNetHostDefFree; diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index d845a3312d..d7eec16ab6 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1015,6 +1015,7 @@ qemuBlockStorageSourceGetFileProps(virStorageSourcePtr src, { const char *iomode = NULL; const char *prManagerAlias = NULL; + const char *locking = NULL; virJSONValuePtr ret = NULL; if (!onlytarget) { @@ -1023,12 +1024,16 @@ qemuBlockStorageSourceGetFileProps(virStorageSourcePtr src, if (src->iomode != VIR_DOMAIN_DISK_IO_DEFAULT) iomode = virDomainDiskIoTypeToString(src->iomode); + + if (src->locking != VIR_STORAGE_FILE_LOCKING_DEFAULT) + locking = virStorageFileLockingTypeToString(src->locking); } ignore_value(virJSONValueObjectCreate(&ret, "s:filename", src->path, "S:aio", iomode, "S:pr-manager", prManagerAlias, + "S:locking", locking, NULL) < 0); return ret; } -- 2.27.0

3 4

[PATCH 0/2] specify the accelerator type using "-accel" parameter
by huangy81＠chinatelecom.cn 25 Jan '21

25 Jan '21

From: Hyman <huangy81(a)chinatelecom.cn> This patchset aims to support dirty ring feature which has been introduced in kernel: https://lore.kernel.org/lkml/8b3f68dd-c61c-16a0-2077-0a5d3d57a357@redhat.co… The QEMU patchset is also being applied for merge, the review may be under the way: https://lore.kernel.org/qemu-devel/20210108164601.406146-1-peterx@redhat.co… Since QEMU enable the dirty ring feature by specifying the "-accel" sub-parameter. Libvirt use "-machine accel=xxx" option to specify the type of accelerator by default, which is conflict with QEMU. Either the Libvirt or QEMU may compromise, According to the Paolo Bonzini's patient and prompt explanation: https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@red… We'd like to have Libvirt switch to "-accel xxx" instead, cause the "-machine" options for accelerator are legacy and now there is a better mechanism. This two patches are kind of standalone so maybe it cound be merged in advance anyway. And the dirty-ring-support patch is reviewed under the way. Once the QEMU patchset is merged, i'll ping the libvir-list and apply for merge the remainding patch. The following are details: https://www.redhat.com/archives/libvir-list/2021-January/msg00660.html The 2 patches do the following things: 1. introduce QEMU_CAPS_ACCEL so the the next patch can use it to choose the right option when specifying the accelerator type. 2. switch the option "-machine accel=xxx" to "-accel xxx" when specifying accelerator type once libvirt build QEMU command line, so that the next patch can build QEMU command line for accelerator type using "-accel xxx" directly. Please review, Thanks! Best Regards ! Hyman (2): qemu_capabilities: Introduce QEMU_CAPS_ACCEL qemu: use "-accel" option to specify accelerator instead of "-machine" src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 131 ++++++++++++++---- .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../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 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- ...arch64-os-firmware-efi.aarch64-latest.args | 3 +- .../aarch64-virt-graphics.aarch64-latest.args | 3 +- .../aarch64-virt-headless.aarch64-latest.args | 3 +- .../blkdeviotune-group-num.x86_64-4.1.0.args | 3 +- .../blkdeviotune-group-num.x86_64-latest.args | 3 +- .../blkdeviotune-max-length.x86_64-4.1.0.args | 3 +- ...blkdeviotune-max-length.x86_64-latest.args | 3 +- .../blkdeviotune-max.x86_64-4.1.0.args | 3 +- .../blkdeviotune-max.x86_64-latest.args | 3 +- .../channel-unix-guestfwd.x86_64-latest.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- .../console-virtio-unix.x86_64-latest.args | 3 +- .../controller-virtio-scsi.x86_64-latest.args | 3 +- ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 3 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 3 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-latest.args | 3 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 3 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 3 +- .../cputune-cpuset-big-id.x86_64-latest.args | 3 +- ...ult-video-type-aarch64.aarch64-latest.args | 3 +- ...default-video-type-ppc64.ppc64-latest.args | 3 +- ...ult-video-type-riscv64.riscv64-latest.args | 3 +- ...default-video-type-s390x.s390x-latest.args | 3 +- .../disk-aio-io_uring.x86_64-latest.args | 3 +- .../disk-aio.x86_64-2.12.0.args | 3 +- .../disk-aio.x86_64-latest.args | 3 +- .../disk-arm-virtio-sd.aarch64-4.0.0.args | 3 +- .../disk-arm-virtio-sd.aarch64-latest.args | 3 +- ...-backing-chains-noindex.x86_64-2.12.0.args | 3 +- ...-backing-chains-noindex.x86_64-latest.args | 3 +- .../disk-cache.x86_64-2.12.0.args | 3 +- .../disk-cache.x86_64-latest.args | 3 +- .../disk-cdrom-bus-other.x86_64-latest.args | 3 +- ...m-empty-network-invalid.x86_64-latest.args | 3 +- .../disk-cdrom-network.x86_64-2.12.0.args | 3 +- .../disk-cdrom-network.x86_64-latest.args | 3 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 3 +- .../disk-cdrom-tray.x86_64-latest.args | 3 +- .../disk-cdrom.x86_64-2.12.0.args | 3 +- .../disk-cdrom.x86_64-latest.args | 3 +- .../disk-copy_on_read.x86_64-2.12.0.args | 3 +- .../disk-copy_on_read.x86_64-latest.args | 3 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 3 +- .../disk-detect-zeroes.x86_64-latest.args | 3 +- .../disk-discard.x86_64-4.1.0.args | 3 +- .../disk-discard.x86_64-latest.args | 3 +- .../disk-error-policy-s390x.s390x-2.12.0.args | 3 +- .../disk-error-policy-s390x.s390x-latest.args | 3 +- .../disk-error-policy.x86_64-2.12.0.args | 3 +- .../disk-error-policy.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_11.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 3 +- .../disk-floppy.x86_64-2.12.0.args | 3 +- .../disk-floppy.x86_64-latest.args | 3 +- .../disk-metadata-cache.x86_64-latest.args | 3 +- .../disk-network-gluster.x86_64-2.12.0.args | 3 +- .../disk-network-gluster.x86_64-latest.args | 3 +- .../disk-network-http.x86_64-latest.args | 3 +- .../disk-network-iscsi.x86_64-2.12.0.args | 3 +- .../disk-network-iscsi.x86_64-latest.args | 3 +- .../disk-network-nbd.x86_64-2.12.0.args | 3 +- .../disk-network-nbd.x86_64-latest.args | 3 +- .../disk-network-nfs.x86_64-latest.args | 3 +- .../disk-network-rbd.x86_64-2.12.0.args | 3 +- .../disk-network-rbd.x86_64-latest.args | 3 +- .../disk-network-sheepdog.x86_64-2.12.0.args | 3 +- .../disk-network-sheepdog.x86_64-latest.args | 3 +- ...isk-network-source-auth.x86_64-2.12.0.args | 3 +- ...isk-network-source-auth.x86_64-latest.args | 3 +- ...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 3 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 3 +- ...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 3 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 3 +- .../disk-network-tlsx509.x86_64-2.12.0.args | 3 +- .../disk-network-tlsx509.x86_64-latest.args | 3 +- .../disk-nvme.x86_64-latest.args | 3 +- .../disk-readonly-disk.x86_64-2.12.0.args | 3 +- .../disk-readonly-disk.x86_64-latest.args | 3 +- .../disk-scsi-device-auto.x86_64-latest.args | 3 +- .../disk-scsi.x86_64-latest.args | 3 +- .../disk-shared.x86_64-2.12.0.args | 3 +- .../disk-shared.x86_64-latest.args | 3 +- .../disk-slices.x86_64-latest.args | 3 +- .../disk-transient.x86_64-latest.args | 3 +- ...irtio-scsi-reservations.x86_64-2.12.0.args | 3 +- ...irtio-scsi-reservations.x86_64-latest.args | 3 +- .../eoi-disabled.x86_64-4.0.0.args | 3 +- .../eoi-disabled.x86_64-latest.args | 3 +- .../eoi-enabled.x86_64-4.0.0.args | 3 +- .../eoi-enabled.x86_64-latest.args | 3 +- .../fips-enabled.x86_64-5.1.0.args | 3 +- .../fips-enabled.x86_64-latest.args | 3 +- .../floppy-drive-fat.x86_64-2.12.0.args | 3 +- .../floppy-drive-fat.x86_64-latest.args | 3 +- .../fs9p-ccw.s390x-latest.args | 3 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 3 +- .../genid-auto.x86_64-latest.args | 3 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 3 +- ...egl-headless-rendernode.x86_64-latest.args | 3 +- .../graphics-egl-headless.x86_64-latest.args | 3 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 3 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 3 +- .../graphics-vnc-tls.x86_64-latest.args | 3 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 3 +- ...play-spice-egl-headless.x86_64-latest.args | 3 +- ...ev-display-spice-opengl.x86_64-latest.args | 3 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 3 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 3 +- .../hostdev-scsi-lsi.x86_64-4.1.0.args | 3 +- .../hostdev-scsi-lsi.x86_64-latest.args | 3 +- ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 3 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 3 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 3 +- .../hugepages-memaccess3.x86_64-latest.args | 3 +- .../hugepages-nvdimm.x86_64-latest.args | 3 +- .../hyperv-off.x86_64-4.0.0.args | 3 +- .../hyperv-off.x86_64-latest.args | 3 +- .../hyperv-panic.x86_64-4.0.0.args | 3 +- .../hyperv-panic.x86_64-latest.args | 3 +- .../hyperv-stimer-direct.x86_64-latest.args | 3 +- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 3 +- .../hyperv.x86_64-latest.args | 3 +- .../intel-iommu-aw-bits.x86_64-latest.args | 3 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 3 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 3 +- .../intel-iommu-eim.x86_64-latest.args | 3 +- .../intel-iommu.x86_64-latest.args | 3 +- .../iommu-smmuv3.aarch64-latest.args | 3 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 3 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 3 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 3 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 3 +- ...v-missing-platform-info.x86_64-2.12.0.args | 3 +- .../launch-security-sev.x86_64-2.12.0.args | 3 +- ...luks-disks-source-qcow2.x86_64-latest.args | 3 +- ...memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 3 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 3 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 3 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 3 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 3 +- .../mlock-off.x86_64-3.0.0.args | 3 +- .../mlock-off.x86_64-latest.args | 3 +- .../mlock-on.x86_64-3.0.0.args | 3 +- .../mlock-on.x86_64-latest.args | 3 +- .../net-user.x86_64-4.0.0.args | 3 +- .../net-vdpa.x86_64-latest.args | 3 +- .../net-vhostuser.x86_64-latest.args | 3 +- .../numatune-hmat.x86_64-latest.args | 3 +- .../os-firmware-bios.x86_64-latest.args | 3 +- ...os-firmware-efi-secboot.x86_64-latest.args | 3 +- .../os-firmware-efi.x86_64-latest.args | 3 +- .../parallel-unix-chardev.x86_64-latest.args | 3 +- ...cie-root-port-nohotplug.x86_64-latest.args | 3 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 3 +- .../ppc64-pseries-graphics.ppc64-latest.args | 3 +- .../ppc64-pseries-headless.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 3 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-disabled.x86_64-latest.args | 3 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-enabled.x86_64-latest.args | 3 +- .../qemu-ns.x86_64-4.0.0.args | 3 +- .../qemu-ns.x86_64-latest.args | 3 +- .../riscv64-virt-graphics.riscv64-latest.args | 3 +- .../riscv64-virt-headless.riscv64-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 3 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 3 +- .../s390x-ccw-headless.s390x-latest.args | 3 +- .../serial-unix-chardev.x86_64-latest.args | 3 +- ...rtcard-passthrough-unix.x86_64-latest.args | 3 +- .../tpm-emulator-spapr.ppc64-latest.args | 3 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 3 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 3 +- .../tpm-emulator-tpm2.x86_64-latest.args | 3 +- .../tpm-emulator.x86_64-latest.args | 3 +- .../tpm-passthrough-crb.x86_64-latest.args | 3 +- .../tpm-passthrough.x86_64-latest.args | 3 +- .../tseg-explicit-size.x86_64-latest.args | 3 +- .../usb-redir-unix.x86_64-latest.args | 3 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 3 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 3 +- ...host-user-gpu-secondary.x86_64-latest.args | 3 +- .../vhost-user-vga.x86_64-latest.args | 3 +- .../vhost-vsock-auto.x86_64-latest.args | 3 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 3 +- .../vhost-vsock-ccw.s390x-latest.args | 3 +- .../vhost-vsock.x86_64-latest.args | 3 +- ...eo-bochs-display-device.x86_64-latest.args | 3 +- ...video-qxl-device-vram64.x86_64-latest.args | 3 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 3 +- ...eo-ramfb-display-device.x86_64-latest.args | 3 +- .../virtio-9p-createmode.x86_64-latest.args | 3 +- .../virtio-9p-multidevs.x86_64-latest.args | 3 +- .../virtio-non-transitional.x86_64-3.1.0.args | 3 +- ...virtio-non-transitional.x86_64-latest.args | 3 +- ...-options-controller-ats.x86_64-latest.args | 3 +- ...ptions-controller-iommu.x86_64-latest.args | 3 +- ...tions-controller-packed.x86_64-latest.args | 3 +- ...virtio-options-disk-ats.x86_64-latest.args | 3 +- ...rtio-options-disk-iommu.x86_64-latest.args | 3 +- ...tio-options-disk-packed.x86_64-latest.args | 3 +- .../virtio-options-fs-ats.x86_64-latest.args | 3 +- ...virtio-options-fs-iommu.x86_64-latest.args | 3 +- ...irtio-options-fs-packed.x86_64-latest.args | 3 +- ...irtio-options-input-ats.x86_64-latest.args | 3 +- ...tio-options-input-iommu.x86_64-latest.args | 3 +- ...io-options-input-packed.x86_64-latest.args | 3 +- ...-options-memballoon-ats.x86_64-latest.args | 3 +- ...loon-freepage-reporting.x86_64-latest.args | 3 +- ...ptions-memballoon-iommu.x86_64-latest.args | 3 +- ...tions-memballoon-packed.x86_64-latest.args | 3 +- .../virtio-options-net-ats.x86_64-latest.args | 3 +- ...irtio-options-net-iommu.x86_64-latest.args | 3 +- ...rtio-options-net-packed.x86_64-latest.args | 3 +- .../virtio-options-rng-ats.x86_64-latest.args | 3 +- ...irtio-options-rng-iommu.x86_64-latest.args | 3 +- ...rtio-options-rng-packed.x86_64-latest.args | 3 +- ...irtio-options-video-ats.x86_64-latest.args | 3 +- ...tio-options-video-iommu.x86_64-latest.args | 3 +- ...io-options-video-packed.x86_64-latest.args | 3 +- .../virtio-options.x86_64-latest.args | 3 +- .../virtio-rng-builtin.x86_64-latest.args | 3 +- .../virtio-rng-egd-unix.x86_64-latest.args | 3 +- .../virtio-transitional.x86_64-3.1.0.args | 3 +- .../virtio-transitional.x86_64-latest.args | 3 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 3 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 3 +- .../x86_64-pc-graphics.x86_64-latest.args | 3 +- .../x86_64-pc-headless.x86_64-latest.args | 3 +- .../x86_64-q35-graphics.x86_64-latest.args | 3 +- .../x86_64-q35-headless.x86_64-latest.args | 3 +- 298 files changed, 653 insertions(+), 282 deletions(-) -- 2.24.3

2 2

[libvirt PATCH] cpu_map: Remove intel-pt from x86 CPU models
by Jiri Denemark 25 Jan '21

25 Jan '21

As explained in QEMU commit 4c257911dcc7c4189768e9651755c849ce9db4e8 intel-pt features should never be included in the CPU models as it was not supported by KVM back then and even once it started to be supported, users have to enable it by passing pt_mode=1 parameter to kvm_intel module. The Icelake-* CPU models with intel-pt included were added to QEMU 3.1.0 and removed right in the following 4.0.0 release (and even in 3.1.1 maintenance release). In libvirt 6.10.0 I introduced 'removed' attribute for features included in our CPU model definitions which we can use to drop intel-pt from Icelake-* CPU models. Back then I explained we can safely do so only for features which could never be enabled, which is not the case of intel-pt. Theoretically, it could be possible to create an environment in which QEMU would enable intel-pt without asking for it explicitly: it would need to use a new enough kernel (not available at the time of QEMU 3.1.0) and pt_mode KVM parameter in combination with QEMU 3.1.0 running a domain with q35 machine type and all that on a CPU which didn't really exist at that time. Migrating such domain to a host with newer SW stack including libvirt with this patch applied would result in incompatible guest ABI (the virtual CPU would lose intel-pt). However, QEMU changed its CPU models unconditionally and thus migration would not work even without this patch. That said, it is safe to follow QEMU and remove the feature from Icelake-* CPU models in our cpu_map. https://bugzilla.redhat.com/show_bug.cgi?id=1853972 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu_map/x86_Icelake-Client-noTSX.xml | 2 +- src/cpu_map/x86_Icelake-Client.xml | 2 +- src/cpu_map/x86_Icelake-Server-noTSX.xml | 2 +- src/cpu_map/x86_Icelake-Server.xml | 2 +- tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml | 1 + .../cpu-Icelake-Server-pconfig.x86_64-3.1.0.args | 2 +- .../cpu-Icelake-Server-pconfig.x86_64-latest.args | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/cpu_map/x86_Icelake-Client-noTSX.xml b/src/cpu_map/x86_Icelake-Client-noTSX.xml index 65e648ae21..217adba4f2 100644 --- a/src/cpu_map/x86_Icelake-Client-noTSX.xml +++ b/src/cpu_map/x86_Icelake-Client-noTSX.xml @@ -30,7 +30,7 @@ <feature name='fsgsbase'/> <feature name='fxsr'/> <feature name='gfni'/> - <feature name='intel-pt'/> + <feature name='intel-pt' removed='yes'/> <feature name='invpcid'/> <feature name='lahf_lm'/> <feature name='lm'/> diff --git a/src/cpu_map/x86_Icelake-Client.xml b/src/cpu_map/x86_Icelake-Client.xml index 5cf32e91fa..b725227f46 100644 --- a/src/cpu_map/x86_Icelake-Client.xml +++ b/src/cpu_map/x86_Icelake-Client.xml @@ -31,7 +31,7 @@ <feature name='fxsr'/> <feature name='gfni'/> <feature name='hle'/> - <feature name='intel-pt'/> + <feature name='intel-pt' removed='yes'/> <feature name='invpcid'/> <feature name='lahf_lm'/> <feature name='lm'/> diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml index 34a0f7c18c..7c9c32c977 100644 --- a/src/cpu_map/x86_Icelake-Server-noTSX.xml +++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml @@ -37,7 +37,7 @@ <feature name='fsgsbase'/> <feature name='fxsr'/> <feature name='gfni'/> - <feature name='intel-pt'/> + <feature name='intel-pt' removed='yes'/> <feature name='invpcid'/> <feature name='la57'/> <feature name='lahf_lm'/> diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml index 1ee4ea9cd4..b4685bead0 100644 --- a/src/cpu_map/x86_Icelake-Server.xml +++ b/src/cpu_map/x86_Icelake-Server.xml @@ -38,7 +38,7 @@ <feature name='fxsr'/> <feature name='gfni'/> <feature name='hle'/> - <feature name='intel-pt'/> + <feature name='intel-pt' removed='yes'/> <feature name='invpcid'/> <feature name='la57'/> <feature name='lahf_lm'/> diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml index 3a71b28cfb..7fcd20d26d 100644 --- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml @@ -21,6 +21,7 @@ <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='cmt'/> <feature policy='require' name='avx512ifma'/> + <feature policy='require' name='intel-pt'/> <feature policy='require' name='sha-ni'/> <feature policy='require' name='ospke'/> <feature policy='require' name='rdpid'/> diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml index 1582de0422..07e8f8bc24 100644 --- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml @@ -22,6 +22,7 @@ <feature name='tsc_adjust'/> <feature name='cmt'/> <feature name='avx512ifma'/> + <feature name='intel-pt'/> <feature name='sha-ni'/> <feature name='ospke'/> <feature name='rdpid'/> diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args index 96d4306238..b69bfe0f0f 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ -machine pc-i440fx-3.1,accel=kvm,usb=off,dump-guest-core=off \ --cpu Icelake-Server,pconfig=off \ +-cpu Icelake-Server,pconfig=off,intel-pt=off \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args index a512623af6..64f223bee3 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ -machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ --cpu Icelake-Server \ +-cpu Icelake-Server,intel-pt=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ -overcommit mem-lock=off \ -- 2.30.0

2 1

[libvirt PATCH] qemu: fix release of virDomainObjPtr in SSH key APIs
by Daniel P. Berrangé 25 Jan '21

25 Jan '21

The qemuDomainObjFromDomain() API must be paired with the virDomainObjEndAPI API. The qemuDomainAuthorizedSSHKeysGet method simply did 'return -1' leaking a reference in two paths. The qemuDomainAuthorizedSSHKeysSet method marked the object as an autoptr while also have some code paths that will call virDomainObjEndAPI, resulting in attempted double free. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 027617deef..05e021cce4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20254,10 +20254,10 @@ qemuDomainAuthorizedSSHKeysGet(virDomainPtr dom, return -1; if (virDomainAuthorizedSshKeysGetEnsureACL(dom->conn, vm->def) < 0) - return -1; + goto cleanup; if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0) - return -1; + goto cleanup; if (!qemuDomainAgentAvailable(vm, true)) goto endagentjob; @@ -20268,6 +20268,7 @@ qemuDomainAuthorizedSSHKeysGet(virDomainPtr dom, endagentjob: qemuDomainObjEndAgentJob(vm); + cleanup: virDomainObjEndAPI(&vm); return rv; } @@ -20281,7 +20282,7 @@ qemuDomainAuthorizedSSHKeysSet(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - g_autoptr(virDomainObj) vm = NULL; + virDomainObjPtr vm = NULL; qemuAgentPtr agent; const bool append = flags & VIR_DOMAIN_AUTHORIZED_SSH_KEYS_SET_APPEND; const bool remove = flags & VIR_DOMAIN_AUTHORIZED_SSH_KEYS_SET_REMOVE; @@ -20294,10 +20295,10 @@ qemuDomainAuthorizedSSHKeysSet(virDomainPtr dom, return -1; if (virDomainAuthorizedSshKeysSetEnsureACL(dom->conn, vm->def) < 0) - return -1; + goto cleanup; if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0) - return -1; + goto cleanup; if (!qemuDomainAgentAvailable(vm, true)) goto endagentjob; @@ -20311,6 +20312,7 @@ qemuDomainAuthorizedSSHKeysSet(virDomainPtr dom, endagentjob: qemuDomainObjEndAgentJob(vm); + cleanup: virDomainObjEndAPI(&vm); return rv; } -- 2.29.2

3 2