- Devel - libvirt List Archives

[PATCH v2] docs: formatsnapshot: add docs for snapshotDeleteInProgress
by Abhiram Tilak 15 May '24

15 May '24

Adds documentation for the <snapshotDeleteInProgress/> element to the libvirt snapshot format XML reference. The <snapshotDeleteInProgress/> element, introduced at commit 565bcb5d79, ensures the consistency of qcow2 images during snapshot deletion operations by marking disks in snapshot metadata as invalid until deletion is successfully completed. The commit was merged but the related documentation was missing. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/609 Signed-off-by: Abhiram Tilak <atp.exp(a)gmail.com> --- Changes in v2: - Insert a note to advise users against adding or removing the internal tag "snapshotDeleteInProgress" manually. docs/formatsnapshot.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/formatsnapshot.rst b/docs/formatsnapshot.rst index 570a988442..f802a8e227 100644 --- a/docs/formatsnapshot.rst +++ b/docs/formatsnapshot.rst @@ -170,6 +170,15 @@ The top-level ``domainsnapshot`` element may contain the following elements: sub-element can be used with same semantics as the identically named subelement of the domain definition disk's driver. + ``snapshotDeleteInProgress`` + + If a the snapshot is marked for deletion, the disk is invalidated. The + sub-element ``snapshotDeleteInProgress`` marks the disk in the snapshot + as invalid until the snapshot delete is completed successfully. This + element is typically generated by the snapshot-create API and should + not be manually added or removed. + :since:`Since 9.0` + ``creationTime`` A readonly representation of the time this snapshot was created. The time is -- 2.44.0

3 2

[PATCH] tests: Link some mocks with libtest_qemu_driver.so
by Michal Privoznik 15 May '24

15 May '24

I've noticed some tests fail to run under valgrind with the following error: $ valgrind --leak-check=full --trace-children=yes ./qemuxmlconftest valgrind: symbol lookup error: libvirt.git/_build/tests/libdomaincapsmock.so: undefined symbol: virQEMUCapsGet But without valgrind the test passes just fine. While we usually don't want to change our code just to adhere to random tools, in this case we ought to make an exception because valgrind helps us to detect memory leaks. NB, the --trace-children=yes is needed whenever a test re-executes itself, i.e. when it uses mocks. Otherwise we'd just get (boring) result for the first invocation of main() which does nothing more than sets up the environment and calls exec(). When running the test binary without valgrind I can see the libtest_qemu_driver.so being loaded even after exec: $ LD_DEBUG=libs ./qemuxmlconftest 2>&1 | grep -e libtest_qemu_driver.so -e virQEMUCapsGet 6439: find library=libtest_qemu_driver.so [0]; searching 6439: trying file=libvirt.git/_build/tests/../src/libtest_qemu_driver.so 6439: trying file=libvirt.git/_build/tests/glibc-hwcaps/x86-64-v3/libtest_qemu_driver.so 6439: trying file=libvirt.git/_build/tests/glibc-hwcaps/x86-64-v2/libtest_qemu_driver.so 6439: trying file=libvirt.git/_build/tests/libtest_qemu_driver.so 6439: calling init: libvirt.git/_build/tests/libtest_qemu_driver.so 6439: find library=libtest_qemu_driver.so [0]; searching 6439: trying file=libvirt.git/_build/tests/libtest_qemu_driver.so 6439: calling init: libvirt.git/_build/tests/libtest_qemu_driver.so 6439: calling fini: libvirt.git/_build/tests/libtest_qemu_driver.so [0] But running the same under valgrind: $ LD_DEBUG=libs valgrind --leak-check=full --trace-children=yes ./qemuxmlconftest 2>&1 | grep -e libtest_qemu_driver.so -e virQEMUCapsGet 6515: find library=libtest_qemu_driver.so [0]; searching 6515: trying file=libvirt.git/_build/tests/../src/libtest_qemu_driver.so 6515: trying file=libvirt.git/_build/tests/glibc-hwcaps/x86-64-v3/libtest_qemu_driver.so 6515: trying file=libvirt.git/_build/tests/glibc-hwcaps/x86-64-v2/libtest_qemu_driver.so 6515: trying file=libvirt.git/_build/tests/libtest_qemu_driver.so 6515: calling init: libvirt.git/_build/tests/libtest_qemu_driver.so 6515: libvirt.git/_build/tests/libdomaincapsmock.so: error: symbol lookup error: undefined symbol: virQEMUCapsGet (fatal) valgrind: symbol lookup error: libvirt.git/_build/tests/libdomaincapsmock.so: undefined symbol: virQEMUCapsGet To me, it looks like valgrind forced linker to lookup symbols "sooner", as individual libraries are loaded. But I must admit I have no idea how valgrind does that (or if that's even valgrind's 'fault'). But fix is pretty simple: link mocks that rely on symbols from the QEMU driver with the QEMU driver, well, its test suite suitable version (libtest_qemu_driver.so). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This obsoletes some patches I've sent earlier: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/RM5… https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/ZB4… My initial fix was bothering me as I did not understand what was happening nor why it made the valgrind happy. I still don't quite understand what is going on, but at least this fix seems 'more correct'. tests/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index ba2d319347..2f1eda1f95 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -73,7 +73,6 @@ endif # * deps - additional dependencies (optional, default []) mock_libs = [ - { 'name': 'domaincapsmock' }, { 'name': 'vircgroupmock' }, { 'name': 'virdnsmasqmock' }, { 'name': 'virfilecachemock' }, @@ -175,7 +174,7 @@ if conf.has('WITH_QEMU') { 'name': 'qemucaps2xmlmock' }, { 'name': 'qemucapsprobemock', 'link_with': [ test_qemu_driver_lib ] }, { 'name': 'qemucpumock' }, - { 'name': 'qemuhotplugmock', 'link_with': [ test_utils_qemu_lib, test_utils_lib ] }, + { 'name': 'qemuhotplugmock', 'link_with': [ test_qemu_driver_lib, test_utils_qemu_lib, test_utils_lib ] }, { 'name': 'qemuxml2argvmock' }, { 'name': 'virhostidmock' }, ] @@ -185,6 +184,11 @@ else test_utils_qemu_monitor_lib = [] endif +mock_libs += [ + # domaincapsmock has some code guarded with WITH_QEMU + { 'name': 'domaincapsmock', 'link_with': [ test_qemu_driver_lib ] }, +] + test_file_wrapper_lib = static_library( 'test_file_wrapper', [ 'virfilewrapper.c' ], -- 2.43.2

2 1

[PATCH] github: Update lockdown message when openin a PR
by Michal Privoznik 15 May '24

15 May '24

The message that's thrown at users when they try to open a pull request on github suggests opening the MR on gitlab instead. While this works for other libvirt subprojects, for the main libvirt.git we still use e-mail workflow. Update the message to reflect this fact. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- .github/workflows/lockdown.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lockdown.yml b/.github/workflows/lockdown.yml index 74931a2944..69c0b8eb38 100644 --- a/.github/workflows/lockdown.yml +++ b/.github/workflows/lockdown.yml @@ -39,13 +39,10 @@ jobs: repostory hosted on GitLab, merge requests opened here are not processed. - We kindly request that contributors fork the project at + For main libvirt.git repository all patch review and discussion + only occurs on the devel mailing list. - https://gitlab.com/libvirt/libvirt/ - - push changes to the fork, and then open a new merge request at - - https://gitlab.com/libvirt/libvirt/-/merge_requests/new + https://libvirt.org/submitting-patches.html Thank you for your time and understanding. lock-pr: true -- 2.43.2

2 1

[PATCH 0/3] vsh: Fix handling of '--help' for all commands
by Peter Krempa 15 May '24

15 May '24

Brown paper box was applied due to lack of paper bags. Peter Krempa (3): vsh: Fix '--help' option for virsh/virt-admin virshtest: Add tests for '--help' NEWS: Mention '--help' bug in virsh and virt-admin NEWS.rst | 15 +++++++ tests/virshtest.c | 3 ++ tests/virshtestdata/help-option.in | 4 ++ tests/virshtestdata/help-option.out | 64 +++++++++++++++++++++++++++++ tools/vsh.c | 5 ++- 5 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 tests/virshtestdata/help-option.in create mode 100644 tests/virshtestdata/help-option.out -- 2.45.0

2 4

[PATCH v2] qemu_hotplug: Properly assign USB address to hotplugged usb-net device
by Rayhan Faizel 14 May '24

14 May '24

Previously, the network device hotplug logic would try to ensure only CCW or PCI addresses. With recent support for the usb-net model, this patch will ensure USB addresses for usb-net network devices. [Changes in v2] - Additional information in commit message - Relevant gitlab issue link (mostly already resolved but hotplugging is mentioned in one of the comments) Resolves: https://gitlab.com/libvirt/libvirt/-/issues/14 Signed-off-by: Rayhan Faizel <rayhan.faizel(a)gmail.com> --- src/qemu/qemu_hotplug.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 774962b0df..3b39941780 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1159,8 +1159,11 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, goto cleanup; } - if (qemuDomainIsS390CCW(vm->def) && - net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + if (net->model == VIR_DOMAIN_NET_MODEL_USB_NET) { + if (virDomainUSBAddressEnsure(priv->usbaddrs, &net->info) < 0) + goto cleanup; + } else if (qemuDomainIsS390CCW(vm->def) && + net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; if (!(ccwaddrs = virDomainCCWAddressSetCreateFromDomain(vm->def))) goto cleanup; -- 2.34.1

2 2

[PATCH 0/2] ci: Finish dropping AlmaLinux 8
by Michal Privoznik 14 May '24

14 May '24

I've switched our CI jobs from AlmaLinux 8 to AlmaLinux 9, but apparently forgot about two. Michal Prívozník (2): gitlab-ci: Switch potfile job to AlmaLinux 9 gitlab-ci: Switch coverity job to AlmaLinux 9 .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.43.2

2 3

[PATCH v2 00/10] Big CI update (and some bug fixes)
by Michal Privoznik 14 May '24

14 May '24

v2 of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/MMEN… diff to v1: - Juggled some patches around, namely: squashed Fedora and AlmaLinux drop & reintroduction patches, reordered some for easier review. - Switched website job to AlmaLinux 9 - Enhanced commit message on the last commit to explain seemingly unrelated changes. Example of green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/1281843566 Michal Prívozník (10): domaincapsmock: Drop link time dependency on virQEMUCapsGet() qemuxml2argvmock: Drop link time dependency on qemuFDPassDirectNew() testutilsqemu: Don't leak struct testQemuArgs::vdpafds security: Fix return types of .probe callbacks meson: Disable -fsanitize=function ci: Switch from AlmaLinux 8 to AlmaLinux 9 ci: Switch from Fedora 38 to Fedora 40 ci: Drop Ubuntu 20.04 meson: Bump glib version to 2.58.0 ci: Introduce Ubuntu 24.04 .gitlab-ci.yml | 6 +- .../{almalinux-8.sh => almalinux-9.sh} | 8 +- ci/buildenv/centos-stream-9.sh | 1 + ci/buildenv/debian-12-cross-aarch64.sh | 1 + ci/buildenv/debian-12-cross-armv6l.sh | 1 + ci/buildenv/debian-12-cross-armv7l.sh | 1 + ci/buildenv/debian-12-cross-i686.sh | 1 + ci/buildenv/debian-12-cross-mips64el.sh | 1 + ci/buildenv/debian-12-cross-mipsel.sh | 1 + ci/buildenv/debian-12-cross-ppc64le.sh | 1 + ci/buildenv/debian-12-cross-s390x.sh | 1 + ci/buildenv/debian-12.sh | 1 + ci/buildenv/debian-sid-cross-aarch64.sh | 1 + ci/buildenv/debian-sid-cross-armv6l.sh | 1 + ci/buildenv/debian-sid-cross-armv7l.sh | 1 + ci/buildenv/debian-sid-cross-i686.sh | 1 + ci/buildenv/debian-sid-cross-mips64el.sh | 1 + ci/buildenv/debian-sid-cross-ppc64le.sh | 1 + ci/buildenv/debian-sid-cross-s390x.sh | 1 + ci/buildenv/debian-sid.sh | 1 + ci/buildenv/fedora-39.sh | 1 + ...-mingw32.sh => fedora-40-cross-mingw32.sh} | 1 + ...-mingw64.sh => fedora-40-cross-mingw64.sh} | 1 + ci/buildenv/{fedora-38.sh => fedora-40.sh} | 1 + ci/buildenv/fedora-rawhide-cross-mingw32.sh | 1 + ci/buildenv/fedora-rawhide-cross-mingw64.sh | 1 + ci/buildenv/fedora-rawhide.sh | 1 + .../{ubuntu-2004.sh => ubuntu-2404.sh} | 8 +- ...ux-8.Dockerfile => almalinux-9.Dockerfile} | 10 +- ci/containers/centos-stream-9.Dockerfile | 1 + .../debian-12-cross-aarch64.Dockerfile | 1 + .../debian-12-cross-armv6l.Dockerfile | 1 + .../debian-12-cross-armv7l.Dockerfile | 1 + ci/containers/debian-12-cross-i686.Dockerfile | 1 + .../debian-12-cross-mips64el.Dockerfile | 1 + .../debian-12-cross-mipsel.Dockerfile | 1 + .../debian-12-cross-ppc64le.Dockerfile | 1 + .../debian-12-cross-s390x.Dockerfile | 1 + ci/containers/debian-12.Dockerfile | 1 + .../debian-sid-cross-aarch64.Dockerfile | 1 + .../debian-sid-cross-armv6l.Dockerfile | 1 + .../debian-sid-cross-armv7l.Dockerfile | 1 + .../debian-sid-cross-i686.Dockerfile | 1 + .../debian-sid-cross-mips64el.Dockerfile | 1 + .../debian-sid-cross-ppc64le.Dockerfile | 1 + .../debian-sid-cross-s390x.Dockerfile | 1 + ci/containers/debian-sid.Dockerfile | 1 + ci/containers/fedora-39.Dockerfile | 1 + ...ile => fedora-40-cross-mingw32.Dockerfile} | 3 +- ...ile => fedora-40-cross-mingw64.Dockerfile} | 3 +- ...ora-38.Dockerfile => fedora-40.Dockerfile} | 3 +- .../fedora-rawhide-cross-mingw32.Dockerfile | 1 + .../fedora-rawhide-cross-mingw64.Dockerfile | 1 + ci/containers/fedora-rawhide.Dockerfile | 1 + ...2004.Dockerfile => ubuntu-2404.Dockerfile} | 11 +- ci/gitlab/builds.yml | 113 ++++++++-------- ci/gitlab/containers.yml | 54 ++++---- ci/integration.yml | 24 ---- ci/lcitool/projects/libvirt.yml | 1 + ci/manifest.yml | 40 +++--- meson.build | 15 ++- src/libvirt_private.syms | 1 - src/security/security_apparmor.c | 2 +- src/security/security_selinux.c | 2 +- src/util/glibcompat.c | 125 ------------------ src/util/glibcompat.h | 10 -- tests/domaincapsmock.c | 13 +- tests/qemuxml2argvmock.c | 8 +- tests/testutilsqemu.c | 1 + 69 files changed, 203 insertions(+), 305 deletions(-) rename ci/buildenv/{almalinux-8.sh => almalinux-9.sh} (93%) rename ci/buildenv/{fedora-38-cross-mingw32.sh => fedora-40-cross-mingw32.sh} (98%) rename ci/buildenv/{fedora-38-cross-mingw64.sh => fedora-40-cross-mingw64.sh} (98%) rename ci/buildenv/{fedora-38.sh => fedora-40.sh} (99%) rename ci/buildenv/{ubuntu-2004.sh => ubuntu-2404.sh} (94%) rename ci/containers/{almalinux-8.Dockerfile => almalinux-9.Dockerfile} (91%) rename ci/containers/{fedora-38-cross-mingw32.Dockerfile => fedora-40-cross-mingw32.Dockerfile} (97%) rename ci/containers/{fedora-38-cross-mingw64.Dockerfile => fedora-40-cross-mingw64.Dockerfile} (97%) rename ci/containers/{fedora-38.Dockerfile => fedora-40.Dockerfile} (97%) rename ci/containers/{ubuntu-2004.Dockerfile => ubuntu-2404.Dockerfile} (93%) -- 2.43.2

2 11

[PATCH] docs: mention migrate-setmaxdowntime's impact on snapshot-create
by Abhiram Tilak 13 May '24

13 May '24

The migrate-setmaxdowntime command sets the max allowed downtime during live-migration, but since `snapshot-create` performs qmp migration, it also affects the downtime during internal/external snapshot creation. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/593 Signed-off-by: Abhiram Tilak <atp.exp(a)gmail.com> --- This issue was a minor change, yet it has remained without any updates for some time. docs/manpages/virsh.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index fa038e4547..18bdae53c9 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -3717,7 +3717,8 @@ migrate-setmaxdowntime Set maximum tolerable downtime for a domain which is being live-migrated to another host. The *downtime* is a number of milliseconds the guest is allowed -to be down at the end of live migration. +to be down at the end of live migration. This is also used to set the max +downtime for creating a snapshot using ``snapshot-create``. migrate-setspeed -- 2.44.0

3 2

[PATCH] "docs: formatsnapshot: add docs for snapshotDeleteInProgress"
by Abhiram Tilak 13 May '24

13 May '24

Adds documentation for the <snapshotDeleteInProgress/> element to the libvirt snapshot format XML reference. The <snapshotDeleteInProgress/> element, introduced at commit 565bcb5d79, ensures the consistency of qcow2 images during snapshot deletion operations by marking disks in snapshot metadata as invalid until deletion is successfully completed. The commit was merged but the related documentation was missing. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/609 Signed-off-by: Abhiram Tilak <atp.exp(a)gmail.com> --- docs/formatsnapshot.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/formatsnapshot.rst b/docs/formatsnapshot.rst index 570a988442..e3d0d47e00 100644 --- a/docs/formatsnapshot.rst +++ b/docs/formatsnapshot.rst @@ -170,6 +170,13 @@ The top-level ``domainsnapshot`` element may contain the following elements: sub-element can be used with same semantics as the identically named subelement of the domain definition disk's driver. + ``snapshotDeleteInProgress`` + + If a the snapshot is marked for deletion, the disk is invalidated. The + sub-element ``snapshotDeleteInProgress`` marks the disk in the snapshot + as invalid until the snapshot delete is completed successfully. + :since:`Since 9.0` + ``creationTime`` A readonly representation of the time this snapshot was created. The time is -- 2.44.0

3 2

[PATCH] vmx: Do not require DVS Port ID
by Martin Kletzander 13 May '24

13 May '24

It can be safely removed from the VMX, VMWare will still boot the machine and once another ethernet is added it is updated in the VMX to zero. So do not require it and default to zero too since this part of the XML is done as best effort and it is mentioned even in our documentation. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/vmx/vmx.c | 2 +- tests/vmx2xmldata/ethernet-vds-no-portid.vmx | 10 ++++++++ tests/vmx2xmldata/ethernet-vds-no-portid.xml | 24 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 tests/vmx2xmldata/ethernet-vds-no-portid.vmx create mode 100644 tests/vmx2xmldata/ethernet-vds-no-portid.xml diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index f4182bc5184c..d90b41d2ad14 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2901,7 +2901,7 @@ virVMXParseEthernet(virConf *conf, int controller, virDomainNetDef **def) portId_name, &(*def)->data.vds.port_id, 0, - false) < 0 || + true) < 0 || virVMXGetConfigLong(conf, connectionId_name, &(*def)->data.vds.connection_id, diff --git a/tests/vmx2xmldata/ethernet-vds-no-portid.vmx b/tests/vmx2xmldata/ethernet-vds-no-portid.vmx new file mode 100644 index 000000000000..7761accb3abc --- /dev/null +++ b/tests/vmx2xmldata/ethernet-vds-no-portid.vmx @@ -0,0 +1,10 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.virtualDev = "e1000e" +ethernet0.addressType = "vpx" +ethernet0.generatedAddress = "00:50:56:87:65:43" +ethernet0.dvs.switchId = "50 34 26 b2 94 e9 3b 16-1d 68 87 bf ff 4a 54 40" +ethernet0.dvs.portgroupId = "dvportgroup-1285" +ethernet0.dvs.connectionId = "408217997" +displayName = "test" diff --git a/tests/vmx2xmldata/ethernet-vds-no-portid.xml b/tests/vmx2xmldata/ethernet-vds-no-portid.xml new file mode 100644 index 000000000000..60fd9c99feb9 --- /dev/null +++ b/tests/vmx2xmldata/ethernet-vds-no-portid.xml @@ -0,0 +1,24 @@ +<domain type='vmware'> + <name>test</name> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='vds'> + <mac address='00:50:56:87:65:43' type='generated'/> + <source switchid='503426b2-94e9-3b16-1d68-87bfff4a5440' portid='0' portgroupid='dvportgroup-1285' connectionid='408217997'/> + <model type='e1000e'/> + </interface> + <video> + <model type='vmvga' vram='4096' primary='yes'/> + </video> + </devices> +</domain> -- 2.45.0

2 1