Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2022-08-08 08:45:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Mon Aug 8 08:45:08 2022 rev:235 rq:993366 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2022-07-22 19:20:16.956563363 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new.1521/virt-manager.changes 2022-08-08 08:45:21.242480864 +0200 @@ -1,0 +2,55 @@ +Fri Aug 5 16:25:59 UTC 2022 - Ben Greiner <c...@bnavigator.de> + +- Update to 4.1.0 + * Fix build with setuptools-61 (Peter Alfredsen, Miro Hron??ok) + * add UI and cli support for qemu-vdagent channel (Jonathon Jongsma) + * cli: More --iothreads suboptions (Lin Ma) + * launch_security: Use SEV-ES policy=0x07 if host supports it (Charles + * Arnold) + * cli: Add support for URL query with disks (Martin Kletzander) +- Drop patches merged upstream: + * c6107419-tests-Drop-usage-of-sgio-unfiltered.patch + * 90e13549-Fix-build-with-setuptools-61+.patch + * 46dc0616-setup-add-bits-for-setuptools-61.patch + * 9ac94ef7-tests-Fix-another-sgio-filtered-case.patch + * 34662fec-tests-Fix-with-latest-argcomplete.patch + * d51541e1-Fix-UI-rename-with-firmware-efi.patch + * b8a77805-domain-cpu-Clear-migratable-when-changing-to-custom-cpu.patch + * 0d84bcfb-cli-Add-iothreadids-attributes-thread_pool_min-and-thread_pool_max.patch + * 424283ad-launch_security-Use-SEV-ES-policy-0x07-if-host-supports-it.patch +- Refresh patches + * virtman-add-tooltip-to-firmware.patch + -- changed surrounding imports + * virtinst-set-cache-mode-unsafe-for-install.patch + -- the patch changes the expected output in tests +- Refresh test skips + +------------------------------------------------------------------- +Wed Aug 3 14:51:34 MDT 2022 - carn...@suse.com + +- Upstream bug fixes (bsc#1027942) + c6107419-tests-Drop-usage-of-sgio-unfiltered.patch + 9ac94ef7-tests-Fix-another-sgio-filtered-case.patch + b8a77805-domain-cpu-Clear-migratable-when-changing-to-custom-cpu.patch + 0d84bcfb-cli-Add-iothreadids-attributes-thread_pool_min-and-thread_pool_max.patch + 90e13549-Fix-build-with-setuptools-61+.patch + 424283ad-launch_security-Use-SEV-ES-policy-0x07-if-host-supports-it.patch +- Modified virtman-add-sev-memory-support.patch +- Renamed upstream patches + virtman-pr381-setuptools-61.patch to + 46dc0616-setup-add-bits-for-setuptools-61.patch + virtman-34662fe-argcomplete.patch to + 34662fec-tests-Fix-with-latest-argcomplete.patch + +------------------------------------------------------------------- +Tue Jul 19 10:03:04 UTC 2022 - Ben Greiner <c...@bnavigator.de> + +- Add Source URL +- Add upstream patch virtman-pr381-setuptools-61.patch + gh#virt-manager/virt-manager#381 +- Enable tests + * No python package should go untested + * Use multibuild so that all runtime requirements are checked + * Add virtman-34662fe-argcomplete.patch + +------------------------------------------------------------------- Old: ---- d51541e1-Fix-UI-rename-with-firmware-efi.patch virt-manager-4.0.0.tar.gz New: ---- _multibuild virt-manager-4.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.B58K8k/_old 2022-08-08 08:45:22.554484723 +0200 +++ /var/tmp/diff_new_pack.B58K8k/_new 2022-08-08 08:45:22.558484735 +0200 @@ -1,5 +1,5 @@ # -# spec file for package virt-manager +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -20,20 +20,28 @@ %global with_guestfs 0 %global default_hvs "qemu,xen,lxc" -Name: virt-manager -Version: 4.0.0 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%bcond_without test +%define psuffix -%{flavor} +%else +%bcond_with test +%define psuffix %{nil} +%endif + +Name: virt-manager%{psuffix} +Version: 4.1.0 Release: 0 Summary: Virtual Machine Manager License: GPL-2.0-or-later Group: System/Monitoring URL: http://virt-manager.org/ -Source0: %{name}-%{version}.tar.gz +Source0: https://virt-manager.org/download/sources/virt-manager/virt-manager-%{version}.tar.gz Source1: virt-install.rb Source2: virt-install.desktop Source3: virt-manager-supportconfig # Upstream Patches Patch1: revert-363fca41-virt-install-Require-osinfo-for-non-x86-HVM-case-too.patch -Patch2: d51541e1-Fix-UI-rename-with-firmware-efi.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -84,7 +92,6 @@ Patch184: virtinst-windows-server-detection.patch BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %define verrel %{version}-%{release} Requires: dbus-1-x11 @@ -109,6 +116,12 @@ BuildRequires: python3-devel BuildRequires: python3-docutils BuildRequires: python3-setuptools +%if %{with test} +BuildRequires: python3-argcomplete +BuildRequires: python3-pytest +BuildRequires: virt-install = %{version} +BuildRequires: virt-manager = %{version} +%endif %description Virtual Machine Manager provides a graphical tool for administering virtual @@ -158,8 +171,9 @@ machine). %prep -%autosetup -p1 +%autosetup -p1 -n virt-manager-%{version} +%if !%{with test} %build %if %{default_hvs} %global _default_hvs --default-hvs %{default_hvs} @@ -183,8 +197,44 @@ # Oddly, supportconfig doesn't execute plugins with '-' in the name, so use 'virt_manager' mkdir -p %{buildroot}/usr/lib/supportconfig/plugins install -m 755 %SOURCE3 %{buildroot}/usr/lib/supportconfig/plugins/virt_manager +chmod -x %{buildroot}%{_datadir}/virt-manager/virtManager/virtmanager.py %find_lang %{name} +%endif + +%if %{with test} +%check +# TODO: check if these are genuine failures or due to the non-upstream patches +# different device names +donttest="test_disk_numtotarget" +donttest="$donttest or testCLI0001virt_install_many_devices" +donttest="$donttest or testCLI0110virt_install_reinstall_cdrom" +donttest="$donttest or testCLI0284virt_xml_build_pool_logical_disk" +donttest="$donttest or testCLI0276virt_xml_build_disk_domain" +donttest="$donttest or testCLI0371virt_xml_add_disk_create_storage_start" +# depends on osc/obs host cpu? +donttest="$donttest or testCLI0003virt_install_singleton_config_2" +donttest="$donttest or testCLI0283virt_xml_edit_cpu_host_copy" +# RuntimeError: SEV launch security requires a Q35 machine -- due to patch for bsc#1196806, jsc#SLE-18834 ? +donttest="$donttest or testCLI0162virt_install" +# Expectsion <video> element +donttest="$donttest or testCLI0168virt_install_s390x_cdrom" +# missing <boot> element, extra <kernel> element +donttest="$donttest or testCLI0189virt_install_xen_default" +donttest="$donttest or testCLI0190virt_install_xen_pv" +# different <emulator> additional <model> in <interface> +donttest="$donttest or testCLI0191virt_install_xen_hvm" +donttest="$donttest or testCLI0192virt_install_xen_hvm" +# different source image format +donttest="$donttest or testCLI0199virt_install_bhyve_default_f27" +# Due to the above skips: +# "there are XML properties that are untested in the test suite" +donttest="$donttest or testCheckXMLBuilderProps" +# "These command line arguments or aliases are not checked in the test suite" +donttest="$donttest or testCheckCLISuboptions" +# +pytest -v -rfEs -k "not ($donttest)" +%endif %post /bin/touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || : @@ -202,6 +252,7 @@ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || : /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas > /dev/null 2>&1 || : +%if !%{with test} %files %defattr(-,root,root,-) %{_bindir}/%{name} @@ -250,5 +301,6 @@ %dir %{_datadir}/YaST2/clients %dir %{_datadir}/applications/YaST2 %{_datadir}/YaST2/clients/virt-install.rb +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild> ++++++ virt-manager-4.0.0.tar.gz -> virt-manager-4.1.0.tar.gz ++++++ ++++ 28720 lines of diff (skipped) ++++++ virtinst-add-pvh-support.patch ++++++ --- /var/tmp/diff_new_pack.B58K8k/_old 2022-08-08 08:45:23.478487441 +0200 +++ /var/tmp/diff_new_pack.B58K8k/_new 2022-08-08 08:45:23.486487465 +0200 @@ -32,7 +32,7 @@ =================================================================== --- virt-manager-4.0.0.orig/virtinst/guest.py +++ virt-manager-4.0.0/virtinst/guest.py -@@ -886,7 +886,7 @@ class Guest(XMLBuilder): +@@ -888,7 +888,7 @@ class Guest(XMLBuilder): usb_tablet = False usb_keyboard = False ++++++ virtinst-s390x-disable-graphics.patch ++++++ --- /var/tmp/diff_new_pack.B58K8k/_old 2022-08-08 08:45:23.534487606 +0200 +++ /var/tmp/diff_new_pack.B58K8k/_new 2022-08-08 08:45:23.538487618 +0200 @@ -4,7 +4,7 @@ =================================================================== --- virt-manager-4.0.0.orig/virtinst/guest.py +++ virt-manager-4.0.0/virtinst/guest.py -@@ -198,7 +198,10 @@ class Guest(XMLBuilder): +@@ -200,7 +200,10 @@ class Guest(XMLBuilder): self.skip_default_channel = False self.skip_default_sound = False self.skip_default_usbredir = False @@ -16,7 +16,7 @@ self.skip_default_rng = False self.skip_default_tpm = False self.x86_cpu_default = self.cpu.SPECIAL_MODE_APP_DEFAULT -@@ -347,7 +350,7 @@ class Guest(XMLBuilder): +@@ -349,7 +352,7 @@ class Guest(XMLBuilder): if not os_support: return False @@ -25,7 +25,7 @@ return True return False # pragma: no cover -@@ -933,7 +936,7 @@ class Guest(XMLBuilder): +@@ -935,7 +938,7 @@ class Guest(XMLBuilder): self.add_device(dev) def _add_default_video_device(self): ++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++ --- /var/tmp/diff_new_pack.B58K8k/_old 2022-08-08 08:45:23.554487665 +0200 +++ /var/tmp/diff_new_pack.B58K8k/_new 2022-08-08 08:45:23.558487677 +0200 @@ -1,9 +1,9 @@ Set cache mode for target installation disk to unsafe for better performance. -Index: virt-manager-3.3.0/virtinst/install/installer.py +Index: virt-manager-4.1.0/virtinst/install/installer.py =================================================================== ---- virt-manager-3.3.0.orig/virtinst/install/installer.py -+++ virt-manager-3.3.0/virtinst/install/installer.py +--- virt-manager-4.1.0.orig/virtinst/install/installer.py ++++ virt-manager-4.1.0/virtinst/install/installer.py @@ -567,16 +567,29 @@ class Installer(object): def _build_postboot_xml(self, final_xml, meter): @@ -35,4 +35,473 @@ def _build_xml(self, guest, meter): initial_xml = None +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-cdrom-url.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-cdrom-url.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-cdrom-url.xml +@@ -24,6 +24,7 @@ + </source> + <target dev="hda" bus="ide"/> + <readonly/> ++ <driver cache="unsafe"/> + </disk> + <controller type="usb" model="ich9-ehci1"/> + <controller type="usb" model="ich9-uhci1"> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-memory-hotplug.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-memory-hotplug.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-memory-hotplug.xml +@@ -35,7 +35,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2" discard="unmap"/> ++ <driver name="qemu" type="qcow2" discard="unmap" cache="unsafe"/> + <source file="/var/lib/libvirt/images/fedora.qcow2"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-cdrom-double.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-cdrom-double.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-cdrom-double.xml +@@ -22,6 +22,7 @@ + <disk type="file" device="disk"> + <source file="/var/lib/libvirt/images/vm1.qcow2"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <disk type="file" device="cdrom"> + <source file="/pool-dir/testvol1.img"/> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-default.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-cloud-init-default.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-default.xml +@@ -26,6 +26,7 @@ + <disk type="file" device="disk"> + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <controller type="usb" model="ich9-ehci1"/> + <controller type="usb" model="ich9-uhci1"> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options1.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-cloud-init-options1.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options1.xml +@@ -37,6 +37,7 @@ chpasswd: + <disk type="file" device="disk"> + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <controller type="usb" model="ich9-ehci1"/> + <controller type="usb" model="ich9-uhci1"> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options2.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-cloud-init-options2.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options2.xml +@@ -37,6 +37,7 @@ users: + <disk type="file" device="disk"> + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <controller type="usb" model="ich9-ehci1"/> + <controller type="usb" model="ich9-uhci1"> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options3.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-cloud-init-options3.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options3.xml +@@ -32,6 +32,7 @@ users: + <disk type="file" device="disk"> + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <controller type="usb" model="ich9-ehci1"/> + <controller type="usb" model="ich9-uhci1"> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options4.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-cloud-init-options4.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options4.xml +@@ -26,6 +26,7 @@ + <disk type="file" device="disk"> + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <controller type="usb" model="ich9-ehci1"/> + <controller type="usb" model="ich9-uhci1"> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options5.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-cloud-init-options5.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-cloud-init-options5.xml +@@ -26,6 +26,7 @@ + <disk type="file" device="disk"> + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <controller type="usb" model="ich9-ehci1"/> + <controller type="usb" model="ich9-uhci1"> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml +@@ -31,7 +31,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml +@@ -32,7 +32,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml +@@ -36,7 +36,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="cdrom"> +- <driver name="qemu"/> ++ <driver name="qemu" cache="unsafe"/> + <source file="TESTSUITE_SCRUBBED/tests/data/fakemedia/fake-win7.iso"/> + <target dev="sda" bus="sata"/> + <readonly/> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-osvariant-defaults-pxe.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-osvariant-defaults-pxe.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-osvariant-defaults-pxe.xml +@@ -28,6 +28,7 @@ + <disk type="file" device="disk"> + <source file="/var/lib/libvirt/images/fedora26.qcow2"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <controller type="usb" model="ich9-ehci1"/> + <controller type="usb" model="ich9-uhci1"> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-reinstall-location.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-reinstall-location.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-reinstall-location.xml +@@ -22,7 +22,7 @@ + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <disk type="file" device="disk"> +- <driver type="qcow2"/> ++ <driver type="qcow2" cache="unsafe"/> + <source file="/pool-dir/test-clone-simple.img"/> + <target dev="hda" bus="ide"/> + <address type="drive" controller="0" bus="0" target="0" unit="0"/> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-reinstall-pxe.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-reinstall-pxe.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-reinstall-pxe.xml +@@ -21,7 +21,7 @@ + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <disk type="file" device="disk"> +- <driver type="qcow2"/> ++ <driver type="qcow2" cache="unsafe"/> + <source file="/pool-dir/test-clone-simple.img"/> + <target dev="hda" bus="ide"/> + <address type="drive" controller="0" bus="0" target="0" unit="0"/> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-w2k3-cdrom.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-w2k3-cdrom.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-w2k3-cdrom.xml +@@ -35,6 +35,7 @@ + <disk type="file" device="disk"> + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <disk type="file" device="cdrom"> + <source file="/pool-dir/testvol2.img"/> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-aarch64-cdrom.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-aarch64-cdrom.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-aarch64-cdrom.xml +@@ -26,7 +26,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-cdrom-centos-label.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-cdrom-centos-label.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-cdrom-centos-label.xml +@@ -32,7 +32,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-centos7.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-centos7.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-centos7.xml +@@ -32,7 +32,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml +@@ -34,7 +34,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-cpu-hostmodel-fallback.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-cpu-hostmodel-fallback.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-cpu-hostmodel-fallback.xml +@@ -32,7 +32,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml +@@ -33,7 +33,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-rhel5.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-rhel5.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-rhel5.xml +@@ -32,7 +32,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-rhel6.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-rhel6.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-rhel6.xml +@@ -33,7 +33,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-rhel7.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-rhel7.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-rhel7.xml +@@ -33,7 +33,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-session-defaults.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-session-defaults.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-session-defaults.xml +@@ -32,7 +32,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2" discard="unmap"/> ++ <driver name="qemu" type="qcow2" discard="unmap" cache="unsafe"/> + <source file="/tmp/.local/share/libvirt/images/fedora21.qcow2"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-win10.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-win10.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-win10.xml +@@ -38,7 +38,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="sda" bus="sata"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml +@@ -38,7 +38,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-linux2020.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-linux2020.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-linux2020.xml +@@ -32,7 +32,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2" discard="unmap"/> ++ <driver name="qemu" type="qcow2" discard="unmap" cache="unsafe"/> + <source file="/var/lib/libvirt/images/linux2020.qcow2"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-location-iso.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-location-iso.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-location-iso.xml +@@ -32,7 +32,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="vda" bus="virtio"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-location-manual-kernel.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-location-manual-kernel.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-location-manual-kernel.xml +@@ -27,7 +27,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="cdrom"> +- <driver name="qemu"/> ++ <driver name="qemu" cache="unsafe"/> + <source file="TESTSUITE_SCRUBBED/tests/data/fakemedia/fake-no-osinfo.iso"/> + <target dev="hda" bus="ide"/> + <readonly/> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml +@@ -32,7 +32,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="cdrom"> +- <driver name="qemu"/> ++ <driver name="qemu" cache="unsafe"/> + <source file="TESTSUITE_SCRUBBED/tests/data/fakemedia/fake-f26-netinst.iso"/> + <target dev="sda" bus="sata"/> + <readonly/> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-q35-defaults.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-q35-defaults.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-q35-defaults.xml +@@ -27,7 +27,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="sda" bus="sata"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-remote-storage.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-remote-storage.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-remote-storage.xml +@@ -22,6 +22,7 @@ + <disk type="file" device="disk"> + <source file="/foo/bar/baz"/> + <target dev="hda" bus="ide"/> ++ <driver cache="unsafe"/> + </disk> + <disk type="block" device="disk"> + <source dev="/dev/zde"/> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-unattended-remote-cdrom.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-unattended-remote-cdrom.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-unattended-remote-cdrom.xml +@@ -32,6 +32,7 @@ + <source file="/pool-dir/testvol1.img"/> + <target dev="hda" bus="ide"/> + <readonly/> ++ <driver cache="unsafe"/> + </disk> + <controller type="usb" model="ich9-ehci1"/> + <controller type="usb" model="ich9-uhci1"> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-win7-uefi.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-win7-uefi.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-win7-uefi.xml +@@ -40,7 +40,7 @@ + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="sda" bus="sata"/> + </disk> +Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-xen-pv.xml +=================================================================== +--- virt-manager-4.1.0.orig/tests/data/cli/compare/virt-install-xen-pv.xml ++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-xen-pv.xml +@@ -16,7 +16,7 @@ + </os> + <devices> + <disk type="file" device="disk"> +- <driver name="qemu" type="qcow2"/> ++ <driver name="qemu" type="qcow2" cache="unsafe"/> + <source file="/pool-dir/testvol1.img"/> + <target dev="xvda" bus="xen"/> + </disk> ++++++ virtinst-set-qemu-emulator.patch ++++++ --- /var/tmp/diff_new_pack.B58K8k/_old 2022-08-08 08:45:23.578487735 +0200 +++ /var/tmp/diff_new_pack.B58K8k/_new 2022-08-08 08:45:23.582487748 +0200 @@ -5,7 +5,7 @@ =================================================================== --- virt-manager-4.0.0.orig/virtinst/guest.py +++ virt-manager-4.0.0/virtinst/guest.py -@@ -778,6 +778,10 @@ class Guest(XMLBuilder): +@@ -780,6 +780,10 @@ class Guest(XMLBuilder): self._add_default_tpm() self.clock.set_defaults(self) ++++++ virtinst-smbios-unsupported-for-xenpv.patch ++++++ --- /var/tmp/diff_new_pack.B58K8k/_old 2022-08-08 08:45:23.594487783 +0200 +++ /var/tmp/diff_new_pack.B58K8k/_new 2022-08-08 08:45:23.598487794 +0200 @@ -4,7 +4,7 @@ =================================================================== --- virt-manager-4.0.0.orig/virtinst/guest.py +++ virt-manager-4.0.0/virtinst/guest.py -@@ -687,6 +687,8 @@ class Guest(XMLBuilder): +@@ -689,6 +689,8 @@ class Guest(XMLBuilder): self.type != "kvm"): log.warning( # pragma: no cover "KVM acceleration not available, using '%s'", self.type) ++++++ virtman-add-sev-memory-support.patch ++++++ --- /var/tmp/diff_new_pack.B58K8k/_old 2022-08-08 08:45:23.634487900 +0200 +++ /var/tmp/diff_new_pack.B58K8k/_new 2022-08-08 08:45:23.638487912 +0200 @@ -108,7 +108,7 @@ + if sevmem is True: + domcaps = self.get_domain_capabilities() + guest.launchSecurity.type = "sev" -+ guest.launchSecurity.set_defaults(guest, domcaps.supports_sev_es_launch_security()) ++ guest.launchSecurity.set_defaults(guest) + guest.memoryBacking.set_locked(True) + _set_rombar(guest, "off") + else: @@ -147,19 +147,18 @@ =================================================================== --- virt-manager-4.0.0.orig/virtinst/domcapabilities.py +++ virt-manager-4.0.0/virtinst/domcapabilities.py -@@ -93,6 +93,10 @@ def _make_capsblock(xml_root_name): +@@ -93,6 +93,9 @@ def _make_capsblock(xml_root_name): class _SEV(XMLBuilder): XML_NAME = "sev" supported = XMLProperty("./@supported", is_yesno=True) + cbitpos = XMLProperty("./cbitpos") + reducedPhysBits = XMLProperty("./reducedPhysBits") + maxGuests = XMLProperty("./maxGuests") -+ maxESGuests = XMLProperty("./maxESGuests") + maxESGuests = XMLProperty("./maxESGuests") - ############################# -@@ -398,6 +402,9 @@ class DomainCapabilities(XMLBuilder): - """ +@@ -402,6 +405,9 @@ class DomainCapabilities(XMLBuilder): + self.features.sev.maxESGuests) return bool(self.features.sev.supported) + def supports_sev_es_launch_security(self): @@ -172,14 +171,12 @@ =================================================================== --- virt-manager-4.0.0.orig/virtinst/domain/launch_security.py +++ virt-manager-4.0.0/virtinst/domain/launch_security.py -@@ -18,9 +18,13 @@ class DomainLaunchSecurity(XMLBuilder): - dhCert = XMLProperty("./dhCert") +@@ -19,8 +19,12 @@ class DomainLaunchSecurity(XMLBuilder): kernelHashes = XMLProperty("./@kernelHashes", is_yesno=True) -- def _set_defaults_sev(self, guest): + def _set_defaults_sev(self, guest): - if not guest.os.is_q35() or not guest.is_uefi(): - raise RuntimeError(_("SEV launch security requires a Q35 UEFI machine")) -+ def _set_defaults_sev(self, guest, sev_es): + if not guest.os.is_q35(): + raise RuntimeError(_("SEV launch security requires a Q35 machine")) + # Libvirt will select the appropriate firmware file if not specified @@ -187,23 +184,8 @@ + if not guest.is_uefi(): + guest.os.firmware = 'efi' - # 'policy' is a mandatory 4-byte argument for the SEV firmware, - # if missing, let's use 0x03 which, according to the table at -@@ -28,8 +32,11 @@ class DomainLaunchSecurity(XMLBuilder): - # (bit 0) - disables the debugging mode - # (bit 1) - disables encryption key sharing across multiple guests - if self.policy is None: -- self.policy = "0x03" -+ if sev_es: -+ self.policy = "0x07" -+ else: -+ self.policy = "0x03" - -- def set_defaults(self, guest): -+ def set_defaults(self, guest, sev_es=False): - if self.type == "sev": -- return self._set_defaults_sev(guest) -+ return self._set_defaults_sev(guest, sev_es) + # The 'policy' is a mandatory 4-byte argument for the SEV firmware. + # If missing, we use 0x03 for the original SEV implementation and Index: virt-manager-4.0.0/virtinst/devices/interface.py =================================================================== --- virt-manager-4.0.0.orig/virtinst/devices/interface.py ++++++ virtman-add-tooltip-to-firmware.patch ++++++ --- /var/tmp/diff_new_pack.B58K8k/_old 2022-08-08 08:45:23.654487959 +0200 +++ /var/tmp/diff_new_pack.B58K8k/_new 2022-08-08 08:45:23.662487982 +0200 @@ -2,21 +2,22 @@ When a particular firmware is selected, read the json file for a description. Add a tooltip of the json description when the mouse move overs the selected firmware. -Index: virt-manager-4.0.0/virtManager/details/details.py +Index: virt-manager-4.1.0/virtManager/details/details.py =================================================================== ---- virt-manager-4.0.0.orig/virtManager/details/details.py -+++ virt-manager-4.0.0/virtManager/details/details.py -@@ -5,6 +5,9 @@ +--- virt-manager-4.1.0.orig/virtManager/details/details.py ++++ virt-manager-4.1.0/virtManager/details/details.py +@@ -4,6 +4,10 @@ + # This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. - import re +import os +import json +import textwrap - ++ from gi.repository import Gtk -@@ -421,7 +424,7 @@ class vmmDetails(vmmGObjectUI): + import libvirt +@@ -402,7 +406,7 @@ class vmmDetails(vmmGObjectUI): "on_overview_name_changed": _e(EDIT_NAME), "on_overview_title_changed": _e(EDIT_TITLE), "on_machine_type_changed": _e(EDIT_MACHTYPE), @@ -25,7 +26,7 @@ "on_overview_chipset_changed": _e(EDIT_MACHTYPE), "on_details_inspection_refresh_clicked": self._inspection_refresh_clicked_cb, -@@ -1117,6 +1120,52 @@ class vmmDetails(vmmGObjectUI): +@@ -1098,6 +1102,52 @@ class vmmDetails(vmmGObjectUI): self.storage_browser.set_browse_reason(reason) self.storage_browser.show(self.topwin)