- Devel - libvirt List Archives

[PATCH] qemuMonitorFdsetsFree: Don't leak @set->fds
by Michal Privoznik 07 Jan '21

07 Jan '21

The @fds member of qemuMonitorFdsetInfo struct is an array and as such, it's allocated in qemuMonitorJSONQueryFdsetsParse() but not freed in qemuMonitorFdsetsFree(). Fixes: b8998cc670f7b1b11a83276050e49dce7efba333 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 40f2997cb6..abdd9d5240 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2708,6 +2708,8 @@ void qemuMonitorFdsetsFree(qemuMonitorFdsetsPtr fdsets) for (j = 0; j < set->nfds; j++) g_free(set->fds[j].opaque); + + g_free(set->fds); } g_free(fdsets->fdsets); g_free(fdsets); -- 2.26.2

2 1

[PATCH] src: fix resource leak introduced in d4439a6b8
by Nikolay Shirokovskiy 07 Jan '21

07 Jan '21

@tmp that was copied just above is leaked on plain return. The issue is found by Coverity. Patch that inroduced a leak: d4439a6b8 : src: adopt to VIR_DRV_SUPPORTS_FEATURE return -1 Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- 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 2f9081a..c9f8ffd 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3022,7 +3022,7 @@ virDomainMigrateVersion3Full(virDomainPtr domain, ret = VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION); if (ret < 0) - return NULL; + goto done; if (ret) protection = VIR_MIGRATE_CHANGE_PROTECTION; -- 1.8.3.1

2 1

[PATCH v3 0/4] handle error in feature testing
by Nikolay Shirokovskiy 07 Jan '21

07 Jan '21

Justification is in the last patch. Diff to v2 [1]: - instead of RFC where fix was applied only to virMigrate3 now all the places where VIR_DRV_SUPPORTS_FEATURE is used patched to handle errors [1] [RFC PATCH v2] fix error message in virMigrate3 if connection is broken https://www.redhat.com/archives/libvir-list/2020-September/msg01348.html Nikolay Shirokovskiy (4): src: adopt to VIR_DRV_SUPPORTS_FEATURE return -1 libxl: adopt to VIR_DRV_SUPPORTS_FEATURE return -1 qemu: adopt to VIR_DRV_SUPPORTS_FEATURE return -1 src: don't hide error in VIR_DRV_SUPPORTS_FEATURE src/driver.h | 9 +- src/libvirt-domain.c | 511 ++++++++++++++++++++++++++++++-------------- src/libvirt-host.c | 18 +- src/libvirt.c | 7 +- src/libxl/libxl_migration.c | 10 +- src/qemu/qemu_migration.c | 33 ++- 6 files changed, 396 insertions(+), 192 deletions(-) -- 1.8.3.1

4 13

[libvirt PATCH 00/17] split and cleanup virStorageSource code
by Pavel Hrdina 07 Jan '21

07 Jan '21

The series is a prerequisite for implementing vhost-user-blk-pci. I wanted to use already existing code to parse and format virDomainChrSourceDefPtr as the vhostuser <disk> source similarly like we do for <interface> but it was not possible because the virStorageSource definition was living in util directory where we don't allow including anything from conf directory. Pavel Hrdina (17): util: remove unused virStorageGenerateQcowPassphrase virstoragefile: remove unused virStorageFileChainCheckBroken util: move virQEMUBuildQemuImgKeySecretOpts into storage util: move virStorageFileGetLVMKey to locking util: move virStorageFileCheckCompat into conf virfile: refactor virFileNBDDeviceAssociate virstoragefile: move virStorageFileResize into virfile virstoragefile: move virStorageFileIsClusterFS into virfile virstoragefile: move virStorageIsFile into virfile virstoragefile: move virStorageIsRelative into virfile virstoragefile: change virStorageSource->drv to void pointer storage: move storage file sources to separate directory util: extract virStorageFile code into storage_file util: move virStorageFileBackend code into storage_file util: move virStorageSource code into conf util: move virStorageEncryption code into conf storage_file: use virStorageFile prefix for all functions po/POTFILES.in | 10 +- src/conf/backup_conf.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 6 +- src/conf/meson.build | 2 + src/conf/snapshot_conf.c | 2 +- src/conf/storage_conf.c | 25 +- src/conf/storage_conf.h | 4 +- .../storage_encryption.c} | 38 +- .../storage_encryption.h} | 4 +- src/conf/storage_source.c | 1316 +++++ src/conf/storage_source.h | 518 ++ src/driver.c | 1 + src/esx/esx_storage_backend_iscsi.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 2 +- src/libvirt_private.syms | 200 +- src/libxl/meson.build | 1 + src/libxl/xen_xl.c | 3 +- src/locking/lock_driver_lockd.c | 67 +- src/lxc/lxc_controller.c | 4 +- src/meson.build | 1 + src/qemu/meson.build | 1 + src/qemu/qemu_backup.c | 3 +- src/qemu/qemu_block.c | 3 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 19 +- src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_interop_config.c | 1 + src/qemu/qemu_migration.c | 4 +- src/qemu/qemu_process.c | 1 + src/qemu/qemu_process.h | 2 +- src/qemu/qemu_shim.c | 1 + src/qemu/qemu_snapshot.c | 3 +- src/storage/meson.build | 34 +- src/storage/parthelper.c | 1 + src/storage/storage_backend.c | 2 +- src/storage/storage_backend_gluster.c | 1 + src/storage/storage_util.c | 84 +- src/storage_file/meson.build | 60 + src/storage_file/storage_file.c | 3845 ++++++++++++ src/storage_file/storage_file.h | 197 + .../storage_file_backend.c} | 4 +- .../storage_file_backend.h} | 6 +- .../storage_file_fs.c | 23 +- .../storage_file_fs.h | 0 .../storage_file_gluster.c | 34 +- .../storage_file_gluster.h | 0 src/util/meson.build | 2 - src/util/virarptable.c | 1 + src/util/vircgroupv1.c | 1 + src/util/vircgroupv2devices.c | 1 + src/util/virfile.c | 101 +- src/util/virfile.h | 12 +- src/util/virpidfile.c | 1 + src/util/virqemu.c | 69 - src/util/virqemu.h | 6 - src/util/virresctrl.c | 1 + src/util/virstoragefile.c | 5222 +---------------- src/util/virstoragefile.h | 572 +- src/util/virsysinfo.c | 1 + src/util/virtpm.c | 1 + tests/meson.build | 4 +- tests/qemublocktest.c | 7 +- tests/virstoragetest.c | 9 +- tools/virsh-console.c | 1 + tools/virsh-util.c | 1 + 69 files changed, 6441 insertions(+), 6129 deletions(-) rename src/{util/virstorageencryption.c => conf/storage_encryption.c} (90%) rename src/{util/virstorageencryption.h => conf/storage_encryption.h} (96%) create mode 100644 src/conf/storage_source.c create mode 100644 src/conf/storage_source.h create mode 100644 src/storage_file/meson.build create mode 100644 src/storage_file/storage_file.c create mode 100644 src/storage_file/storage_file.h rename src/{util/virstoragefilebackend.c => storage_file/storage_file_backend.c} (97%) rename src/{util/virstoragefilebackend.h => storage_file/storage_file_backend.h} (93%) rename src/{storage => storage_file}/storage_file_fs.c (90%) rename src/{storage => storage_file}/storage_file_fs.h (100%) rename src/{storage => storage_file}/storage_file_gluster.c (89%) rename src/{storage => storage_file}/storage_file_gluster.h (100%) -- 2.28.0

2 32

[PATCH 00/12 RESEND] qemu: Preparation for 'object-add' qapification
by Peter Krempa 07 Jan '21

07 Jan '21

This is a resend of the patches from: https://www.redhat.com/archives/libvir-list/2020-November/msg01625.html which can be justified without the rest of the series. This series cleans up some monitor code and few related bits to testing. The reset of the series will be posted once there's progress on the qapification of object-add in qemu. Peter Krempa (12): qemuMonitorJSONSetMigrationParams: Take double pointer for @params qemuMonitorSetMigrationCapabilities: Take double pointer for @caps qemuMonitorJSONSetMigrationCapabilities: Refactor cleanup testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities: refactor cleanup qemuMonitorJSONAddObject: Take double pointer for @props qemuMonitorJSONMakeCommandInternal: Clear @arguments when stolen qemuMonitorAddObject: Fix semantics of @alias qemuMonitorAddObject: Refactor cleanup util: json: Replace virJSONValueObjectSteal by virJSONValueObjectRemoveKey tests: qemuxml2argv: Don't check whether -netdev was QAPIfied repeatedly qemuBuildChrChardevStr: Rename 'flags' to 'cdevflags' testCompareXMLToArgvValidateSchema: Populate autoNodeset src/qemu/qemu_command.c | 10 +++--- src/qemu/qemu_migration_params.c | 22 ++++-------- src/qemu/qemu_monitor.c | 45 +++++++++---------------- src/qemu/qemu_monitor.h | 4 +-- src/qemu/qemu_monitor_json.c | 57 ++++++++++++-------------------- src/qemu/qemu_monitor_json.h | 6 ++-- src/util/virjson.c | 29 +++------------- tests/qemumonitorjsontest.c | 26 +++++---------- tests/qemuxml2argvtest.c | 18 +++++++--- 9 files changed, 81 insertions(+), 136 deletions(-) -- 2.29.2

2 16

[PATCH 0/2] qemuDomainSetBlockIoTune: Fix for empty cdrom
by Peter Krempa 07 Jan '21

07 Jan '21

See 2/2 Peter Krempa (2): qemuDomainSetBlockIoTune: Remove old uninformative comment qemuDomainSetBlockIoTune: Skip monitor call for empty cdrom src/qemu/qemu_driver.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) -- 2.29.2

3 4

[libvirt PATCH 0/2] Two small LXC veth creation bugs
by Laine Stump 07 Jan '21

07 Jan '21

Laine Stump (2): lxc: remove unnecessary call to virNetDevReserveName() lxc: eliminate leaked and dangling pointers in virLXCProcessSetupInterfaceTap src/lxc/lxc_process.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.29.2

2 3

[libvirt PATCH] util: validate pcie_cap_pos != 0 in virDeviceHasPCIExpressLink()
by Laine Stump 07 Jan '21

07 Jan '21

virDeviceHasPCIExpressLink() wasn't checking that pcie_cap_pos was valid before attempting to use it, which could lead to reading the byte at offset 0+PCI_CAP_ID_EXP instead of [valid offset]+PCI_CAP_ID_EXP. In particular, this could happen for "integrated" PCI devices (those that are on the PCIe root complex). If it happened that the byte from the wrong address had the "right" bit set, then it would lead to us innappropriately believing that Express Link info was available when it wasn't, and the node device driver would log an error like this: virPCIDeviceGetLinkCapSta:2754 : internal error: pci device 0000:00:18.0 is not a PCI-Express device during a libvirtd restart. (this didn't ever occur until after virPCIDeviceIsPCIExpress() was made more intelligent in commit c00b6b1ae, which hasn't yet been in any official release) Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/util/virpci.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/virpci.c b/src/util/virpci.c index 9bfc743fbd..50fd5ef7ea 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2722,6 +2722,11 @@ virPCIDeviceHasPCIExpressLink(virPCIDevicePtr dev) if (virPCIDeviceInit(dev, fd) < 0) goto cleanup; + if (dev->pcie_cap_pos == 0) { + ret = 0; + goto cleanup; + } + cap = virPCIDeviceRead16(dev, fd, dev->pcie_cap_pos + PCI_CAP_FLAGS); type = (cap & PCI_EXP_FLAGS_TYPE) >> 4; -- 2.29.2

2 1

[PATCH 0/7] secret: Relax usage 'name' regex
by Peter Krempa 07 Jan '21

07 Jan '21

Patches 1-6 are mostly cleanups noticed while looking at the schema. See patch 7/7 for explanation. Peter Krempa (7): virSecretDefParseUsage: Use g_autofree for type_str secretXMLParseNode: Clean up freeing of memory virSecretLookupParseSecret: Use g_steal_pointer schema: domaincommon: Remove pointless 'choice' from 'inituser'/'initgroup' schema: Remove workaround for bug in libxml2 2.7.6 schema: Add define for object names schema: secret: Relax requirements for usage name docs/schemas/basictypes.rng | 13 ++++++++ docs/schemas/domaincommon.rng | 33 +++++-------------- docs/schemas/secret.rng | 8 ++--- docs/schemas/storagecommon.rng | 8 ----- docs/schemas/storagepool.rng | 4 +-- src/conf/secret_conf.c | 20 ++++------- src/util/virsecret.c | 3 +- .../disk-network-source-auth.args | 8 ++++- ...isk-network-source-auth.x86_64-2.12.0.args | 9 +++++ ...isk-network-source-auth.x86_64-latest.args | 29 +++++++++++----- .../disk-network-source-auth.xml | 12 +++++++ tests/qemuxml2argvtest.c | 3 +- .../disk-network-source-auth.xml | 13 ++++++++ tests/secretxml2xmlin/usage-ceph-space.xml | 7 ++++ tests/secretxml2xmltest.c | 1 + 15 files changed, 107 insertions(+), 64 deletions(-) create mode 100644 tests/secretxml2xmlin/usage-ceph-space.xml -- 2.29.2

2 13

[PATCHv2 0/4] netlink: Extract common code to simplify netlink functions
by Shi Lei 07 Jan '21

07 Jan '21

V1 here: https://www.redhat.com/archives/libvir-list/2020-December/msg00836.html Since V1: - Minor fixes for reporting system error in Patch 4. Shi Lei (4): netlink: Remove invalid flags(NLM_F_CREATE and NLM_F_EXCL) for RTM_DELLINK netlink: Minor changes for macros NETLINK_MSG_[NEST_START|NEST_END|PUT] netlink: Introduce macro NETLINK_MSG_APPEND to wrap nlmsg_append netlink: Introduce a helper function to simplify netlink functions src/util/virnetlink.c | 314 +++++++++++++++++++----------------------- src/util/virnetlink.h | 27 +--- 2 files changed, 142 insertions(+), 199 deletions(-) -- 2.25.1

3 8

[PATCH] Qemu: migration: Not bind RAM info with active migration status
by Keqian Zhu 07 Jan '21

07 Jan '21

For that Qemu supports returning incoming migration info since its commit 65ace0604551 (migration: add postcopy total blocktime into query-migrate), which may contains active status, but without RAM info. Drop this binding relationship check in libvirt. Signed-off-by: Keqian Zhu <zhukeqian1(a)huawei.com> --- src/qemu/qemu_monitor_json.c | 88 +++++++++++++++++------------------- 1 file changed, 42 insertions(+), 46 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d808c4b55b..ba8e340742 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3547,56 +3547,52 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, case QEMU_MONITOR_MIGRATION_STATUS_PRE_SWITCHOVER: case QEMU_MONITOR_MIGRATION_STATUS_DEVICE: ram = virJSONValueObjectGetObject(ret, "ram"); - if (!ram) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("migration was active, but no RAM info was set")); - return -1; - } + if (ram) { + if (virJSONValueObjectGetNumberUlong(ram, "transferred", + &stats->ram_transferred) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("migration was active, but RAM 'transferred' " + "data was missing")); + return -1; + } + if (virJSONValueObjectGetNumberUlong(ram, "remaining", + &stats->ram_remaining) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("migration was active, but RAM 'remaining' " + "data was missing")); + return -1; + } + if (virJSONValueObjectGetNumberUlong(ram, "total", + &stats->ram_total) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("migration was active, but RAM 'total' " + "data was missing")); + return -1; + } - if (virJSONValueObjectGetNumberUlong(ram, "transferred", - &stats->ram_transferred) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("migration was active, but RAM 'transferred' " - "data was missing")); - return -1; - } - if (virJSONValueObjectGetNumberUlong(ram, "remaining", - &stats->ram_remaining) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("migration was active, but RAM 'remaining' " - "data was missing")); - return -1; - } - if (virJSONValueObjectGetNumberUlong(ram, "total", - &stats->ram_total) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("migration was active, but RAM 'total' " - "data was missing")); - return -1; - } + if (virJSONValueObjectGetNumberDouble(ram, "mbps", &mbps) == 0 && + mbps > 0) { + /* mpbs from QEMU reports Mbits/s (M as in 10^6 not Mi as 2^20) */ + stats->ram_bps = mbps * (1000 * 1000 / 8); + } - if (virJSONValueObjectGetNumberDouble(ram, "mbps", &mbps) == 0 && - mbps > 0) { - /* mpbs from QEMU reports Mbits/s (M as in 10^6 not Mi as 2^20) */ - stats->ram_bps = mbps * (1000 * 1000 / 8); + if (virJSONValueObjectGetNumberUlong(ram, "duplicate", + &stats->ram_duplicate) == 0) + stats->ram_duplicate_set = true; + ignore_value(virJSONValueObjectGetNumberUlong(ram, "normal", + &stats->ram_normal)); + ignore_value(virJSONValueObjectGetNumberUlong(ram, "normal-bytes", + &stats->ram_normal_bytes)); + ignore_value(virJSONValueObjectGetNumberUlong(ram, "dirty-pages-rate", + &stats->ram_dirty_rate)); + ignore_value(virJSONValueObjectGetNumberUlong(ram, "page-size", + &stats->ram_page_size)); + ignore_value(virJSONValueObjectGetNumberUlong(ram, "dirty-sync-count", + &stats->ram_iteration)); + ignore_value(virJSONValueObjectGetNumberUlong(ram, "postcopy-requests", + &stats->ram_postcopy_reqs)); } - if (virJSONValueObjectGetNumberUlong(ram, "duplicate", - &stats->ram_duplicate) == 0) - stats->ram_duplicate_set = true; - ignore_value(virJSONValueObjectGetNumberUlong(ram, "normal", - &stats->ram_normal)); - ignore_value(virJSONValueObjectGetNumberUlong(ram, "normal-bytes", - &stats->ram_normal_bytes)); - ignore_value(virJSONValueObjectGetNumberUlong(ram, "dirty-pages-rate", - &stats->ram_dirty_rate)); - ignore_value(virJSONValueObjectGetNumberUlong(ram, "page-size", - &stats->ram_page_size)); - ignore_value(virJSONValueObjectGetNumberUlong(ram, "dirty-sync-count", - &stats->ram_iteration)); - ignore_value(virJSONValueObjectGetNumberUlong(ram, "postcopy-requests", - &stats->ram_postcopy_reqs)); - disk = virJSONValueObjectGetObject(ret, "disk"); if (disk) { rc = virJSONValueObjectGetNumberUlong(disk, "transferred", -- 2.19.1

5 24

[PATCH v2] conf: Add support for keeping TPM emulator state
by Eiichi Tsukata 07 Jan '21

07 Jan '21

Currently, swtpm TPM state file is removed when a transient domain is powered off or undefined. When we store TPM state on a shared storage such as NFS and use transient domain, TPM states should be kept as it is. Add per-TPM emulator option `persistent_sate` for keeping TPM state. This option only works for the emulator type backend and looks as follows: <tpm model='tpm-tis'> <backend type='emulator' persistent_state='yes'/> </tpm> Signed-off-by: Eiichi Tsukata <eiichi.tsukata(a)nutanix.com> Reviewed-by: Stefan Berger <stefanb(a)linux.ibm.com> --- docs/formatdomain.rst | 7 ++++ docs/schemas/domaincommon.rng | 12 ++++++ src/conf/domain_conf.c | 21 ++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_tpm.c | 3 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 38 +++++++++++++++++++ .../tpm-emulator-tpm2-pstate.xml | 30 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...tpm-emulator-tpm2-pstate.x86_64-latest.xml | 37 ++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 10 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 512939679b..87bbd1a4f1 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -6986,6 +6986,13 @@ Example: usage of the TPM Emulator - '1.2' : creates a TPM 1.2 - '2.0' : creates a TPM 2.0 +``persistent_state`` + The ``persistent_state`` attribute indicates whether 'swtpm' TPM state is + kept or not when a transient domain is powered off or undefined. This + option can be used for preserving TPM state. By default the value is ``no``. + This attribute only works with the ``emulator`` backend. The accepted values + are ``yes`` and ``no``. + ``encryption`` The ``encryption`` element allows the state of a TPM emulator to be encrypted. The ``secret`` must reference a secret object that holds the diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 795b654feb..d7cedc014c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4780,6 +4780,18 @@ </optional> </group> </choice> + <choice> + <group> + <optional> + <attribute name="persistent_state"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </optional> + </group> + </choice> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 23415b323c..82c3a68347 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13178,6 +13178,12 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt, * <encryption secret='32ee7e76-2178-47a1-ab7b-269e6e348015'/> * </backend> * </tpm> + * + * Emulator persistent_state is supported with the following: + * + * <tpm model='tpm-tis'> + * <backend type='emulator' version='2.0' persistent_state='yes'> + * </tpm> */ static virDomainTPMDefPtr virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, @@ -13193,6 +13199,7 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *backend = NULL; g_autofree char *version = NULL; g_autofree char *secretuuid = NULL; + g_autofree char *persistent_state = NULL; g_autofree xmlNodePtr *backends = NULL; def = g_new0(virDomainTPMDef, 1); @@ -13265,6 +13272,18 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, } def->data.emulator.hassecretuuid = true; } + + persistent_state = virXMLPropString(backends[0], "persistent_state"); + if (persistent_state) { + if (virStringParseYesNo(persistent_state, + &def->data.emulator.persistent_state) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid persistent_state value, either 'yes' or 'no'")); + goto error; + } + } else { + def->data.emulator.persistent_state = false; + } break; case VIR_DOMAIN_TPM_TYPE_LAST: goto error; @@ -26952,6 +26971,8 @@ virDomainTPMDefFormat(virBufferPtr buf, case VIR_DOMAIN_TPM_TYPE_EMULATOR: virBufferAsprintf(buf, " version='%s'", virDomainTPMVersionTypeToString(def->version)); + if (def->data.emulator.persistent_state) + virBufferAddLit(buf, " persistent_state='yes'"); if (def->data.emulator.hassecretuuid) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virBufferAddLit(buf, ">\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 72771c46b9..109625828a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1362,6 +1362,7 @@ struct _virDomainTPMDef { char *logfile; unsigned char secretuuid[VIR_UUID_BUFLEN]; bool hassecretuuid; + bool persistent_state; } emulator; } data; }; diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 872be16570..532e0912bd 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -729,7 +729,8 @@ qemuExtTPMCleanupHost(virDomainDefPtr def) if (def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR) continue; - qemuTPMDeleteEmulatorStorage(def->tpms[i]); + if (!def->tpms[i]->data.emulator.persistent_state) + qemuTPMDeleteEmulatorStorage(def->tpms[i]); } } diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args new file mode 100644 index 0000000000..90505c7a76 --- /dev/null +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-TPM-VM \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-TPM-VM/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-TPM-VM/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=TPM-VM,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ +-machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=pc.ram \ +-cpu qemu64 \ +-m 2048 \ +-object memory-backend-ram,id=pc.ram,size=2147483648 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot menu=on,strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-tpmdev emulator,id=tpm-tpm0,chardev=chrtpm \ +-chardev socket,id=chrtpm,path=/dev/test \ +-device tpm-tis,tpmdev=tpm-tpm0,id=tpm0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml new file mode 100644 index 0000000000..45fc4c0e1a --- /dev/null +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>TPM-VM</name> + <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>512288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <tpm model='tpm-tis'> + <backend type='emulator' version='2.0' persistent_state='yes'/> + </tpm> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9b853c6d59..e96a51d18b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2460,6 +2460,7 @@ mymain(void) DO_TEST_CAPS_LATEST("tpm-emulator"); DO_TEST_CAPS_LATEST("tpm-emulator-tpm2"); DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc"); + DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-pstate"); DO_TEST_CAPS_LATEST_PPC64("tpm-emulator-spapr"); DO_TEST_PARSE_ERROR("pci-domain-invalid", NONE); diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml new file mode 100644 index 0000000000..08bc8d690c --- /dev/null +++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>TPM-VM</name> + <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>512288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <tpm model='tpm-tis'> + <backend type='emulator' version='2.0' persistent_state='yes'/> + </tpm> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 1968be6782..f8bca9f559 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -761,6 +761,7 @@ mymain(void) DO_TEST_CAPS_LATEST("tpm-emulator"); DO_TEST_CAPS_LATEST("tpm-emulator-tpm2"); DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc"); + DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-pstate"); DO_TEST("metadata", NONE); DO_TEST("metadata-duplicate", NONE); -- 2.28.0

3 3

[PATCHv3 0/3] Use netlink to create veth device pair when netlink is supported
by Shi Lei 07 Jan '21

07 Jan '21

V2 here: https://www.redhat.com/archives/libvir-list/2020-November/msg01239.html Since V2: * Remove the argument 'status' of virNetDevVethCreateInternal * fix a memory leak in virLXCProcessSetupInterfaceTap V1 here: https://www.redhat.com/archives/libvir-list/2020-November/msg00898.html Since V1: * Include <linux/veth.h> rather than introducing enum VETH_INFO_* * Have complete functions within an #ifdefs rather than putting #ifdefs in function Shi Lei (3): util:netlink: Enable virNetlinkNewLink to support veth util:veth: Create veth device pair by netlink lxc: fix a memory leak src/lxc/lxc_process.c | 4 +- src/util/virnetdevveth.c | 126 ++++++++++++++++++++++----------------- src/util/virnetlink.c | 14 +++++ src/util/virnetlink.h | 1 + 4 files changed, 89 insertions(+), 56 deletions(-) -- 2.25.1

3 8

[RFC] exposing 'nodedev assigned to domain' info to users
by Daniel Henrique Barboza 06 Jan '21

06 Jan '21

Hi, This is something I've been giving a thought after working in Gitlab issue #72 and decided to run through the ML before hitting the code. We don't have an easy way to retrieve the domain that is using an specific hostdev. Let's say that I want to know which domain is using the PCI card pci_0000_01_00_2. 'nodedev-dumpxml' will return the hardware/driver capabilities of the device, such as IOMMU group, driver and so on, but will not inform which domain is using the hostdev, if any. 'nodedev-list' will simply list all nodedev names known to Libvirt, without outputting any other information. IIUC, the only existing way I can reliably tell whether a hostdev is being used by domain, aside from having to register the information by myself during domain definition of course, is via 'virsh dumpxml <domain>' each existing running domain and matching the nodedev name with the source.address element of the XML. When we consider SR-IOV devices that can have 28+ VFs each (and have lots of fun caveats, like Github #72 showed us), the capability of hot plug/unplug hostdevs freely, and lots of running domains, it is clear that we're putting a considerable pressure in the upper layers (OVirt, or a poor human admin) to keep track of the nodedevs each running domain is using. An info that we already have internally and can just expose it. I have a few ideas to make this happen: 1 - upgrade 'nodedev-list' to add an extra 'assigned to' column This is the more straightforward way of exposing the info. A simple 'nodedev-list' call can retrieve which domain is using which nodedev. To preserve the existing usage we can add an "--show-assigned-domains" option to control whether we will display this info. 2 - add an '<assigned_to>' element in nodedev XML definition I'm not a fan of exposing this in this particular XML because we would mix host/hw related attributes with domain info. But it would be easier to pull this off comparing to (1), so I'm mentioning it for the record. I would start by exposing the info for HOSTDEV_SUBSYS_TYPE_PCI hostdevs (--cap pci in nodedev-list). Thanks, DHB

3 8

[libvirt PATCH v2 00/16] docs: add manpages for all the modular daemons
by Daniel P. Berrangé 06 Jan '21

06 Jan '21

Most of the modular daemon stuff has been done from a single template, but for the man pages that is more trouble than it is worth, so we create a separate man page source for each daemon, which makes it easy to extend with driver specific information. Changed in v2: - BHyve man page has had references to systemd removed. Daniel P. Berrangé (16): docs: consistently mark libvirtd as preformatted text docs: don't hardcode an ancient version in manpage examples docs: tweak heading for daemon manual pages docs: add manpage for virtproxyd docs: add manpage for virtbhyved docs: add manpage for virtinterfaced docs: add manpage for virtlxcd docs: add manpage for virtnetworkd docs: add manpage for virtnodedevd docs: add manpage for virtnwfilterd docs: add manpage for virtqemud docs: add manpage for virtsecretd docs: add manpage for virtstoraged docs: add manpage for virtvboxd docs: add manpage for virtvzd docs: add manpage for virtxend docs/manpages/index.rst | 25 ++- docs/manpages/libvirtd.rst | 50 +++--- docs/manpages/meson.build | 14 ++ docs/manpages/virtbhyved.rst | 193 +++++++++++++++++++++++ docs/manpages/virtinterfaced.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtlockd.rst | 2 +- docs/manpages/virtlogd.rst | 2 +- docs/manpages/virtlxcd.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtnetworkd.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtnodedevd.rst | 214 ++++++++++++++++++++++++++ docs/manpages/virtnwfilterd.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtproxyd.rst | 256 +++++++++++++++++++++++++++++++ docs/manpages/virtqemud.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtsecretd.rst | 214 ++++++++++++++++++++++++++ docs/manpages/virtstoraged.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtvboxd.rst | 213 +++++++++++++++++++++++++ docs/manpages/virtvzd.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtxend.rst | 215 ++++++++++++++++++++++++++ 18 files changed, 2874 insertions(+), 29 deletions(-) create mode 100644 docs/manpages/virtbhyved.rst create mode 100644 docs/manpages/virtinterfaced.rst create mode 100644 docs/manpages/virtlxcd.rst create mode 100644 docs/manpages/virtnetworkd.rst create mode 100644 docs/manpages/virtnodedevd.rst create mode 100644 docs/manpages/virtnwfilterd.rst create mode 100644 docs/manpages/virtproxyd.rst create mode 100644 docs/manpages/virtqemud.rst create mode 100644 docs/manpages/virtsecretd.rst create mode 100644 docs/manpages/virtstoraged.rst create mode 100644 docs/manpages/virtvboxd.rst create mode 100644 docs/manpages/virtvzd.rst create mode 100644 docs/manpages/virtxend.rst -- 2.29.2

2 32

[libvirt PATCH v2] qemuDomainChangeNet: Check changed virtio network driver options
by Tim Wiederhake 06 Jan '21

06 Jan '21

Changes to a virtio network device such as <interface type="network"> <model type="virtio"/> <driver iommu="on" ats="on"/>  ... </interface> were quietly dismissed by `virsh update-device ... --live`. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_hotplug.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 57635cd419..6371d53871 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3600,6 +3600,16 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } + if (!!olddev->virtio != !!newdev->virtio || + (olddev->virtio && newdev->virtio && + (olddev->virtio->iommu != newdev->virtio->iommu || + olddev->virtio->ats != newdev->virtio->ats || + olddev->virtio->packed != newdev->virtio->packed))) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify virtio network device driver options")); + goto cleanup; + } + /* data: this union will be examined later, after allocating new actualdev */ /* virtPortProfile: will be examined later, after allocating new actualdev */ -- 2.26.2

2 1

[PATCH 0/3] schemas: Allow <filesystem/> to have interleaved children
by Michal Privoznik 06 Jan '21

06 Jan '21

Tested with the following change: diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml index f6bb663e97..875e2316a0 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml +++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml @@ -27,13 +27,13 @@ <controller type='usb' index='0' model='none'/> <controller type='pci' index='0' model='pci-root'/> <filesystem type='mount' accessmode='passthrough'> - <driver type='virtiofs' queue='1024'/> + <target dir='mount_tag'/> + <source dir='/path'/> <binary path='/usr/libexec/virtiofsd' xattr='on'> <cache mode='always'/> <lock posix='off' flock='off'/> </binary> - <source dir='/path'/> - <target dir='mount_tag'/> + <driver type='virtiofs' queue='1024'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </filesystem> <input type='mouse' bus='ps2'/> Michal Prívozník (3): schemas: Allow fsDriver to be interleaved schemas: Allow interleaving of fsBinary children schemas: Allow direct children of <filesystem/> to be interleaved docs/schemas/domaincommon.rng | 400 +++++++++++++++++----------------- 1 file changed, 202 insertions(+), 198 deletions(-) -- 2.26.2

2 4

[libvirt PATCH v2 0/9 PUSHED] cleanup storage source related code
by Pavel Hrdina 06 Jan '21

06 Jan '21

This series is pushed, posting only to track the changes to fix the issues pointed out by Peter. Pavel Hrdina (9): util: remove unused virStorageGenerateQcowPassphrase virstoragefile: remove unused virStorageFileChainCheckBroken util: move virQEMUBuildQemuImgKeySecretOpts into storage util: move virStorageFileGetLVMKey to locking util: move virStorageFileCheckCompat into conf src: add missing headers to various files virfile: refactor virFileNBDDeviceAssociate virstoragefile: move virStorageFileResize into virfile virstoragefile: move virStorageFileIsClusterFS into virfile src/conf/storage_conf.c | 23 ++++- src/driver.c | 1 + src/libvirt_private.syms | 8 +- src/locking/lock_driver_lockd.c | 68 +++++++++++- src/lxc/lxc_controller.c | 4 +- src/qemu/qemu_interop_config.c | 1 + src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_shim.c | 1 + src/storage/parthelper.c | 1 + src/storage/storage_util.c | 76 +++++++++++++- src/util/virarptable.c | 1 + src/util/vircgroupv1.c | 1 + src/util/vircgroupv2devices.c | 1 + src/util/virfile.c | 68 ++++++++++-- src/util/virfile.h | 9 +- src/util/virpidfile.c | 1 + src/util/virqemu.c | 69 ------------- src/util/virqemu.h | 6 -- src/util/virresctrl.c | 1 + src/util/virstorageencryption.c | 34 ------ src/util/virstorageencryption.h | 2 - src/util/virstoragefile.c | 177 -------------------------------- src/util/virstoragefile.h | 12 --- src/util/virsysinfo.c | 1 + src/util/virtpm.c | 1 + tests/virstoragetest.c | 6 -- tools/virsh-console.c | 1 + tools/virsh-util.c | 1 + 28 files changed, 249 insertions(+), 328 deletions(-) -- 2.29.2

1 9

[PATCH 0/2] qemu: Restore default root qdisc when QoS is cleared out
by Michal Privoznik 06 Jan '21

06 Jan '21

This fixes my previous series: https://www.redhat.com/archives/libvir-list/2020-October/msg00636.html Michal Prívozník (2): qemu: Set default qdisc before setting bandwidth qemu: Restore default root qdisc when QoS is cleared out src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_driver.c | 9 +++++++++ src/qemu/qemu_hotplug.c | 13 +++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) -- 2.26.2

2 5

[PATCH] qemu_process: Release domain seclabel later in qemuProcessStop()
by Michal Privoznik 06 Jan '21

06 Jan '21

Some secdrivers (typically SELinux driver) generate unique dynamic seclabel for each domain (unless a static one is requested in domain XML). This is achieved by calling qemuSecurityGenLabel() from qemuProcessPrepareDomain() which allocates unique seclabel and stores it in domain def->seclabels. The counterpart is qemuSecurityReleaseLabel() which releases the label and removes it from def->seclabels. Problem is, that with current code the qemuProcessStop() may still want to use the seclabel after it was released, e.g. when it wants to restore the label of a disk mirror. What is happening now, is that in qemuProcessStop() the qemuSecurityReleaseLabel() is called, which removes the SELinux seclabel from def->seclabels, yada yada yada and eventually qemuSecurityRestoreImageLabel() is called. This bubbles down to virSecuritySELinuxRestoreImageLabelSingle() which find no SELinux seclabel (using virDomainDefGetSecurityLabelDef()) and this returns early doing nothing. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1751664 Fixes: 8fa0374c5b8e834fcbdeae674cc6cc9e6bf9019f Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3b64caa619..15cf8cb666 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7702,8 +7702,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, qemuSecurityRestoreAllLabel(driver, vm, !!(flags & VIR_QEMU_PROCESS_STOP_MIGRATED)); - qemuSecurityReleaseLabel(driver->securityManager, vm->def); - for (i = 0; i < vm->def->ndisks; i++) { virDomainDeviceDef dev; virDomainDiskDefPtr disk = vm->def->disks[i]; @@ -7891,6 +7889,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, } } + qemuSecurityReleaseLabel(driver->securityManager, vm->def); + /* clear all private data entries which are no longer needed */ qemuDomainObjPrivateDataClear(priv); -- 2.26.2

2 2

[PATCH] schema: Fix TPM version rules
by Michal Privoznik 06 Jan '21

06 Jan '21

According to our parser (virDomainTPMDefParseXML()) the version is an optional attribute and independent of TPM backend type. Therefore, it's not a choice group, which is what our RNG schema suggests. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/schemas/domaincommon.rng | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 712fb60562..86816e9b1d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4776,18 +4776,14 @@ </optional> </group> </choice> - <choice> - <group> - <optional> - <attribute name="version"> - <choice> - <value>1.2</value> - <value>2.0</value> - </choice> - </attribute> - </optional> - </group> - </choice> + <optional> + <attribute name="version"> + <choice> + <value>1.2</value> + <value>2.0</value> + </choice> + </attribute> + </optional> </element> </define> -- 2.26.2

2 1

[libvirt PATCH] qemuDomainChangeNet: Check changed virtio network driver options
by Tim Wiederhake 06 Jan '21

06 Jan '21

Changes to a virtio network device such as <interface type="network"> <model type="virtio"/> <driver iommu="on" ats="on"/>  ... </interface> were quietly dismissed by `virsh update-device ... --live`. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/qemu/qemu_hotplug.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 57635cd419..c385bde4bf 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3600,6 +3600,16 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } + if (!!olddev->virtio != !!newdev->virtio || + (!!olddev->virtio && !!newdev->virtio && + (olddev->virtio->iommu != newdev->virtio->iommu || + olddev->virtio->ats != newdev->virtio->ats || + olddev->virtio->packed != newdev->virtio->packed))) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify virtio network device driver options")); + goto cleanup; + } + /* data: this union will be examined later, after allocating new actualdev */ /* virtPortProfile: will be examined later, after allocating new actualdev */ -- 2.26.2

2 1

[PATCH] manpage: virsh: Drop note that 'domrename' doesn't work with snapshots/checkpoints
by Peter Krempa 06 Jan '21

06 Jan '21

As of commits 3b1244bffdb and 4770a96c662 renaming of the domain works also with checkpoints and snapshots. Update the docs. https://bugzilla.redhat.com/show_bug.cgi?id=1913138 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/manpages/virsh.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 4a1500e686..e3afa48f7b 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -2177,7 +2177,7 @@ domrename Rename a domain. This command changes current domain name to the new name specified in the second argument. -``Note``: Domain must be inactive and without snapshots or checkpoints. +``Note``: Domain must be inactive. domstate -- 2.29.2

2 1

[PATCH 1/7] conf: Add NFS disk protocol
by Ryan Gahagan 06 Jan '21

06 Jan '21

Per Issue 90, Libvirt does not support attaching an NFS disk even though QEMU has added support for it. This series of patches seeks to implement this support in Libvirt and begins by adding in flags for an NFS disk. Signed-off-by: Ryan Gahagan <rgahagan(a)cs.utexas.edu> --- src/libxl/libxl_conf.c | 1 + src/libxl/xen_xl.c | 1 + src/qemu/qemu_block.c | 3 +++ src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 2 ++ src/qemu/qemu_snapshot.c | 3 +++ src/util/virstoragefile.c | 6 ++++++ src/util/virstoragefile.h | 1 + 8 files changed, 18 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 00748e21e8..6a8ae27f54 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -941,6 +941,7 @@ libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: + case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: virReportError(VIR_ERR_NO_SUPPORT, diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index ba0942601f..17b93d0f5c 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1600,6 +1600,7 @@ xenFormatXLDiskSrcNet(virStorageSourcePtr src) case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: + case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: virReportError(VIR_ERR_NO_SUPPORT, diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 4640e339c0..b224a550f3 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1180,6 +1180,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src, return NULL; break; + case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_NONE: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportEnumRangeError(virStorageNetProtocol, src->protocol); @@ -2111,6 +2112,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_VXHS: + case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: @@ -2502,6 +2504,7 @@ qemuBlockStorageSourceCreateGetStorageProps(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_VXHS: + case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b06a086e18..c58f39ebf1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1044,6 +1044,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, _("'ssh' protocol is not yet supported")); return NULL; + case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bfb6e23942..d91c32b2c5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9630,6 +9630,8 @@ qemuDomainPrepareStorageSourceTLS(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: + case VIR_STORAGE_NET_PROTOCOL_NFS: + /* Assumed NFS doesn't support TLS (needs Kerberos) */ case VIR_STORAGE_NET_PROTOCOL_SSH: if (src->haveTLS == VIR_TRISTATE_BOOL_YES) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 15494c3415..7e89a8839b 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -413,6 +413,7 @@ qemuSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdisk, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: + case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external inactive snapshots are not supported on " @@ -501,6 +502,7 @@ qemuSnapshotPrepareDiskExternalActive(virDomainObjPtr vm, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: + case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external active snapshots are not supported on " @@ -631,6 +633,7 @@ qemuSnapshotPrepareDiskInternal(virDomainDiskDefPtr disk, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: + case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("internal inactive snapshots are not supported on " diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index fac93118fd..103dade0e7 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -90,6 +90,7 @@ VIR_ENUM_IMPL(virStorageNetProtocol, "tftp", "ssh", "vxhs", + "nfs", ); VIR_ENUM_IMPL(virStorageNetHostTransport, @@ -3152,6 +3153,7 @@ virStorageSourceParseBackingColon(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: + case VIR_STORAGE_NET_PROTOCOL_NFS: virReportError(VIR_ERR_INTERNAL_ERROR, _("malformed backing store path for protocol %s"), protocol); @@ -4627,6 +4629,10 @@ virStorageSourceNetworkDefaultPort(virStorageNetProtocol protocol) case VIR_STORAGE_NET_PROTOCOL_VXHS: return 9999; + case VIR_STORAGE_NET_PROTOCOL_NFS: + /* Per https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/4/ht… */ + return 2049; + case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: return 0; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 87763cf389..c5d5f0233a 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -135,6 +135,7 @@ typedef enum { VIR_STORAGE_NET_PROTOCOL_TFTP, VIR_STORAGE_NET_PROTOCOL_SSH, VIR_STORAGE_NET_PROTOCOL_VXHS, + VIR_STORAGE_NET_PROTOCOL_NFS, VIR_STORAGE_NET_PROTOCOL_LAST } virStorageNetProtocol; -- 2.29.2

5 24

[libvirt PATCH] qemu: The TSC tolerance interval should be closed
by Jiri Denemark 06 Jan '21

06 Jan '21

The kernel refuses to set guest TSC frequency less than a minimum frequency or greater than maximum frequency (both computed based on the host TSC frequency). When writing the libvirt code with a reversed logic (return success when the requested frequency falls within the tolerance interval) I forgot to include the boundaries. Fixes: d8e5b4560006590668d4669f54a46b08ec14c1a2 https://bugzilla.redhat.com/show_bug.cgi?id=1839095 Signed-off-by: Jiri Denemark <jdenemar(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 e7421b415f..e9802809a5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5403,7 +5403,7 @@ qemuProcessStartValidateTSC(virQEMUDriverPtr driver, tsc->frequency, virTristateBoolTypeToString(tsc->scaling), tolerance); - if (freq > minFreq && freq < maxFreq) { + if (freq >= minFreq && freq <= maxFreq) { VIR_DEBUG("Requested TSC frequency is within tolerance interval"); return 0; } -- 2.30.0

2 1

[libvirt][PATCH v2 0/3] introduce 'restrictive' mode in numatune
by Luyao Zhong 06 Jan '21

06 Jan '21

Before this patch set, numatune only has three memory modes: static, interleave and prefered. These memory policies are ultimately set by mbind() system call. Memory policy could be 'hard coded' into the kernel, but none of above policies fit our requirment under this case. mbind() support default memory policy, but it requires a NULL nodemask. So obviously setting allowed memory nodes is cgroups' mission under this case. So we introduce a new option for mode in numatune named 'restrictive'. <numatune> <memory mode="restrictive" nodeset="1-4,^3"/> <memnode cellid="0" mode="restrictive" nodeset="1"/> <memnode cellid="2" mode="restrictive" nodeset="2"/> </numatune> The config above means we only use cgroups to restrict the allowed memory nodes and not setting any specific memory policies explicitly. RFC discussion: https://www.redhat.com/archives/libvir-list/2020-November/msg01256.html Regards, Luyao Luyao Zhong (3): docs: add docs for 'restrictive' option for mode in numatune schema: add 'restrictive' config option for mode in numatune qemu: add parser and formatter for 'restrictive' mode in numatune docs/formatdomain.rst | 7 +++- docs/schemas/domaincommon.rng | 2 + include/libvirt/libvirt-domain.h | 1 + src/conf/numa_conf.c | 9 +++++ src/qemu/qemu_command.c | 6 ++- src/qemu/qemu_process.c | 27 +++++++++++++ src/util/virnuma.c | 3 ++ .../numatune-memnode-invalid-mode.err | 1 + .../numatune-memnode-invalid-mode.xml | 33 +++++++++++++++ ...emnode-restrictive-mode.x86_64-latest.args | 40 +++++++++++++++++++ .../numatune-memnode-restrictive-mode.xml | 33 +++++++++++++++ tests/qemuxml2argvtest.c | 2 + ...memnode-restrictive-mode.x86_64-latest.xml | 40 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err create mode 100644 tests/qemuxml2argvdata/numatune-memnode-invalid-mode.xml create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml create mode 100644 tests/qemuxml2xmloutdata/numatune-memnode-restrictive-mode.x86_64-latest.xml -- 2.25.4

3 5

[PATCH 0/4] netlink: Extract common code to simplify netlink functions
by Shi Lei 06 Jan '21

06 Jan '21

This series makes some minor changes for macros NETLINK_MSG_* and extract common code to simplify those netlink functions. Shi Lei (4): netlink: Remove invalid flags(NLM_F_CREATE and NLM_F_EXCL) for RTM_DELLINK netlink: Minor changes for macros NETLINK_MSG_[NEST_START|NEST_END|PUT] netlink: Introduce macro NETLINK_MSG_APPEND to wrap nlmsg_append netlink: Introduce a helper function to simplify netlink functions src/util/virnetlink.c | 299 ++++++++++++++++++------------------------ src/util/virnetlink.h | 27 +--- 2 files changed, 126 insertions(+), 200 deletions(-) -- 2.25.1

2 6

[libvirt PATCH v3 0/8] vmx: Don't error out on missing filename for cdrom
by Martin Kletzander 06 Jan '21

06 Jan '21

This is perfectly valid in VMWare and the VM just boots with an empty drive. We used to just skip the whole drive before, but since we changed how we parse empty cdrom drives this now results in an error and the user not being able to even dump the XML. Instead of erroring out, just keep the drive empty. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1903953 v3: - Fixed the vmware driver - Bit of a clean-up - Few more tests v2: - Do not report and reset an error, but handle it more nicely. - https://www.redhat.com/archives/libvir-list/2020-December/msg00846.html v1: - https://www.redhat.com/archives/libvir-list/2020-December/msg00840.html Martin Kletzander (8): esx: Unindent unnecessary conditional branch tests: Use g_autofree in testParseVMXFileName vmx: Make virVMXParseFileName return an integer tests: Allow testing for parse failures in vmx2xmltest vmx: Allow missing cdrom image file in virVMXParseFileName tests: Test vmx files with missing images esx: Handle missing images in esxParseVMXFileName vmx: Treat missing cdrom-image as empty drive src/esx/esx_driver.c | 160 ++++++++++-------- src/vmware/vmware_conf.c | 21 ++- src/vmware/vmware_conf.h | 10 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 27 +-- src/vmx/vmx.h | 5 +- ...x2xml-cdrom-ide-file-missing-datastore.vmx | 6 + .../vmx2xml-cdrom-ide-file-missing-file.vmx | 6 + ...ml-harddisk-ide-file-missing-datastore.vmx | 6 + ...mx2xml-harddisk-scsi-file-missing-file.vmx | 7 + tests/vmx2xmltest.c | 67 +++++--- 11 files changed, 203 insertions(+), 118 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-datastore.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-file-missing-file.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-harddisk-ide-file-missing-datastore.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-harddisk-scsi-file-missing-file.vmx -- 2.30.0

2 10

Plans for the next release
by Jiri Denemark 05 Jan '21

05 Jan '21

We are getting close to the first release of libvirt in 2021. To aim for the release on Jan 15 I suggest entering the freeze on Friday Jan 08 in the evening or during the weekend and tagging RC2 on Wednesday Jan 13. I hope this works for everyone. Jirka

1 0

[PATCH RFC v4 00/15] Add riscv kvm accel support
by Yifei Jiang 05 Jan '21

05 Jan '21

This series adds both riscv32 and riscv64 kvm support, and implements migration based on riscv. It is based on temporarily unaccepted kvm: https://github.com/kvm-riscv/linux (lastest version v15). This series depends on above pending changes which haven't yet been accepted, so this QEMU patch series is treated as RFC patches until that dependency has been dealt with. Compared to RFC v3, the time scaling is supported in this series. The new feature also requires the following patches: [1] Bugfix in kvm v15 https://lkml.org/lkml/2020/11/30/245 [2] kvm patches: [PATCH RFC 0/3] Implement guest time scaling in RISC-V KVM Several steps to use this: 1. Build emulation $ ./configure --target-list=riscv64-softmmu $ make -j$(nproc) 2. Build kernel https://github.com/kvm-riscv/linux 3. Build QEMU VM Cross built in riscv toolchain. $ PKG_CONFIG_LIBDIR=<toolchain pkgconfig path> $ export PKG_CONFIG_SYSROOT_DIR=<toolchain sysroot path> $ ./configure --target-list=riscv64-softmmu --enable-kvm \ --cross-prefix=riscv64-linux-gnu- --disable-libiscsi --disable-glusterfs \ --disable-libusb --disable-usb-redir --audio-drv-list= --disable-opengl \ --disable-libxml2 $ make -j$(nproc) 4. Start emulation $ ./qemu-system-riscv64 -M virt -m 4096M -cpu rv64,x-h=true -nographic \ -name guest=riscv-hyp,debug-threads=on \ -smp 4 \ -bios ./fw_jump.bin \ -kernel ./Image \ -drive file=./hyp.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" 5. Start kvm-acceled QEMU VM in emulation $ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \ -name guest=riscv-guset \ -smp 2 \ -bios none \ -kernel ./Image \ -drive file=./guest.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" Changes since RFC v3 - Rebase on QEMU v5.2.0-rc2 and kvm-riscv linux v15. - Add time scaling support(New patches 13, 14 and 15). - Fix the bug that guest vm can't reboot. Changes since RFC v2 - Fix checkpatch error at target/riscv/sbi_ecall_interface.h. - Add riscv migration support. Changes since RFC v1 - Add separate SBI ecall interface header. - Add riscv32 kvm accel support. Yifei Jiang (15): linux-header: Update linux/kvm.h target/riscv: Add target/riscv/kvm.c to place the public kvm interface target/riscv: Implement function kvm_arch_init_vcpu target/riscv: Implement kvm_arch_get_registers target/riscv: Implement kvm_arch_put_registers target/riscv: Support start kernel directly by KVM hw/riscv: PLIC update external interrupt by KVM when kvm enabled target/riscv: Handle KVM_EXIT_RISCV_SBI exit target/riscv: Add host cpu type target/riscv: Add kvm_riscv_get/put_regs_timer target/riscv: Implement virtual time adjusting with vm state changing target/riscv: Support virtual time context synchronization target/riscv: Introduce dynamic time frequency for virt machine target/riscv: Synchronize vcpu's frequency with KVM target/riscv: Add time frequency migration support hw/intc/sifive_plic.c | 31 +- hw/riscv/virt.c | 26 +- linux-headers/linux/kvm.h | 8 + meson.build | 2 + target/riscv/cpu.c | 13 + target/riscv/cpu.h | 12 + target/riscv/kvm.c | 617 +++++++++++++++++++++++++++++ target/riscv/kvm_riscv.h | 25 ++ target/riscv/machine.c | 23 ++ target/riscv/meson.build | 1 + target/riscv/sbi_ecall_interface.h | 72 ++++ 11 files changed, 817 insertions(+), 13 deletions(-) create mode 100644 target/riscv/kvm.c create mode 100644 target/riscv/kvm_riscv.h create mode 100644 target/riscv/sbi_ecall_interface.h -- 2.19.1

3 25

[PATCH] qemu: backup: Properly delete temporary bitmap after push-mode incremental backup
by Peter Krempa 05 Jan '21

05 Jan '21

Refactor in 0316c28a453ac used incorrect source variable to initialize the variable which holds the name of the bitmap which needs to be deleted after the backup job finishes. This resulted into deleting the source bitmap of the backup rather than the temporary one. Use 'dd->incrementalBitmap' which holds the temporary bitmap name instead of 'dd->backupdisk->incremental' which holds the name of the source bitmap which is used by the backup. Fixes: 0316c28a453ac15f58c61f30359f66ab9a649884 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1908647 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_backup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index b2340eb1cf..c444f8aaba 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -235,7 +235,7 @@ qemuBackupDiskPrepareOneBitmaps(struct qemuBackupDiskData *dd, blockNamedNodeData) < 0) return -1; - dd->domdiskIncrementalBitmap = dd->backupdisk->incremental; + dd->domdiskIncrementalBitmap = dd->incrementalBitmap; } return 0; -- 2.29.2

2 1

[PATCH 1/3] virStorageBackendCopyToFD: remove unused return variable
by Yi Li 05 Jan '21

05 Jan '21

remove unused return variable, The errno will throw by virReportSystemError Signed-off-by: Yi Li <yili(a)winhong.com> --- src/storage/storage_util.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index cf1f33f177..6fc8597733 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -128,7 +128,6 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, bool reflink_copy) { int amtread = -1; - int ret = 0; size_t rbytes = READ_BLOCK_SIZE_DEFAULT; int wbytes = 0; int interval; @@ -138,11 +137,10 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, VIR_AUTOCLOSE inputfd = -1; if ((inputfd = open(inputvol->target.path, O_RDONLY)) < 0) { - ret = -errno; virReportSystemError(errno, _("could not open input path '%s'"), inputvol->target.path); - return ret; + return -1; } #ifdef __linux__ @@ -160,11 +158,10 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, if (reflink_copy) { if (reflinkCloneFile(fd, inputfd) < 0) { - ret = -errno; virReportSystemError(errno, _("failed to clone files from '%s'"), inputvol->target.path); - return ret; + return -1; } else { VIR_DEBUG("btrfs clone finished."); return 0; @@ -178,11 +175,10 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, rbytes = *total; if ((amtread = saferead(inputfd, buf, rbytes)) < 0) { - ret = -errno; virReportSystemError(errno, _("failed reading from file '%s'"), inputvol->target.path); - return ret; + return -1; } *total -= amtread; @@ -195,36 +191,32 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, if (want_sparse && memcmp(buf+offset, zerobuf, interval) == 0) { if (lseek(fd, interval, SEEK_CUR) < 0) { - ret = -errno; virReportSystemError(errno, _("cannot extend file '%s'"), vol->target.path); - return ret; + return -1; } } else if (safewrite(fd, buf+offset, interval) < 0) { - ret = -errno; virReportSystemError(errno, _("failed writing to file '%s'"), vol->target.path); - return ret; + return -1; } } while ((amtleft -= interval) > 0); } if (virFileDataSync(fd) < 0) { - ret = -errno; virReportSystemError(errno, _("cannot sync data to file '%s'"), vol->target.path); - return ret; + return -1; } if (VIR_CLOSE(inputfd) < 0) { - ret = -errno; virReportSystemError(errno, _("cannot close file '%s'"), inputvol->target.path); - return ret; + return -1; } return 0; -- 2.25.3

2 10

[PATCH v2] docs: support qcow2 format in luks encryption volume
by Meina Li 05 Jan '21

05 Jan '21

Signed-off-by: Meina Li <meili(a)redhat.com> --- docs/formatstorageencryption.html.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index ea80a87cfb..7215c307d7 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -128,7 +128,9 @@ <p> Here is an example specifying use of the <code>luks</code> format for - a specific cipher algorithm for volume creation: + a specific cipher algorithm for volume creation. + <span class="since">Since 6.10.0,</span> the <code>target</code> format + can also support <code>qcow2</code> type with <code>luks</code> encryption. </p> <pre> <volume> -- 2.27.0

3 2

[PATCH] virsh-domain: Add quotes around '%s' formatting domain name
by Peter Krempa 05 Jan '21

05 Jan '21

Domain name can contain spaces in which case it's not immediately clear from virsh messages where the boundary of the name is. Enclose all %s formatters in apostrophes as delimiters. Done via the following vim regex: %s/omain %s/omain '%s'/g This patch changes: $ virsh undefine --snapshots-metadata 'OWASP Broken Web Apps VM v1.2' Domain OWASP Broken Web Apps VM v1.2 has been undefined to: $ virsh undefine --snapshots-metadata 'OWASP Broken Web Apps VM v1.2' Domain 'OWASP Broken Web Apps VM v1.2' has been undefined Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/virsh-define-dev-segfault | 2 +- tests/virsh-read-bufsiz | 2 +- tests/virsh-undefine | 8 +- tools/virsh-domain.c | 136 ++++++++++++++++---------------- 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/tests/virsh-define-dev-segfault b/tests/virsh-define-dev-segfault index a7533ba9b0..cc5b461932 100755 --- a/tests/virsh-define-dev-segfault +++ b/tests/virsh-define-dev-segfault @@ -65,7 +65,7 @@ url=test:///default $abs_top_builddir/tools/virsh --connect "$url" 'define D.xml; dumpxml D' > out 2>&1 || fail=1 cat > exp <<EOF || fail=1 -Domain D defined from D.xml +Domain 'D' defined from D.xml $(cat D.xml) diff --git a/tests/virsh-read-bufsiz b/tests/virsh-read-bufsiz index 116eff1c4c..a61816c25b 100755 --- a/tests/virsh-read-bufsiz +++ b/tests/virsh-read-bufsiz @@ -42,7 +42,7 @@ for i in before after; do ( test $i = before && cat sp xml || cat xml sp ) > $in || fail=1 $abs_top_builddir/tools/virsh --connect test:///default define $in > out || fail=1 - printf "Domain newtest defined from $in\n\n" > exp || fail=1 + printf "Domain 'newtest' defined from $in\n\n" > exp || fail=1 compare exp out || fail=1 done diff --git a/tests/virsh-undefine b/tests/virsh-undefine index 998d4d3268..dbbb367391 100755 --- a/tests/virsh-undefine +++ b/tests/virsh-undefine @@ -37,7 +37,7 @@ sed '/^Persistent/n; /:/d' < out1 > out cat <<\EOF > exp || fail=1 Persistent: yes -Domain test has been undefined +Domain 'test' has been undefined Persistent: no @@ -52,7 +52,7 @@ sed '/^Persistent/n; /:/d' < out1 > out cat <<\EOF > exp || fail=1 Persistent: yes -Domain 1 has been undefined +Domain '1' has been undefined Persistent: no @@ -64,9 +64,9 @@ $abs_top_builddir/tools/virsh -c test:///default \ 'shutdown test; undefine test; dominfo test' > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > expout || fail=1 -Domain test is being shutdown +Domain 'test' is being shutdown -Domain test has been undefined +Domain 'test' has been undefined error: failed to get domain 'test' diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1ef9b8d606..2bb136333f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1117,17 +1117,17 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd) if (virDomainSetAutostart(dom, autostart) < 0) { if (autostart) - vshError(ctl, _("Failed to mark domain %s as autostarted"), name); + vshError(ctl, _("Failed to mark domain '%s' as autostarted"), name); else - vshError(ctl, _("Failed to unmark domain %s as autostarted"), name); + vshError(ctl, _("Failed to unmark domain '%s' as autostarted"), name); virshDomainFree(dom); return false; } if (autostart) - vshPrintExtra(ctl, _("Domain %s marked as autostarted\n"), name); + vshPrintExtra(ctl, _("Domain '%s' marked as autostarted\n"), name); else - vshPrintExtra(ctl, _("Domain %s unmarked as autostarted\n"), name); + vshPrintExtra(ctl, _("Domain '%s' unmarked as autostarted\n"), name); virshDomainFree(dom); return true; @@ -2987,7 +2987,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, return false; } - vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom)); + vshPrintExtra(ctl, _("Connected to domain '%s'\n"), virDomainGetName(dom)); vshPrintExtra(ctl, _("Escape character is %s"), priv->escapeChar); if (priv->escapeChar[0] == '^') vshPrintExtra(ctl, " (Ctrl + %c)", priv->escapeChar[1]); @@ -3427,9 +3427,9 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainSuspend(dom) == 0) { - vshPrintExtra(ctl, _("Domain %s suspended\n"), name); + vshPrintExtra(ctl, _("Domain '%s' suspended\n"), name); } else { - vshError(ctl, _("Failed to suspend domain %s"), name); + vshError(ctl, _("Failed to suspend domain '%s'"), name); ret = false; } @@ -3501,12 +3501,12 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) } if (virDomainPMSuspendForDuration(dom, suspendTarget, duration, 0) < 0) { - vshError(ctl, _("Domain %s could not be suspended"), + vshError(ctl, _("Domain '%s' could not be suspended"), virDomainGetName(dom)); goto cleanup; } - vshPrintExtra(ctl, _("Domain %s successfully suspended"), + vshPrintExtra(ctl, _("Domain '%s' successfully suspended"), virDomainGetName(dom)); ret = true; @@ -3548,12 +3548,12 @@ cmdDomPMWakeup(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainPMWakeup(dom, flags) < 0) { - vshError(ctl, _("Domain %s could not be woken up"), + vshError(ctl, _("Domain '%s' could not be woken up"), virDomainGetName(dom)); goto cleanup; } - vshPrintExtra(ctl, _("Domain %s successfully woken up"), + vshPrintExtra(ctl, _("Domain '%s' successfully woken up"), virDomainGetName(dom)); ret = true; @@ -3930,10 +3930,10 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) out: if (rc == 0) { - vshPrintExtra(ctl, _("Domain %s has been undefined\n"), name); + vshPrintExtra(ctl, _("Domain '%s' has been undefined\n"), name); ret = true; } else { - vshError(ctl, _("Failed to undefine domain %s"), name); + vshError(ctl, _("Failed to undefine domain '%s'"), name); goto cleanup; } @@ -4150,12 +4150,12 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) if ((nfds ? virDomainCreateWithFiles(dom, nfds, fds, flags) : (flags ? virDomainCreateWithFlags(dom, flags) : virDomainCreate(dom))) < 0) { - vshError(ctl, _("Failed to start domain %s"), virDomainGetName(dom)); + vshError(ctl, _("Failed to start domain '%s'"), virDomainGetName(dom)); goto cleanup; } started: - vshPrintExtra(ctl, _("Domain %s started\n"), + vshPrintExtra(ctl, _("Domain '%s' started\n"), virDomainGetName(dom)); #ifndef WIN32 if (console && !cmdRunConsole(ctl, dom, NULL, 0)) @@ -4255,7 +4255,7 @@ doSave(void *opaque) if (((flags || xml) ? virDomainSaveFlags(dom, to, xml, flags) : virDomainSave(dom, to)) < 0) { - vshError(ctl, _("Failed to save domain %s to %s"), name, to); + vshError(ctl, _("Failed to save domain '%s' to %s"), name, to); goto out; } @@ -4512,7 +4512,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); if (!data.ret) - vshPrintExtra(ctl, _("\nDomain %s saved to %s\n"), name, to); + vshPrintExtra(ctl, _("\nDomain '%s' saved to %s\n"), name, to); cleanup: virshDomainFree(dom); @@ -4771,7 +4771,7 @@ doManagedsave(void *opaque) goto out; if (virDomainManagedSave(dom, flags) < 0) { - vshError(ctl, _("Failed to save domain %s state"), name); + vshError(ctl, _("Failed to save domain '%s' state"), name); goto out; } @@ -4819,7 +4819,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); if (!data.ret) - vshPrintExtra(ctl, _("\nDomain %s state saved by libvirt\n"), name); + vshPrintExtra(ctl, _("\nDomain '%s' state saved by libvirt\n"), name); cleanup: virshDomainFree(dom); @@ -4863,15 +4863,15 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) if (hassave) { if (virDomainManagedSaveRemove(dom, 0) < 0) { - vshError(ctl, _("Failed to remove managed save image for domain %s"), + vshError(ctl, _("Failed to remove managed save image for domain '%s'"), name); goto cleanup; } else - vshPrintExtra(ctl, _("Removed managedsave image for domain %s"), name); + vshPrintExtra(ctl, _("Removed managedsave image for domain '%s'"), name); } else - vshPrintExtra(ctl, _("Domain %s has no manage save image; removal skipped"), + vshPrintExtra(ctl, _("Domain '%s' has no manage save image; removal skipped"), name); ret = true; @@ -4929,7 +4929,7 @@ cmdManagedSaveEdit(vshControl *ctl, const vshCmd *cmd) #define EDIT_GET_XML virDomainManagedSaveGetXMLDesc(dom, getxml_flags) #define EDIT_NOT_CHANGED \ do { \ - vshPrintExtra(ctl, _("Managed save image of domain %s XML configuration " \ + vshPrintExtra(ctl, _("Managed save image of domain '%s' XML configuration " \ "not changed.\n"), virDomainGetName(dom)); \ ret = true; \ goto edit_cleanup; \ @@ -4938,7 +4938,7 @@ cmdManagedSaveEdit(vshControl *ctl, const vshCmd *cmd) (virDomainManagedSaveDefineXML(dom, doc_edited, define_flags) == 0) #include "virsh-edit.c" - vshPrintExtra(ctl, _("Managed save image of Domain %s XML configuration edited.\n"), + vshPrintExtra(ctl, _("Managed save image of Domain '%s' XML configuration edited.\n"), virDomainGetName(dom)); ret = true; @@ -5057,7 +5057,7 @@ cmdManagedSaveDefine(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrintExtra(ctl, _("Managed save state file of domain %s updated.\n"), + vshPrintExtra(ctl, _("Managed save state file of domain '%s' updated.\n"), virDomainGetName(dom)); ret = true; @@ -5485,12 +5485,12 @@ doDump(void *opaque) if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) { if (virDomainCoreDumpWithFormat(dom, to, dumpformat, flags) < 0) { - vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); + vshError(ctl, _("Failed to core dump domain '%s' to %s"), name, to); goto out; } } else { if (virDomainCoreDump(dom, to, flags) < 0) { - vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); + vshError(ctl, _("Failed to core dump domain '%s' to %s"), name, to); goto out; } } @@ -5543,7 +5543,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); if (!data.ret) - vshPrintExtra(ctl, _("\nDomain %s dumped to %s\n"), name, to); + vshPrintExtra(ctl, _("\nDomain '%s' dumped to %s\n"), name, to); cleanup: virshDomainFree(dom); @@ -5659,7 +5659,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) cbdata.fd = fd; if (virStreamRecvAll(st, virshStreamSink, &cbdata) < 0) { - vshError(ctl, _("could not receive data from domain %s"), name); + vshError(ctl, _("could not receive data from domain '%s'"), name); goto cleanup; } @@ -5669,7 +5669,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) } if (virStreamFinish(st) < 0) { - vshError(ctl, _("cannot close stream on domain %s"), name); + vshError(ctl, _("cannot close stream on domain '%s'"), name); goto cleanup; } @@ -5882,9 +5882,9 @@ cmdResume(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainResume(dom) == 0) { - vshPrintExtra(ctl, _("Domain %s resumed\n"), name); + vshPrintExtra(ctl, _("Domain '%s' resumed\n"), name); } else { - vshError(ctl, _("Failed to resume domain %s"), name); + vshError(ctl, _("Failed to resume domain '%s'"), name); ret = false; } @@ -5964,9 +5964,9 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) else rv = virDomainShutdown(dom); if (rv == 0) { - vshPrintExtra(ctl, _("Domain %s is being shutdown\n"), name); + vshPrintExtra(ctl, _("Domain '%s' is being shutdown\n"), name); } else { - vshError(ctl, _("Failed to shutdown domain %s"), name); + vshError(ctl, _("Failed to shutdown domain '%s'"), name); goto cleanup; } @@ -6044,9 +6044,9 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) goto cleanup; if (virDomainReboot(dom, flags) == 0) { - vshPrintExtra(ctl, _("Domain %s is being rebooted\n"), name); + vshPrintExtra(ctl, _("Domain '%s' is being rebooted\n"), name); } else { - vshError(ctl, _("Failed to reboot domain %s"), name); + vshError(ctl, _("Failed to reboot domain '%s'"), name); goto cleanup; } @@ -6086,9 +6086,9 @@ cmdReset(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainReset(dom, 0) == 0) { - vshPrintExtra(ctl, _("Domain %s was reset\n"), name); + vshPrintExtra(ctl, _("Domain '%s' was reset\n"), name); } else { - vshError(ctl, _("Failed to reset domain %s"), name); + vshError(ctl, _("Failed to reset domain '%s'"), name); ret = false; } @@ -8311,7 +8311,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrintExtra(ctl, _("Domain %s created from %s\n"), + vshPrintExtra(ctl, _("Domain '%s' created from %s\n"), virDomainGetName(dom), from); #ifndef WIN32 if (console) @@ -8374,7 +8374,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) VIR_FREE(buffer); if (dom != NULL) { - vshPrintExtra(ctl, _("Domain %s defined from %s\n"), + vshPrintExtra(ctl, _("Domain '%s' defined from %s\n"), virDomainGetName(dom), from); virshDomainFree(dom); } else { @@ -8427,9 +8427,9 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) result = virDomainDestroy(dom); if (result == 0) { - vshPrintExtra(ctl, _("Domain %s destroyed\n"), name); + vshPrintExtra(ctl, _("Domain '%s' destroyed\n"), name); } else { - vshError(ctl, _("Failed to destroy domain %s"), name); + vshError(ctl, _("Failed to destroy domain '%s'"), name); ret = false; } @@ -9724,10 +9724,10 @@ virshEventQemuPrint(virConnectPtr conn G_GNUC_UNUSED, if (virTimeStringNowRaw(timestamp) < 0) timestamp[0] = '\0'; - vshPrint(data->ctl, "%s: event %s for domain %s: %s\n", + vshPrint(data->ctl, "%s: event %s for domain '%s': %s\n", timestamp, event, virDomainGetName(dom), NULLSTR(details)); } else { - vshPrint(data->ctl, "event %s at %lld.%06u for domain %s: %s\n", + vshPrint(data->ctl, "event %s at %lld.%06u for domain '%s': %s\n", event, seconds, micros, virDomainGetName(dom), NULLSTR(details)); } @@ -9886,7 +9886,7 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) return false; } - vshPrintExtra(ctl, _("Domain %s attached to pid %u\n"), + vshPrintExtra(ctl, _("Domain '%s' attached to pid %u\n"), virDomainGetName(dom), pid_value); virshDomainFree(dom); return true; @@ -12766,7 +12766,7 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) #define EDIT_GET_XML virDomainGetXMLDesc(dom, query_flags) #define EDIT_NOT_CHANGED \ do { \ - vshPrintExtra(ctl, _("Domain %s XML configuration not changed.\n"), \ + vshPrintExtra(ctl, _("Domain '%s' XML configuration not changed.\n"), \ virDomainGetName(dom)); \ ret = true; \ goto edit_cleanup; \ @@ -12781,7 +12781,7 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) #include "virsh-edit.c" #undef EDIT_RELAX - vshPrintExtra(ctl, _("Domain %s XML configuration edited.\n"), + vshPrintExtra(ctl, _("Domain '%s' XML configuration edited.\n"), virDomainGetName(dom_edited)); ret = true; @@ -13088,7 +13088,7 @@ virshEventGenericPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event '%s' for domain %s\n"), + virBufferAsprintf(&buf, _("event '%s' for domain '%s'\n"), ((virshDomEventData *) opaque)->cb->name, virDomainGetName(dom)); virshEventPrint(opaque, &buf); @@ -13103,7 +13103,7 @@ virshEventLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'lifecycle' for domain %s: %s %s\n"), + virBufferAsprintf(&buf, _("event 'lifecycle' for domain '%s': %s %s\n"), virDomainGetName(dom), virshDomainEventToString(event), virshDomainEventDetailToString(event, detail)); @@ -13118,7 +13118,7 @@ virshEventRTCChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'rtc-change' for domain %s: %lld\n"), + virBufferAsprintf(&buf, _("event 'rtc-change' for domain '%s': %lld\n"), virDomainGetName(dom), utcoffset); virshEventPrint(opaque, &buf); @@ -13132,7 +13132,7 @@ virshEventWatchdogPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'watchdog' for domain %s: %s\n"), + virBufferAsprintf(&buf, _("event 'watchdog' for domain '%s': %s\n"), virDomainGetName(dom), virshDomainEventWatchdogToString(action)); virshEventPrint(opaque, &buf); @@ -13148,7 +13148,7 @@ virshEventIOErrorPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'io-error' for domain %s: %s (%s) %s\n"), + virBufferAsprintf(&buf, _("event 'io-error' for domain '%s': %s (%s) %s\n"), virDomainGetName(dom), srcPath, devAlias, @@ -13169,7 +13169,7 @@ virshEventGraphicsPrint(virConnectPtr conn G_GNUC_UNUSED, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; - virBufferAsprintf(&buf, _("event 'graphics' for domain %s: " + virBufferAsprintf(&buf, _("event 'graphics' for domain '%s': " "%s local[%s %s %s] remote[%s %s %s] %s\n"), virDomainGetName(dom), virshGraphicsPhaseToString(phase), @@ -13199,7 +13199,7 @@ virshEventIOErrorReasonPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'io-error-reason' for domain %s: " + virBufferAsprintf(&buf, _("event 'io-error-reason' for domain '%s': " "%s (%s) %s due to %s\n"), virDomainGetName(dom), srcPath, @@ -13219,7 +13219,7 @@ virshEventBlockJobPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event '%s' for domain %s: %s for %s %s\n"), + virBufferAsprintf(&buf, _("event '%s' for domain '%s': %s for %s %s\n"), ((virshDomEventData *) opaque)->cb->name, virDomainGetName(dom), virshDomainBlockJobToString(type), @@ -13239,7 +13239,7 @@ virshEventDiskChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'disk-change' for domain %s disk %s: " + virBufferAsprintf(&buf, _("event 'disk-change' for domain '%s' disk %s: " "%s -> %s: %s\n"), virDomainGetName(dom), alias, @@ -13258,7 +13258,7 @@ virshEventTrayChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'tray-change' for domain %s disk %s: %s\n"), + virBufferAsprintf(&buf, _("event 'tray-change' for domain '%s' disk %s: %s\n"), virDomainGetName(dom), alias, virshDomainEventTrayChangeToString(reason)); @@ -13284,7 +13284,7 @@ virshEventBalloonChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'balloon-change' for domain %s: %lluKiB\n"), + virBufferAsprintf(&buf, _("event 'balloon-change' for domain '%s': %lluKiB\n"), virDomainGetName(dom), actual); virshEventPrint(opaque, &buf); @@ -13298,7 +13298,7 @@ virshEventDeviceRemovedPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'device-removed' for domain %s: %s\n"), + virBufferAsprintf(&buf, _("event 'device-removed' for domain '%s': %s\n"), virDomainGetName(dom), alias); virshEventPrint(opaque, &buf); @@ -13312,7 +13312,7 @@ virshEventDeviceAddedPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'device-added' for domain %s: %s\n"), + virBufferAsprintf(&buf, _("event 'device-added' for domain '%s': %s\n"), virDomainGetName(dom), alias); virshEventPrint(opaque, &buf); @@ -13329,7 +13329,7 @@ virshEventTunablePrint(virConnectPtr conn G_GNUC_UNUSED, size_t i; char *value; - virBufferAsprintf(&buf, _("event 'tunable' for domain %s:\n"), + virBufferAsprintf(&buf, _("event 'tunable' for domain '%s':\n"), virDomainGetName(dom)); for (i = 0; i < nparams; i++) { value = virTypedParameterToString(&params[i]); @@ -13365,7 +13365,7 @@ virshEventAgentLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'agent-lifecycle' for domain %s: state: " + virBufferAsprintf(&buf, _("event 'agent-lifecycle' for domain '%s': state: " "'%s' reason: '%s'\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventAgentLifecycleStateTypeToString(state)), @@ -13381,7 +13381,7 @@ virshEventMigrationIterationPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'migration-iteration' for domain %s: " + virBufferAsprintf(&buf, _("event 'migration-iteration' for domain '%s': " "iteration: '%d'\n"), virDomainGetName(dom), iteration); @@ -13400,7 +13400,7 @@ virshEventJobCompletedPrint(virConnectPtr conn G_GNUC_UNUSED, size_t i; char *value; - virBufferAsprintf(&buf, _("event 'job-completed' for domain %s:\n"), + virBufferAsprintf(&buf, _("event 'job-completed' for domain '%s':\n"), virDomainGetName(dom)); for (i = 0; i < nparams; i++) { value = virTypedParameterToString(&params[i]); @@ -13421,7 +13421,7 @@ virshEventDeviceRemovalFailedPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'device-removal-failed' for domain %s: %s\n"), + virBufferAsprintf(&buf, _("event 'device-removal-failed' for domain '%s': %s\n"), virDomainGetName(dom), alias); virshEventPrint(opaque, &buf); @@ -13443,7 +13443,7 @@ virshEventMetadataChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'metadata-change' for domain %s: %s %s\n"), + virBufferAsprintf(&buf, _("event 'metadata-change' for domain '%s': %s %s\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventMetadataChangeTypeTypeToString(type)), NULLSTR(nsuri)); @@ -13462,7 +13462,7 @@ virshEventBlockThresholdPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'block-threshold' for domain %s: " + virBufferAsprintf(&buf, _("event 'block-threshold' for domain '%s': " "dev: %s(%s) %llu %llu\n"), virDomainGetName(dom), dev, NULLSTR(path), threshold, excess); @@ -13494,7 +13494,7 @@ virshEventMemoryFailurePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'memory-failure' for domain %s:\n" + virBufferAsprintf(&buf, _("event 'memory-failure' for domain '%s':\n" "recipient: %s\naction: %s\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventMemoryFailureRecipientTypeTypeToString(recipient)), -- 2.29.2

2 1

[PATCH v1] docs: migration: remove xenmigr
by Olaf Hering 05 Jan '21

05 Jan '21

xenmigr was for xend Fixes commit 1dac5fbbbb06a0341e8087dc33af75c8352d77a4 Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- docs/migration.html.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index ac38c6e13d..627200f96a 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -491,7 +491,6 @@ virsh migrate web1 xen+tls://desthost/system eg using secondary network interface virsh migrate web1 qemu://desthost/system tcp://10.0.0.1/ -virsh migrate web1 xen+tcp://desthost/system xenmigr:10.0.0.1/ </pre> <p> @@ -562,13 +561,8 @@ syntax: virsh migrate GUESTNAME HV-URI eg using same libvirt URI for all connections -virsh migrate --direct web1 xenmigr://desthost/ </pre> - <p> - Supported by Xen driver - </p> - <h3><a id="nativepeer2peer">Native migration, peer2peer between two libvirtd servers</a></h3> <p>

2 1

[PATCH v2] qemu: Don't prealloc mem for real NVDIMMs
by Michal Privoznik 05 Jan '21

05 Jan '21

Currently, we configure QEMU to prealloc memory almost by default. Well, by default for NVDIMMs, hugepages and if user asked us to (via memoryBacking <allocation mode="immediate"/>). However, when guest's NVDIMM is backed by real life NVDIMM this approach is not the best. In this case users should put <pmem/> into the <memory/> device <source/>, like this: <memory model='nvdimm' access='shared'> <source> <path>/dev/pmem0</path> <pmem/> </source> </memory> Instructing QEMU to do prealloc in this case means that each page of the NVDIMM is "touched" (the first byte is read and written back - see QEMU commit v2.9.0-rc1~26^2) which cripples device wear. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1894053 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://www.redhat.com/archives/libvir-list/2020-November/msg01568.html diff to v1: - I've dropped the first hunk of v1 which forbade prealloc even if user requested it explicitly. src/qemu/qemu_command.c | 5 ++++- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b06a086e18..f572ed64c1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3085,7 +3085,10 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, if (mem->nvdimmPath) { memPath = g_strdup(mem->nvdimmPath); - prealloc = true; + /* If the NVDIMM is a real device then there's nothing to prealloc. + * If anyhing, we would be only wearing off the device. */ + if (!mem->nvdimmPmem) + prealloc = true; } else if (useHugepage) { if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &memPath) < 0) return -1; diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index cac02a6f6d..fb4ae4b518 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\ -prealloc=yes,size=536870912,pmem=yes \ +size=536870912,pmem=yes \ -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -- 2.26.2

3 2

[PATCH] qemu: Properly handle setting of <iotune> for empty cdrom
by Peter Krempa 05 Jan '21

05 Jan '21

When starting a VM with an empty cdrom which has <iotune> configured the startup fails as qemu is not happy about setting tuning for an empty drive: error: internal error: unable to execute 'block_set_io_throttle', unexpected error: 'Device has no medium' Resolve this by skipping the setting of throttling for empty drives and updating the throttling when new medium is inserted into the drive. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/111 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_hotplug.c | 10 ++++++++++ src/qemu/qemu_process.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9b93f256e8..57635cd419 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -558,6 +558,16 @@ qemuDomainChangeMediaBlockdev(virQEMUDriverPtr driver, nodename); } + /* set throttling for the new image */ + if (rc == 0 && + !virStorageSourceIsEmpty(newsrc) && + qemuDiskConfigBlkdeviotuneEnabled(disk)) { + rc = qemuMonitorSetBlockIoThrottle(priv->mon, NULL, + diskPriv->qomName, + &disk->blkdeviotune, + true, true, true); + } + if (rc == 0) rc = qemuMonitorBlockdevTrayClose(priv->mon, diskPriv->qomName); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e7421b415f..414e9327d2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6838,6 +6838,10 @@ qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriverPtr driver, if (qemuDiskBusIsSD(disk->bus)) continue; + /* Setting throttling for empty drives fails */ + if (virStorageSourceIsEmpty(disk->src)) + continue; + if (!qemuDiskConfigBlkdeviotuneEnabled(disk)) continue; -- 2.29.2

2 1

[PATCH] networkGetDHCPLeases: Don't assign @ipdef_tmp twice
by Michal Privoznik 05 Jan '21

05 Jan '21

When rewriting the function, I've mistakenly declared a variable and assigned it to itself. Let's initialize the variable properly. Fixes: 5fb6d98c881c42ab41ca72060217b846949a438f Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/network/bridge_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 22d7d330a3..a7c5aade14 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4155,7 +4155,7 @@ networkGetDHCPLeases(virNetworkPtr net, /* Obtain prefix */ for (j = 0; j < def->nips; j++) { - virNetworkIPDefPtr ipdef_tmp = ipdef_tmp = &def->ips[j]; + virNetworkIPDefPtr ipdef_tmp = &def->ips[j]; if (ipv6 && VIR_SOCKET_ADDR_IS_FAMILY(&ipdef_tmp->address, AF_INET6)) { -- 2.26.2

1 0

[PATCH 00/10] Fix NSS plugin and net-dhcp-get-leases wrt to infinite leases
by Michal Privoznik 05 Jan '21

05 Jan '21

Some things are broken when using leases that don't expire. We don't store "expiry-time" in corresponding $brname.status file which sets off a spiral and we get errors from other places which expect it to be there always. These patches make sure that the attribute is always there. I've also implemented another approach, which puts "expiry-time" into the file only if not infinite and fixed the other places which expect it: https://gitlab.com/MichalPrivoznik/libvirt/-/commits/leases_docs/ but I like this version more. Michal Prívozník (10): docs: Document ability to configure lease time leaseshelper: Report errors on failure virlease: Rework virLeaseReadCustomLeaseFile() virlease: Use virTrimSpaces() instead of open coded alternative virlease: Allow infinite lease expiry time network: Drop @custom_lease_file_len variable from networkGetDHCPLeases() networkGetDHCPLeases: Use VIR_APPEND_ELEMENT() instead of VIR_INSERT_ELEMENT() network: Rework networkGetDHCPLeases() networkGetDHCPLeases: Handle leases with infinite expiry time nss: handle leases with infinite expiry time docs/formatnetwork.html.in | 21 ++++++++- src/network/bridge_driver.c | 79 +++++++++++++++++----------------- src/network/leaseshelper.c | 2 + src/util/virlease.c | 33 +++++++------- tests/nssdata/virbr0.status | 7 +++ tests/nsstest.c | 2 +- tools/nss/libvirt_nss_leases.c | 4 +- 7 files changed, 87 insertions(+), 61 deletions(-) -- 2.26.2

3 13

[libvirt PATCH v2 0/5] vmx: Don't error out on missing filename for cdrom
by Martin Kletzander 05 Jan '21

05 Jan '21

This is perfectly valid in VMWare and the VM just boots with an empty drive. We used to just skip the whole drive before, but since we changed how we parse empty cdrom drives this now results in an error and the user not being able to even dump the XML. Instead of erroring out, just keep the drive empty. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1903953 v2: - Do not report and reset an error, but handle it more nicely. v1: - https://www.redhat.com/archives/libvir-list/2020-December/msg00840.html Martin Kletzander (5): esx: Unindent unnecessary conditional branch tests: Use g_autofree in testParseVMXFileName vmx: Make virVMXParseFileName return an integer vmx: Allow missing cdrom image file in virVMXParseFileName vmx: Treat missing cdrom-image as empty drive src/esx/esx_driver.c | 160 ++++++++++-------- src/vmware/vmware_conf.c | 10 +- src/vmx/vmx.c | 25 +-- src/vmx/vmx.h | 5 +- .../vmx2xmldata/vmx2xml-cdrom-ide-missing.vmx | 6 + tests/vmx2xmltest.c | 36 ++-- 6 files changed, 136 insertions(+), 106 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-missing.vmx -- 2.29.2

3 8

[libvirt PATCH] docs: Fix dead link
by Tim Wiederhake 05 Jan '21

05 Jan '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- docs/coding-style.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/coding-style.rst b/docs/coding-style.rst index b3ac070fac..55dfa196a2 100644 --- a/docs/coding-style.rst +++ b/docs/coding-style.rst @@ -939,7 +939,7 @@ ok: Although libvirt does not encourage the Linux kernel wind/unwind style of multiple labels, there's a good general discussion of the issue archived at -`KernelTrap <http://kerneltrap.org/node/553/2131>`__ +`KernelTrap <https://web.archive.org/web/20130521051957/http://kerneltrap.org/node/553/2…>`__ When using goto, please use one of these standard labels if it makes sense: -- 2.26.2

3 2

[PATCH] update ci dockerfile from Leap 15.1 to 15.2
by Cho, Yu-Chen 05 Jan '21

05 Jan '21

Signed-off-by: Cho, Yu-Chen <acho(a)suse.com> --- .gitlab-ci.yml | 14 +++++++------- ...e-151.Dockerfile => ci-opensuse-152.Dockerfile} | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename ci/containers/{ci-opensuse-151.Dockerfile => ci-opensuse-152.Dockerfile} (98%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2d5545f0f..30a0b23381 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,10 +160,10 @@ x64-fedora-rawhide-container: variables: NAME: fedora-rawhide -x64-opensuse-151-container: +x64-opensuse-152-container: <<: *container_job_definition variables: - NAME: opensuse-151 + NAME: opensuse-152 x64-ubuntu-1804-container: <<: *container_job_definition @@ -365,12 +365,12 @@ x64-fedora-rawhide-clang: CC: clang RPM: skip -x64-opensuse-151: +x64-opensuse-152: <<: *native_build_job_definition needs: - - x64-opensuse-151-container + - x64-opensuse-152-container variables: - NAME: opensuse-151 + NAME: opensuse-152 RPM: skip x64-ubuntu-1804: @@ -533,9 +533,9 @@ website: codestyle: stage: builds - image: $CI_REGISTRY_IMAGE/ci-opensuse-151:latest + image: $CI_REGISTRY_IMAGE/ci-opensuse-152:latest needs: - - x64-opensuse-151-container + - x64-opensuse-152-container before_script: - *script_variables script: diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-152.Dockerfile similarity index 98% rename from ci/containers/ci-opensuse-151.Dockerfile rename to ci/containers/ci-opensuse-152.Dockerfile index 9458d2de0c..def45cbe3f 100644 --- a/ci/containers/ci-opensuse-151.Dockerfile +++ b/ci/containers/ci-opensuse-152.Dockerfile @@ -3,7 +3,7 @@ # $ lcitool dockerfile opensuse-151 libvirt # # https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… -FROM registry.opensuse.org/opensuse/leap:15.1 +FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ zypper install -y \ -- 2.29.2

2 1

[libvirt PATCH 0/2] rpm: minor swtpm fixes
by Daniel P. Berrangé 05 Jan '21

05 Jan '21

Originally reported at https://src.fedoraproject.org/rpms/libvirt/pull-request/9 Daniel P. Berrangé (2): rpm: ensure swtpm tools are installed with QEMU rpm: fix ownership of the swtpm log directory libvirt.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.29.2

2 4

[PATCH] Enable VMware driver by default
by Michal Privoznik 05 Jan '21

05 Jan '21

During rewrite to meson it was mistakenly disabled. Originally, we had: LIBVIRT_ARG_WITH_FEATURE([VMWARE], [VMware], [yes]) which enabled the driver by default. But in meson we are checking whether the 'driver_vmware' option is enabled without anything enabling it automagically. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3f3412975b..b5164f68ed 100644 --- a/meson.build +++ b/meson.build @@ -1790,7 +1790,7 @@ if not get_option('driver_vbox').disabled() and conf.has('WITH_LIBVIRTD') conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir')) endif -if get_option('driver_vmware').enabled() +if not get_option('driver_vmware').disabled() conf.set('WITH_VMWARE', 1) conf.set('WITH_VMX', 1) endif -- 2.26.2

2 1

[PATCH] Fix wrong use of path variable
by liyalei 05 Jan '21

05 Jan '21

From: liyalei <liyl43(a)chinatelecom.cn> --- src/util/virnetdevopenvswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index d380b0cf22..7eabaa763d 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -494,7 +494,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, if (server) { virCommandAddArgList(cmd, "--no-headings", "--columns=name", "find", "Interface", NULL); - virCommandAddArgPair(cmd, "options:vhost-server-path", "path"); + virCommandAddArgPair(cmd, "options:vhost-server-path", path); } else { const char *tmpIfname = NULL; -- 2.27.0

3 2

[PATCH 0/5] Fix qemuNodeGetSecurityModel() and some related cleanups
by Michal Privoznik 04 Jan '21

04 Jan '21

While I'd love to give more context, I can't - I've found these on a stale branch. However, they are still valid and worth of merging. Michal Prívozník (5): qemu: Use virStrcpy in qemuNodeGetSecurityModel() qemu: Obtain @caps only after ACL check in qemuNodeGetSecurityModel qemu: Fix retval if ACL check fails in qemuNodeGetSecurityModel domain_conf: Parse full length of some <seclabel/> attributes use more virStrcpy() and virStrcpyStatic() src/conf/domain_conf.c | 6 ++---- src/libvirt-lxc.c | 5 ++--- src/qemu/qemu_driver.c | 23 +++++++++-------------- src/remote/remote_driver.c | 12 ++++-------- src/security/security_selinux.c | 3 +-- 5 files changed, 18 insertions(+), 31 deletions(-) -- 2.26.2

2 6

Release of libvirt-6.5.0
by Daniel Veillard 04 Jan '21

04 Jan '21

Half a day late, but I pushed the 6.5.0 release out, it is as usual available as a signed tarball and source rpms from the server: https://libvirt.org/sources/ I also tagged and pushed the 6.5.0 python bindings that one can find at https://libvirt.org/sources/python/ This release includes a number of new features and some improvement, as well as a crash which had made its way in 6.4.0. It will also be my last release of libvirt after close to 15 years, so expect new releases to be signed by Jiri Denemark from now on. * New Features: - Allow firmware blobs configuration QEMU offers a way to tweak how firmware configures itself and/or provide new configuration blobs. New ``<sysinfo/>`` type is introduced that will hold these new blobs. It's possible to either specify new value as a string or provide a filename which contents then serve as the value. - nodedev: Add ability to create mediated devices Mediated devices can now be created with ``virNodeDeviceCreateXML()``. This functionality requires the ``mdevctl`` utility to be installed. The XML schema for node devices was expanded to support attributes for mediated devices. - QEMU: add TPM Proxy device support libvirt can now create guests using a new device type called "TPM Proxy". The TPM Proxy connects to a TPM Resource Manager present in the host, enabling the guest to run in secure virtual machine mode with the help of an Ultravisor. Adding a TPM Proxy to a pSeries guest brings no security benefits unless the guest is running on a PPC64 host that has Ultravisor and TPM Resource Manager support. Only one TPM Proxy is allowed per guest. A guest using a TPM Proxy device can instantiate another TPM device at the same time. This device is supported only for pSeries guests via the new 'spapr-tpm-proxy' model of the TPM 'passthrough' backend. - virhook: Support hooks placed in several files Running all scripts from directory /etc/libvirt/hooks/<driver>.d in alphabetical order. Hook script in old place will be executed as first for backward compatibility. - qemu: Add support for migratable host-passthrough CPU QEMU 2.12 made it possible for guests to use a migration-friendly version of the host-passthrough CPU. This feature is now exposed by libvirt. * Improvements: - network: Support NAT with IPv6 It's now possible to use ``<nat ipv6="yes"/>`` in a libvirt network. - qemu: Auto-fill NUMA information for incomplete topologies If the NUMA topology is not fully described in the guest XML, libvirt will complete it by putting all unspecified CPUs in the first NUMA node. This is only done in the QEMU binary itself supports disjointed CPU ranges for NUMA nodes. - qemu: Assign hostdev-backed interfaces to PCIe slots All SR-IOV capable devices are PCIe, so when their VFs are assigned to guests they should end up in PCIe slots rather than conventional PCI ones. * Bug fixes: - qemu: fixed crash in ``qemuDomainBlockCommit`` This release fixes a regression which was introduced in libvirt v6.4.0 where libvirtd always crashes when a block commit of a disk is requested. - qemu: fixed zPCI address auto generation on s390 Removes the correlation between the zPCI address attributes uid and fid. Fixes the validation and autogeneration of zPCI address attributes. - qemu: Skip pre-creation of NVMe disks during migration libvirt has no way to create NVMe devices on the target host, so it now just makes sure they exist and let the migration proceed in that case. Thanks everybody for the help on putting this release out, and the gazillion ones before :-) Enjoy and stay safe ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

5 6

[PATCH] kbase: debuglogs: Fix typo in unprivileged libvirtd config path
by Tomáš Janoušek 04 Jan '21

04 Jan '21

Signed-off-by: Tomáš Janoušek <tomi(a)nomi.cz> --- docs/kbase/debuglogs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/debuglogs.rst b/docs/kbase/debuglogs.rst index f3937bc337..3fb06bedc3 100644 --- a/docs/kbase/debuglogs.rst +++ b/docs/kbase/debuglogs.rst @@ -68,7 +68,7 @@ variable: However, when you are using the session mode ``qemu:///session`` or you run the ``libvirtd`` as unprivileged user you will find configuration file under -``$XDG_CONFIG_HOME/libvirt/libvirt.conf``. +``$XDG_CONFIG_HOME/libvirt/libvirtd.conf``. Runtime setting ^^^^^^^^^^^^^^^ -- Tomáš Janoušek, a.k.a. Pivník, a.k.a. Liskni_si, https://work.lisk.in/

2 1

[PATCH] qemu: Drop has_ccw_address from _qemuAgentDiskAddress
by Michal Privoznik 04 Jan '21

04 Jan '21

In recent patches new mambers to _qemuAgentDiskAddress struct were introduced to keep optional CCW address sent by the guest agent. These two members are a struct to store CCW address into and a boolean to keep track whether the CCW address is valid. Well, we can hold the same information with a pointer - instead of storing the CCW address structure let's keep just a pointer to it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_agent.c | 18 ++++++++++++------ src/qemu/qemu_agent.h | 3 +-- src/qemu/qemu_driver.c | 9 +++------ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index b155896e78..af0397e6e2 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1824,6 +1824,7 @@ qemuAgentDiskAddressFree(qemuAgentDiskAddressPtr info) g_free(info->serial); g_free(info->bus_type); g_free(info->devnode); + g_free(info->ccw_addr); g_free(info); } @@ -1899,12 +1900,17 @@ qemuAgentGetDiskAddress(virJSONValuePtr json) GET_DISK_ADDR(pci, &addr->pci_controller.function, "function"); if ((ccw = virJSONValueObjectGet(json, "ccw-address"))) { - addr->has_ccw_address = true; - GET_DISK_ADDR(ccw, &addr->ccw_addr.cssid, "cssid"); - if (addr->ccw_addr.cssid == 0) /* Guest CSSID 0 is 0xfe on host */ - addr->ccw_addr.cssid = 0xfe; - GET_DISK_ADDR(ccw, &addr->ccw_addr.ssid, "ssid"); - GET_DISK_ADDR(ccw, &addr->ccw_addr.devno, "devno"); + g_autofree virDomainDeviceCCWAddressPtr ccw_addr = NULL; + + ccw_addr = g_new0(virDomainDeviceCCWAddress, 1); + + GET_DISK_ADDR(ccw, &ccw_addr->cssid, "cssid"); + if (ccw_addr->cssid == 0) /* Guest CSSID 0 is 0xfe on host */ + ccw_addr->cssid = 0xfe; + GET_DISK_ADDR(ccw, &ccw_addr->ssid, "ssid"); + GET_DISK_ADDR(ccw, &ccw_addr->devno, "devno"); + + addr->ccw_addr = g_steal_pointer(&ccw_addr); } #undef GET_DISK_ADDR diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 4ea9b9dc1e..0d47230161 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -77,8 +77,7 @@ struct _qemuAgentDiskAddress { unsigned int target; unsigned int unit; char *devnode; - bool has_ccw_address; - virDomainDeviceCCWAddress ccw_addr; + virDomainDeviceCCWAddressPtr ccw_addr; }; void qemuAgentDiskAddressFree(qemuAgentDiskAddressPtr addr); G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuAgentDiskAddress, qemuAgentDiskAddressFree); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 62b0852c33..a376824854 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18887,8 +18887,7 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent, diskDef = virDomainDiskByAddress(vmdef, &agentdisk->pci_controller, - agentdisk->has_ccw_address ? - &agentdisk->ccw_addr : NULL, + agentdisk->ccw_addr, agentdisk->bus, agentdisk->target, agentdisk->unit); @@ -19931,8 +19930,7 @@ qemuAgentDiskInfoFormatParams(qemuAgentDiskInfoPtr *info, /* match the disk to the target in the vm definition */ diskdef = virDomainDiskByAddress(vmdef, &info[i]->address->pci_controller, - info[i]->address->has_ccw_address ? - &info[i]->address->ccw_addr : NULL, + info[i]->address->ccw_addr, info[i]->address->bus, info[i]->address->target, info[i]->address->unit); @@ -20017,8 +20015,7 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfoPtr *fsinfo, /* match the disk to the target in the vm definition */ diskdef = virDomainDiskByAddress(vmdef, &d->pci_controller, - d->has_ccw_address ? - &d->ccw_addr : NULL, + d->ccw_addr, d->bus, d->target, d->unit); -- 2.26.2

2 1

live migration is not using secondary interface
by Olaf Hering 04 Jan '21

04 Jan '21

A naive 'virsh migrate --live domU xen+tcp://cross-over-ip' uses the ordinary uplink instead of the requested IP address. According to the documentation an additional option has to be specified to really use the other network interface. However, neither 'tcp://cross-over-ip' nor 'xenmigr:cross-over-ip/' works, the migration does not start. 'xenmigr' was removed with 1dac5fbbbb06a0341e8087dc33af75c8352d77a4 and 7ed598438687feaddaf0a653d7cbb8a1c1ad4933, but the docs were not updated. This leaves 'tcp://ip'. What change needs to be done in the driver to support a secondary interface? Olaf

3 4