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-03-05 14:43:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Sat Mar 5 14:43:52 2022 rev:230 rq:959256 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2022-01-23 12:16:47.900022679 +0100 +++ /work/SRC/openSUSE:Factory/.virt-manager.new.1958/virt-manager.changes 2022-03-05 14:44:32.639717981 +0100 @@ -1,0 +2,43 @@ +Wed Mar 2 21:11:58 MST 2022 - carn...@suse.com + +- bsc#1196202 - virt-install crashes on a time-of-check time-of-use + (TOCTOU) race condition + Resolved by upgrade to version 4.0.0 (jsc#SLE-18261) + virt-manager-4.0.0.tar.gz +- Other features and bug fixes (bsc#1027942) + virt-install ???os-variant/???osinfo is now a hard requirement for most cases + Add ???Enable shared memory??? UI checkbox (Lin Ma) + add UI preference to default to UEFI for new VMs (Charles Arnold) + Add virtiofs filesystem driver UI option + Fill in all ???cputune, ???cpu, ???shmem, ???input, and ???boot suboptions (Hugues Fafard) + virt-* mdev improvements (Shalini Chellathurai Saroja) + bhyve improvments (Roman Bogorodskiy) + Revive network portgroup UI + enable a TPM by default when UEFI is used (Daniel P. Berrang??) + Use cpu host-passthrough by default on qemu x86 + use virtio-gpu video for most modern distros + Default to extra pcie root ports for q35 + set discard=unmap by default for sparse disks and block devices + We now require xorissofs for ???location ISO + We now use setuptools rather than just plain distutils +- Add virtman-revert-use-of-AyatanaAppIndicator3.patch +- Drop the following patches + 0e15cd51-virt-manager-enable-MDEV-support.patch + 143c6bef-virtinst-fix-error-message-format-string.patch + 4d0e3232-virtinst-Fix-TOCTOU-in-domain-enumeration.patch + 8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch + 9363e1e6-virt-xml-add-support-for-mediated-devices.patch + 965480e8-virt-install-add-mediated-device.patch + 9d4002ee-tests-verify-MDEV-support.patch + cf93e2db-console-fix-error-with-old-pygobject.patch + d3c627f1-volumeupload-Use-1MiB-read-size.patch + d9b5090e-Fix-forgetting-password-from-keyring.patch + e7222b50-addstorage-Dont-pass-None-to-widget.set_active.patch + f87e96d3-hostdev-use-method-get_mdev_uuid.patch + fe8722e7-createnet-Remove-some-unnecessary-max_length-annotations.patch + virtinst-graphics-add-check-for-qemu-modules-in-spice-graphic.patch + virtman-add-firmware-preferences.patch + virtman-legacy-bios-support.patch + virtman-show-no-firmware-for-xenpv.patch + +------------------------------------------------------------------- Old: ---- 0e15cd51-virt-manager-enable-MDEV-support.patch 143c6bef-virtinst-fix-error-message-format-string.patch 4d0e3232-virtinst-Fix-TOCTOU-in-domain-enumeration.patch 8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch 9363e1e6-virt-xml-add-support-for-mediated-devices.patch 965480e8-virt-install-add-mediated-device.patch 9d4002ee-tests-verify-MDEV-support.patch cf93e2db-console-fix-error-with-old-pygobject.patch d3c627f1-volumeupload-Use-1MiB-read-size.patch d9b5090e-Fix-forgetting-password-from-keyring.patch e7222b50-addstorage-Dont-pass-None-to-widget.set_active.patch f87e96d3-hostdev-use-method-get_mdev_uuid.patch fe8722e7-createnet-Remove-some-unnecessary-max_length-annotations.patch virt-manager-3.2.0.tar.bz2 virtinst-graphics-add-check-for-qemu-modules-in-spice-graphic.patch virtman-add-firmware-preferences.patch virtman-legacy-bios-support.patch virtman-show-no-firmware-for-xenpv.patch New: ---- virt-manager-4.0.0.tar.gz virtman-revert-use-of-AyatanaAppIndicator3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:33.939718309 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:33.943718311 +0100 @@ -21,30 +21,17 @@ %global default_hvs "qemu,xen,lxc" Name: virt-manager -Version: 3.2.0 +Version: 4.0.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.bz2 +Source0: %{name}-%{version}.tar.gz Source1: virt-install.rb Source2: virt-install.desktop Source3: virt-manager-supportconfig # Upstream Patches -Patch1: e7222b50-addstorage-Dont-pass-None-to-widget.set_active.patch -Patch2: 4d0e3232-virtinst-Fix-TOCTOU-in-domain-enumeration.patch -Patch3: d3c627f1-volumeupload-Use-1MiB-read-size.patch -Patch4: cf93e2db-console-fix-error-with-old-pygobject.patch -Patch5: 143c6bef-virtinst-fix-error-message-format-string.patch -Patch6: fe8722e7-createnet-Remove-some-unnecessary-max_length-annotations.patch -Patch7: d9b5090e-Fix-forgetting-password-from-keyring.patch -Patch8: 965480e8-virt-install-add-mediated-device.patch -Patch9: 9363e1e6-virt-xml-add-support-for-mediated-devices.patch -Patch10: f87e96d3-hostdev-use-method-get_mdev_uuid.patch -Patch11: 9d4002ee-tests-verify-MDEV-support.patch -Patch12: 0e15cd51-virt-manager-enable-MDEV-support.patch -Patch13: 8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -57,7 +44,6 @@ Patch103: virtman-load-stored-uris.patch Patch104: virtman-add-tooltip-to-firmware.patch Patch105: virtman-modify-gui-defaults.patch -Patch106: virtman-add-firmware-preferences.patch Patch120: virtinst-default-xen-to-qcow2-format.patch Patch121: virtinst-detect-oes-distros.patch Patch122: virtinst-vol-default-nocow.patch @@ -67,7 +53,6 @@ Patch126: virtinst-add-sle15-detection-support.patch Patch127: virtinst-add-pvh-support.patch Patch128: virtinst-media-detection.patch -Patch129: virtinst-graphics-add-check-for-qemu-modules-in-spice-graphic.patch # Bug Fixes Patch151: virtman-increase-setKeepAlive-count.patch Patch152: virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch @@ -78,8 +63,7 @@ Patch157: virtman-fix-restore-vm-menu-selection.patch Patch158: virtman-disallow-adding-floppy-disk.patch Patch159: virtman-register-delete-event-for-details-dialog.patch -Patch160: virtman-show-no-firmware-for-xenpv.patch -Patch161: virtman-legacy-bios-support.patch +Patch160: virtman-revert-use-of-AyatanaAppIndicator3.patch Patch170: virtinst-xen-drive-type.patch Patch171: virtinst-xenbus-disk-index-fix.patch Patch172: virtinst-refresh_before_fetch_pool.patch @@ -112,6 +96,7 @@ Requires: virt-install Requires: virt-manager-common = %{verrel} Requires: typelib(GtkSource) +Recommends: xorriso %if %{with_guestfs} Requires: python3-libguestfs @@ -120,6 +105,7 @@ BuildRequires: gettext BuildRequires: python3-devel BuildRequires: python3-docutils +BuildRequires: python3-setuptools %description Virtual Machine Manager provides a graphical tool for administering virtual @@ -128,7 +114,6 @@ for existing VMs on local or remote machines. Uses libvirt as the backend management API. - %package common Summary: Common files used by the different Virtual Machine Manager interfaces Group: System/Monitoring @@ -151,7 +136,6 @@ Common files used by the different virt-manager interfaces, as well as virt-install related tools. - %package -n virt-install Summary: Utilities for installing virtual machines Group: System/Monitoring @@ -169,23 +153,9 @@ (build and install new VMs) and virt-clone (clone an existing virtual machine). - %prep %setup -q # Upstream Patches -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 @@ -198,7 +168,6 @@ %patch103 -p1 %patch104 -p1 %patch105 -p1 -%patch106 -p1 %patch120 -p1 %patch121 -p1 %patch122 -p1 @@ -208,7 +177,6 @@ %patch126 -p1 %patch127 -p1 %patch128 -p1 -%patch129 -p1 # Bug Fixes %patch151 -p1 %patch152 -p1 @@ -220,7 +188,6 @@ %patch158 -p1 %patch159 -p1 %patch160 -p1 -%patch161 -p1 %patch170 -p1 %patch171 -p1 %patch172 -p1 ++++++ virtinst-add-caasp-support.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.035718334 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.039718335 +0100 @@ -1,10 +1,10 @@ References: bsc#1010060 -Index: virt-manager-3.0.0/virtinst/install/urldetect.py +Index: virt-manager-3.3.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-3.0.0.orig/virtinst/install/urldetect.py -+++ virt-manager-3.0.0/virtinst/install/urldetect.py -@@ -277,6 +277,12 @@ class _SUSEContent(object): +--- virt-manager-3.3.0.orig/virtinst/install/urldetect.py ++++ virt-manager-3.3.0/virtinst/install/urldetect.py +@@ -278,6 +278,12 @@ class _SUSEContent(object): self.product_name.strip().rsplit(' ')[5][2]) distro_version = sle_version @@ -17,7 +17,7 @@ return distro_version -@@ -563,6 +569,9 @@ class _SuseDistro(_RHELDistro): +@@ -564,6 +570,9 @@ class _SuseDistro(_RHELDistro): version = distro_version.split('.', 1)[0].strip() @@ -27,7 +27,7 @@ if str(self._variant_prefix).startswith(("sles", "sled", "oes")): sp_version = "" if len(distro_version.split('.', 1)) == 2: -@@ -632,6 +641,14 @@ class _OpensuseDistro(_SuseDistro): +@@ -633,6 +642,14 @@ class _OpensuseDistro(_SuseDistro): famregex = ".*openSUSE.*" @@ -42,7 +42,7 @@ class _OESDistro(_SuseDistro): PRETTY_NAME = "OES" matching_distros = ["oes"] -@@ -869,6 +886,7 @@ def _build_distro_list(osobj): +@@ -870,6 +887,7 @@ def _build_distro_list(osobj): _SLESDistro, _SLEDDistro, _OpensuseDistro, ++++++ virtinst-add-oracle-linux-support.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.051718338 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.051718338 +0100 @@ -1,10 +1,10 @@ References: bsc#1192238, jsc#SLE-17764 -Index: virt-manager-3.2.0/virtinst/install/urldetect.py +Index: virt-manager-3.3.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/install/urldetect.py -+++ virt-manager-3.2.0/virtinst/install/urldetect.py -@@ -723,6 +723,26 @@ class _OESDistro(_SuseDistro): +--- virt-manager-3.3.0.orig/virtinst/install/urldetect.py ++++ virt-manager-3.3.0/virtinst/install/urldetect.py +@@ -724,6 +724,26 @@ class _OESDistro(_SuseDistro): famregex = ".*Open Enterprise Server.*" @@ -31,7 +31,7 @@ class _DebianDistro(_DistroTree): # ex. http://ftp.egr.msu.edu/debian/dists/sarge/main/installer-i386/ # daily builds: https://d-i.debian.org/daily-images/amd64/ -@@ -949,6 +969,7 @@ def _build_distro_list(osobj): +@@ -950,6 +970,7 @@ def _build_distro_list(osobj): _FedoraDistro, _RHELDistro, _CentOSDistro, ++++++ virtinst-add-pvh-support.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.063718341 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.067718342 +0100 @@ -1,11 +1,11 @@ References: fate#326698 - Add pvh support to virt-manager At this time support is disabled in this patch. -Index: virt-manager-3.2.0/virtManager/createvm.py +Index: virt-manager-4.0.0/virtManager/createvm.py =================================================================== ---- virt-manager-3.2.0.orig/virtManager/createvm.py -+++ virt-manager-3.2.0/virtManager/createvm.py -@@ -839,6 +839,9 @@ class vmmCreateVM(vmmGObjectUI): +--- virt-manager-4.0.0.orig/virtManager/createvm.py ++++ virt-manager-4.0.0/virtManager/createvm.py +@@ -844,6 +844,9 @@ class vmmCreateVM(vmmGObjectUI): break if label is None: continue @@ -15,11 +15,11 @@ # Determine if this is the default given by guest_lookup if (gtype == self._capsinfo.os_type and -Index: virt-manager-3.2.0/virtinst/domain/os.py +Index: virt-manager-4.0.0/virtinst/domain/os.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/domain/os.py -+++ virt-manager-3.2.0/virtinst/domain/os.py -@@ -32,6 +32,8 @@ class DomainOs(XMLBuilder): +--- virt-manager-4.0.0.orig/virtinst/domain/os.py ++++ virt-manager-4.0.0/virtinst/domain/os.py +@@ -46,6 +46,8 @@ class DomainOs(XMLBuilder): return self.os_type == "hvm" def is_xenpv(self): return self.os_type in ["xen", "linux"] @@ -28,24 +28,24 @@ def is_container(self): return self.os_type == "exe" -Index: virt-manager-3.2.0/virtinst/guest.py +Index: virt-manager-4.0.0/virtinst/guest.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/guest.py -+++ virt-manager-3.2.0/virtinst/guest.py -@@ -814,7 +814,7 @@ class Guest(XMLBuilder): +--- virt-manager-4.0.0.orig/virtinst/guest.py ++++ virt-manager-4.0.0/virtinst/guest.py +@@ -886,7 +886,7 @@ class Guest(XMLBuilder): usb_tablet = False usb_keyboard = False - if self.os.is_x86() and not self.os.is_xenpv(): + if self.os.is_x86() and not self.os.is_xenpv() and not self.os.is_xenpvh(): - usb_tablet = self.osinfo.supports_usbtablet() + usb_tablet = True if (self.os.is_arm_machvirt() or self.os.is_riscv_virt() or -Index: virt-manager-3.2.0/virtManager/object/domain.py +Index: virt-manager-4.0.0/virtManager/object/domain.py =================================================================== ---- virt-manager-3.2.0.orig/virtManager/object/domain.py -+++ virt-manager-3.2.0/virtManager/object/domain.py -@@ -1219,6 +1219,8 @@ class vmmDomain(vmmLibvirtObject): +--- virt-manager-4.0.0.orig/virtManager/object/domain.py ++++ virt-manager-4.0.0/virtManager/object/domain.py +@@ -1274,6 +1274,8 @@ class vmmDomain(vmmLibvirtObject): return self.get_xmlobj().os.is_xenpv() def is_hvm(self): return self.get_xmlobj().os.is_hvm() @@ -54,10 +54,10 @@ def get_uuid(self): if self._uuid is None: -Index: virt-manager-3.2.0/virtManager/connection.py +Index: virt-manager-4.0.0/virtManager/connection.py =================================================================== ---- virt-manager-3.2.0.orig/virtManager/connection.py -+++ virt-manager-3.2.0/virtManager/connection.py +--- virt-manager-4.0.0.orig/virtManager/connection.py ++++ virt-manager-4.0.0/virtManager/connection.py @@ -211,6 +211,8 @@ class vmmConnection(vmmGObject): label = "xen (paravirt)" elif gtype == "hvm": ++++++ virtinst-add-sle-hpc-support.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.075718343 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.079718345 +0100 @@ -1,10 +1,10 @@ References: bsc#1190215 -Index: virt-manager-3.2.0/virtinst/install/urldetect.py +Index: virt-manager-3.3.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/install/urldetect.py -+++ virt-manager-3.2.0/virtinst/install/urldetect.py -@@ -273,12 +273,17 @@ class _SUSEContent(object): +--- virt-manager-3.3.0.orig/virtinst/install/urldetect.py ++++ virt-manager-3.3.0/virtinst/install/urldetect.py +@@ -274,12 +274,17 @@ class _SUSEContent(object): if "Enterprise" in self.product_name or "SLES" in self.product_name: if " SAP " in self.product_name: sle_version = self.product_name.strip().rsplit(' ')[7] @@ -22,7 +22,7 @@ else: sle_version = (sle_version + '.' + self.product_name.strip().rsplit(' ')[5][2]) -@@ -670,6 +675,14 @@ class _SLESDistro(_SuseDistro): +@@ -671,6 +676,14 @@ class _SLESDistro(_SuseDistro): famregex = ".*SUSE Linux Enterprise.*" @@ -37,7 +37,7 @@ class _SLEDDistro(_SuseDistro): PRETTY_NAME = "SLED" matching_distros = ["sled"] -@@ -938,6 +951,7 @@ def _build_distro_list(osobj): +@@ -939,6 +952,7 @@ def _build_distro_list(osobj): _CentOSDistro, _SLEDistro, _SLESDistro, ++++++ virtinst-add-sle15-detection-support.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.095718349 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.099718350 +0100 @@ -1,10 +1,10 @@ References: bsc#1054986 -Index: virt-manager-3.0.0/virtinst/install/urldetect.py +Index: virt-manager-3.3.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-3.0.0.orig/virtinst/install/urldetect.py -+++ virt-manager-3.0.0/virtinst/install/urldetect.py -@@ -596,6 +596,10 @@ class _SuseDistro(_RHELDistro): +--- virt-manager-3.3.0.orig/virtinst/install/urldetect.py ++++ virt-manager-3.3.0/virtinst/install/urldetect.py +@@ -597,6 +597,10 @@ class _SuseDistro(_RHELDistro): if re.search("openSUSE Tumbleweed", self.cache.treeinfo_name): return "opensusetumbleweed" @@ -15,7 +15,7 @@ version, update = self.cache.split_version() base = self._variant_prefix + str(version) while update >= 0: -@@ -603,7 +607,10 @@ class _SuseDistro(_RHELDistro): +@@ -604,7 +608,10 @@ class _SuseDistro(_RHELDistro): # SLE doesn't use '.0' for initial releases in # osinfo-db (sles11, sles12, etc) if update > 0 or not base.startswith('sle'): @@ -27,7 +27,7 @@ if OSDB.lookup_os(tryvar): return tryvar update -= 1 -@@ -617,6 +624,14 @@ class _SuseDistro(_RHELDistro): +@@ -618,6 +625,14 @@ class _SuseDistro(_RHELDistro): return var @@ -42,7 +42,7 @@ class _SLESDistro(_SuseDistro): PRETTY_NAME = "SLES" matching_distros = ["sles"] -@@ -883,6 +898,7 @@ def _build_distro_list(osobj): +@@ -884,6 +899,7 @@ def _build_distro_list(osobj): _FedoraDistro, _RHELDistro, _CentOSDistro, ++++++ virtinst-add-slem-detection-support.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.111718352 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.115718354 +0100 @@ -1,11 +1,11 @@ Add support for detecting SUSE Linux Enterprise Micro. See also the osinfo-db package for the description file. -Index: virt-manager-3.2.0/virtinst/install/urldetect.py +Index: virt-manager-3.3.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/install/urldetect.py -+++ virt-manager-3.2.0/virtinst/install/urldetect.py -@@ -275,7 +275,7 @@ class _SUSEContent(object): +--- virt-manager-3.3.0.orig/virtinst/install/urldetect.py ++++ virt-manager-3.3.0/virtinst/install/urldetect.py +@@ -276,7 +276,7 @@ class _SUSEContent(object): sle_version = self.product_name.strip().rsplit(' ')[7] else: sle_version = self.product_name.strip().rsplit(' ')[4] @@ -14,7 +14,7 @@ if " SAP " in self.product_name: sle_version = (sle_version + '.' + self.product_name.strip().rsplit(' ')[8][2]) -@@ -596,6 +596,9 @@ class _SuseDistro(_RHELDistro): +@@ -597,6 +597,9 @@ class _SuseDistro(_RHELDistro): version = distro_version.split('.', 1)[0].strip() @@ -24,7 +24,7 @@ if self._variant_prefix.startswith(("caasp")): return self._variant_prefix + distro_version -@@ -683,6 +686,14 @@ class _OpensuseDistro(_SuseDistro): +@@ -684,6 +687,14 @@ class _OpensuseDistro(_SuseDistro): famregex = ".*openSUSE.*" @@ -39,7 +39,7 @@ class _CAASPDistro(_SuseDistro): PRETTY_NAME = "SLES" matching_distros = ["caasp"] -@@ -929,6 +940,7 @@ def _build_distro_list(osobj): +@@ -930,6 +941,7 @@ def _build_distro_list(osobj): _SLESDistro, _SLEDDistro, _OpensuseDistro, ++++++ virtinst-change-location-for-grub_xen.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.123718356 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.127718357 +0100 @@ -1,10 +1,10 @@ References: fate#326960, bsc#1123942 -Index: virt-manager-3.2.0/virtinst/install/installer.py +Index: virt-manager-4.0.0/virtinst/install/installer.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/install/installer.py -+++ virt-manager-3.2.0/virtinst/install/installer.py -@@ -604,7 +604,10 @@ class Installer(object): +--- virt-manager-4.0.0.orig/virtinst/install/installer.py ++++ virt-manager-4.0.0/virtinst/install/installer.py +@@ -592,7 +592,10 @@ class Installer(object): guest.bootloader = "pygrub" else: guest.bootloader = None @@ -16,11 +16,11 @@ log.debug("Using grub.xen to boot guest") on_reboot_value = guest.on_reboot self._alter_bootconfig(guest) -Index: virt-manager-3.2.0/virtManager/delete.py +Index: virt-manager-4.0.0/virtManager/delete.py =================================================================== ---- virt-manager-3.2.0.orig/virtManager/delete.py -+++ virt-manager-3.2.0/virtManager/delete.py -@@ -458,7 +458,7 @@ def _populate_storage_list(storage_list, +--- virt-manager-4.0.0.orig/virtManager/delete.py ++++ virt-manager-4.0.0/virtManager/delete.py +@@ -459,7 +459,7 @@ def _populate_storage_list(storage_list, model.clear() for diskdata in diskdatas: ++++++ virtinst-detect-oes-distros.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.143718361 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.147718362 +0100 @@ -1,10 +1,10 @@ Enhancement to correctly detect Open Enterprise Server media is selected as the installation source. -Index: virt-manager-3.0.0/virtinst/install/urldetect.py +Index: virt-manager-3.3.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-3.0.0.orig/virtinst/install/urldetect.py -+++ virt-manager-3.0.0/virtinst/install/urldetect.py -@@ -563,7 +563,7 @@ class _SuseDistro(_RHELDistro): +--- virt-manager-3.3.0.orig/virtinst/install/urldetect.py ++++ virt-manager-3.3.0/virtinst/install/urldetect.py +@@ -564,7 +564,7 @@ class _SuseDistro(_RHELDistro): version = distro_version.split('.', 1)[0].strip() @@ -13,7 +13,7 @@ sp_version = "" if len(distro_version.split('.', 1)) == 2: sp_version = 'sp' + distro_version.split('.', 1)[1].strip() -@@ -632,6 +632,14 @@ class _OpensuseDistro(_SuseDistro): +@@ -633,6 +633,14 @@ class _OpensuseDistro(_SuseDistro): famregex = ".*openSUSE.*" @@ -28,7 +28,7 @@ class _DebianDistro(_DistroTree): # ex. http://ftp.egr.msu.edu/debian/dists/sarge/main/installer-i386/ # daily builds: https://d-i.debian.org/daily-images/amd64/ -@@ -861,6 +869,7 @@ def _build_distro_list(osobj): +@@ -862,6 +870,7 @@ def _build_distro_list(osobj): _SLESDistro, _SLEDDistro, _OpensuseDistro, ++++++ virtinst-dont-use-special-copy-cpu-features.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.159718365 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.163718366 +0100 @@ -12,12 +12,12 @@ and "CPUs" -> "Copy host CPU definition" also inserts 'host-model' so this change mirrors what is already done there. -Index: virt-manager-3.0.0/virtinst/domain/cpu.py +Index: virt-manager-3.3.0/virtinst/domain/cpu.py =================================================================== ---- virt-manager-3.0.0.orig/virtinst/domain/cpu.py -+++ virt-manager-3.0.0/virtinst/domain/cpu.py -@@ -122,12 +122,16 @@ class DomainCpu(XMLBuilder): - val = self.SPECIAL_MODE_HOST_MODEL +--- virt-manager-3.3.0.orig/virtinst/domain/cpu.py ++++ virt-manager-3.3.0/virtinst/domain/cpu.py +@@ -282,7 +282,8 @@ class DomainCpu(XMLBuilder): + log.debug("Using default cpu mode=%s", val) if (val == self.SPECIAL_MODE_HOST_MODEL or - val == self.SPECIAL_MODE_HOST_PASSTHROUGH): @@ -26,12 +26,14 @@ self.model = None self.vendor = None self.model_fallback = None +@@ -290,6 +291,9 @@ class DomainCpu(XMLBuilder): + self.check = None for f in self.features: self.remove_child(f) + if val == self.SPECIAL_MODE_HOST_COPY: + val = self.SPECIAL_MODE_HOST_MODEL + self.match = "exact" self.mode = val - elif val == self.SPECIAL_MODE_HOST_COPY: - self.copy_host_cpu(guest) + elif (val == self.SPECIAL_MODE_HV_DEFAULT or + val == self.SPECIAL_MODE_CLEAR): ++++++ virtinst-keep-install-iso-attached.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.175718369 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.175718369 +0100 @@ -2,11 +2,11 @@ Newer SLE PV guests hang when a cdrom device is attached without an ISO file. -Index: virt-manager-3.2.0/virtinst/install/installer.py +Index: virt-manager-3.3.0/virtinst/install/installer.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/install/installer.py -+++ virt-manager-3.2.0/virtinst/install/installer.py -@@ -167,7 +167,8 @@ class Installer(object): +--- virt-manager-3.3.0.orig/virtinst/install/installer.py ++++ virt-manager-3.3.0/virtinst/install/installer.py +@@ -168,7 +168,8 @@ class Installer(object): def _remove_install_cdrom_media(self, guest): if not self._install_cdrom_device_added: return ++++++ virtinst-keep-iso-for-xenpv.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.191718373 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.195718374 +0100 @@ -2,11 +2,11 @@ Removing the cdrom iso file from the device prevents booting with a qemu error. -Index: virt-manager-3.2.0/virtinst/install/installer.py +Index: virt-manager-3.3.0/virtinst/install/installer.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/install/installer.py -+++ virt-manager-3.2.0/virtinst/install/installer.py -@@ -174,8 +174,9 @@ class Installer(object): +--- virt-manager-3.3.0.orig/virtinst/install/installer.py ++++ virt-manager-3.3.0/virtinst/install/installer.py +@@ -175,8 +175,9 @@ class Installer(object): for disk in guest.devices.disk: if (disk.is_cdrom() and disk.get_source_path() == self._cdrom_path()): ++++++ virtinst-media-detection.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.207718377 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.211718378 +0100 @@ -2,11 +2,11 @@ look in the media.1/products and media.1/media files for information. Caasp 4.0 has not content or .treeinfo file on the media -Index: virt-manager-3.0.0/virtinst/install/urldetect.py +Index: virt-manager-3.3.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-3.0.0.orig/virtinst/install/urldetect.py -+++ virt-manager-3.0.0/virtinst/install/urldetect.py -@@ -504,8 +504,23 @@ class _SuseDistro(_RHELDistro): +--- virt-manager-3.3.0.orig/virtinst/install/urldetect.py ++++ virt-manager-3.3.0/virtinst/install/urldetect.py +@@ -505,8 +505,23 @@ class _SuseDistro(_RHELDistro): cache.checked_for_suse_content = True content_str = cache.acquire_file_content("content") if content_str is None: ++++++ virtinst-pvgrub2-bootloader.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.223718381 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.227718382 +0100 @@ -2,11 +2,11 @@ grub.xen is required to boot PV VMs that use the BTRFS filesystem. This patch forces the use of grub.xen (instead of using pygrub) for suse distros SLE12GA, openSUSE 13.2, and newer. -Index: virt-manager-3.2.0/virtinst/install/installer.py +Index: virt-manager-4.0.0/virtinst/install/installer.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/install/installer.py -+++ virt-manager-3.2.0/virtinst/install/installer.py -@@ -220,7 +220,8 @@ class Installer(object): +--- virt-manager-4.0.0.orig/virtinst/install/installer.py ++++ virt-manager-4.0.0/virtinst/install/installer.py +@@ -222,7 +222,8 @@ class Installer(object): def _alter_treemedia_bootconfig(self, guest): if not self._treemedia: @@ -16,10 +16,10 @@ kernel, initrd, kernel_args = self._treemedia_bootconfig if kernel: -@@ -594,6 +595,20 @@ class Installer(object): - install_xml = None - if self.has_install_phase(): - install_xml = self._get_install_xml(guest, meter) +@@ -582,6 +583,21 @@ class Installer(object): + final_xml = guest.get_xml() + if self._requires_postboot_xml_changes(): + initial_xml, final_xml = self._build_postboot_xml(final_xml, meter) + if (guest.os.is_xenpv() and + not guest.os.kernel): + os_ver = guest.osinfo.name @@ -34,7 +34,8 @@ + on_reboot_value = guest.on_reboot + self._alter_bootconfig(guest) + guest.on_reboot = on_reboot_value - final_xml = self._pre_reinstall_xml or guest.get_xml() ++ final_xml = guest.get_xml() + final_xml = self._pre_reinstall_xml or final_xml - log.debug("Generated install XML: %s", + log.debug("Generated initial_xml: %s", ++++++ virtinst-s390x-disable-graphics.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.243718386 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.247718387 +0100 @@ -1,10 +1,10 @@ Reference: bnc#869024 Disable graphics on s390x -Index: virt-manager-3.0.0/virtinst/guest.py +Index: virt-manager-4.0.0/virtinst/guest.py =================================================================== ---- virt-manager-3.0.0.orig/virtinst/guest.py -+++ virt-manager-3.0.0/virtinst/guest.py -@@ -195,7 +195,10 @@ class Guest(XMLBuilder): +--- virt-manager-4.0.0.orig/virtinst/guest.py ++++ virt-manager-4.0.0/virtinst/guest.py +@@ -198,7 +198,10 @@ class Guest(XMLBuilder): self.skip_default_channel = False self.skip_default_sound = False self.skip_default_usbredir = False @@ -14,9 +14,9 @@ + else: + self.skip_default_graphics = False self.skip_default_rng = False + self.skip_default_tpm = False self.x86_cpu_default = self.cpu.SPECIAL_MODE_APP_DEFAULT - -@@ -337,7 +340,7 @@ class Guest(XMLBuilder): +@@ -347,7 +350,7 @@ class Guest(XMLBuilder): if not os_support: return False @@ -25,7 +25,7 @@ return True return False # pragma: no cover -@@ -854,7 +857,7 @@ class Guest(XMLBuilder): +@@ -933,7 +936,7 @@ class Guest(XMLBuilder): self.add_device(dev) def _add_default_video_device(self): ++++++ virtinst-sap-detection.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.259718390 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.263718391 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-3.2.0/virtinst/install/urldetect.py +Index: virt-manager-3.3.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/install/urldetect.py -+++ virt-manager-3.2.0/virtinst/install/urldetect.py -@@ -271,9 +271,16 @@ class _SUSEContent(object): +--- virt-manager-3.3.0.orig/virtinst/install/urldetect.py ++++ virt-manager-3.3.0/virtinst/install/urldetect.py +@@ -272,9 +272,16 @@ class _SUSEContent(object): distro_version = distro_version.strip() if "Enterprise" in self.product_name or "SLES" in self.product_name: ++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.275718394 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.279718395 +0100 @@ -1,30 +1,38 @@ Set cache mode for target installation disk to unsafe for better performance. -Index: virt-manager-3.2.0/virtinst/install/installer.py +Index: virt-manager-3.3.0/virtinst/install/installer.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/install/installer.py -+++ virt-manager-3.2.0/virtinst/install/installer.py -@@ -580,11 +580,22 @@ class Installer(object): - guest.memory) = data +--- virt-manager-3.3.0.orig/virtinst/install/installer.py ++++ virt-manager-3.3.0/virtinst/install/installer.py +@@ -567,16 +567,29 @@ class Installer(object): - def _get_install_xml(self, guest, meter): + def _build_postboot_xml(self, final_xml, meter): + initial_guest = Guest(self.conn, parsexml=final_xml) + # At install time set the target disk to 'unsafe' for + # better performance if the target is not a block device + saved_cache = "None" -+ if guest.devices.disk: -+ target_disk = guest.devices.disk[0] ++ if initial_guest.devices.disk: ++ target_disk = initial_guest.devices.disk[0] + saved_cache = target_disk.driver_cache + if target_disk.type != DeviceDisk.TYPE_BLOCK and target_disk.driver_io != "native": + target_disk.driver_cache = DeviceDisk.CACHE_MODE_UNSAFE + - data = self._prepare_get_install_xml(guest) - try: - self._alter_bootconfig(guest) - self._alter_install_resources(guest, meter) - ret = guest.get_xml() -+ if saved_cache != "None": -+ target_disk.driver_cache = saved_cache - return ret - finally: - self._remove_install_cdrom_media(guest) + self._alter_bootconfig(initial_guest) + self._alter_install_resources(initial_guest, meter) + if self.has_cloudinit(): + initial_guest.set_smbios_serial_cloudinit() + ++ install_xml = initial_guest.get_xml() ++ if saved_cache != "None": ++ target_disk.driver_cache = saved_cache ++ + final_guest = Guest(self.conn, parsexml=final_xml) + self._remove_install_cdrom_media(final_guest) + self._remove_unattended_install_cdrom_device(final_guest) + +- return initial_guest.get_xml(), final_guest.get_xml() ++ return install_xml, final_guest.get_xml() + + def _build_xml(self, guest, meter): + initial_xml = None ++++++ virtinst-set-default-nic.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.291718398 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.291718398 +0100 @@ -1,11 +1,11 @@ References: bsc#1172356, bsc#1177620 Libvirt doesn't accept "Hypervisor default" as a model name -Index: virt-manager-3.1.0/virtinst/devices/interface.py +Index: virt-manager-3.3.0/virtinst/devices/interface.py =================================================================== ---- virt-manager-3.1.0.orig/virtinst/devices/interface.py -+++ virt-manager-3.1.0/virtinst/devices/interface.py -@@ -284,6 +284,9 @@ class DeviceInterface(Device): +--- virt-manager-3.3.0.orig/virtinst/devices/interface.py ++++ virt-manager-3.3.0/virtinst/devices/interface.py +@@ -302,6 +302,9 @@ class DeviceInterface(Device): return "e1000e" if not guest.os.is_x86(): return None ++++++ virtinst-set-qemu-emulator.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.307718402 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.307718402 +0100 @@ -1,12 +1,12 @@ Use the correct qemu emulator based on the architecture. We want to get away from using the old qemu-dm emulator for Xen HVM guests so default to qemu-system-i386. -Index: virt-manager-3.0.0/virtinst/guest.py +Index: virt-manager-4.0.0/virtinst/guest.py =================================================================== ---- virt-manager-3.0.0.orig/virtinst/guest.py -+++ virt-manager-3.0.0/virtinst/guest.py -@@ -727,6 +727,10 @@ class Guest(XMLBuilder): - self._add_default_memballoon() +--- virt-manager-4.0.0.orig/virtinst/guest.py ++++ virt-manager-4.0.0/virtinst/guest.py +@@ -778,6 +778,10 @@ class Guest(XMLBuilder): + self._add_default_tpm() self.clock.set_defaults(self) + if self.os.is_hvm() and self.type == "xen": ++++++ virtinst-smbios-unsupported-for-xenpv.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.319718406 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.323718407 +0100 @@ -1,16 +1,16 @@ References: bsc#1180069 -Index: virt-manager-3.2.0/virtinst/guest.py +Index: virt-manager-4.0.0/virtinst/guest.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/guest.py -+++ virt-manager-3.2.0/virtinst/guest.py -@@ -704,6 +704,8 @@ class Guest(XMLBuilder): +--- virt-manager-4.0.0.orig/virtinst/guest.py ++++ virt-manager-4.0.0/virtinst/guest.py +@@ -687,6 +687,8 @@ class Guest(XMLBuilder): self.type != "kvm"): log.warning( # pragma: no cover "KVM acceleration not available, using '%s'", self.type) + if self.os.is_xenpv() and self.os.smbios_mode is not None: + raise RuntimeError(_("The --sysinfo flag (smbios) is not supported for Xen PV guests.")) - def sync_vcpus_topology(self): + def refresh_machine_type(self): """ ++++++ virtinst-use-qemu-for-cdrom-device.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.335718409 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.339718410 +0100 @@ -2,11 +2,11 @@ When the device added is a cdrom device (/dev/sr0), don't use "phy" as the driver name but instead use "qemu". -Index: virt-manager-3.2.0/virtinst/devices/disk.py +Index: virt-manager-3.3.0/virtinst/devices/disk.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/devices/disk.py -+++ virt-manager-3.2.0/virtinst/devices/disk.py -@@ -527,7 +527,8 @@ class DeviceDisk(Device): +--- virt-manager-3.3.0.orig/virtinst/devices/disk.py ++++ virt-manager-3.3.0/virtinst/devices/disk.py +@@ -525,7 +525,8 @@ class DeviceDisk(Device): # Recommended xen defaults from here: # https://bugzilla.redhat.com/show_bug.cgi?id=1171550#c9 # If type block, use name=phy. Otherwise do the same as qemu ++++++ virtinst-use-xenpae-kernel-for-32bit.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.351718413 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.355718415 +0100 @@ -4,11 +4,11 @@ virtualized if the pae kernel is selected. Note that sles12 and newer has no 32bit release. -Index: virt-manager-3.0.0/virtinst/install/urldetect.py +Index: virt-manager-3.3.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-3.0.0.orig/virtinst/install/urldetect.py -+++ virt-manager-3.0.0/virtinst/install/urldetect.py -@@ -549,9 +549,14 @@ class _SuseDistro(_RHELDistro): +--- virt-manager-3.3.0.orig/virtinst/install/urldetect.py ++++ virt-manager-3.3.0/virtinst/install/urldetect.py +@@ -550,9 +550,14 @@ class _SuseDistro(_RHELDistro): if self.type == "xen": # Matches Opensuse > 10.2 and sles 10 ++++++ virtinst-vol-default-nocow.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.367718418 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.371718419 +0100 @@ -4,10 +4,10 @@ Signed-off-by: Chunyan Liu <cy...@suse.com> -Index: virt-manager-3.2.0/virtinst/storage.py +Index: virt-manager-3.3.0/virtinst/storage.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/storage.py -+++ virt-manager-3.2.0/virtinst/storage.py +--- virt-manager-3.3.0.orig/virtinst/storage.py ++++ virt-manager-3.3.0/virtinst/storage.py @@ -570,6 +570,11 @@ class StorageVolume(_StorageObject): return self._pool_xml.get_disk_type() file_type = property(_get_vol_type) @@ -20,10 +20,10 @@ ################## # XML properties # -Index: virt-manager-3.2.0/virtinst/support.py +Index: virt-manager-3.3.0/virtinst/support.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/support.py -+++ virt-manager-3.2.0/virtinst/support.py +--- virt-manager-3.3.0.orig/virtinst/support.py ++++ virt-manager-3.3.0/virtinst/support.py @@ -269,6 +269,7 @@ class SupportCache: conn_vnc_none_auth = _make(hv_version={"qemu": "2.9.0"}) conn_device_boot_order = _make(hv_version={"qemu": 0, "test": 0}) ++++++ virtinst-xen-drive-type.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.387718423 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.391718424 +0100 @@ -2,11 +2,11 @@ Virt-manager on Xen doesn't fill in any type thereby defaulting to 'raw'. This patch will generate the correct XML on Xen. -Index: virt-manager-3.2.0/virtinst/devices/disk.py +Index: virt-manager-3.3.0/virtinst/devices/disk.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/devices/disk.py -+++ virt-manager-3.2.0/virtinst/devices/disk.py -@@ -544,6 +544,10 @@ class DeviceDisk(Device): +--- virt-manager-3.3.0.orig/virtinst/devices/disk.py ++++ virt-manager-3.3.0/virtinst/devices/disk.py +@@ -542,6 +542,10 @@ class DeviceDisk(Device): https://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html """ if self.driver_name != self.DRIVER_NAME_QEMU: ++++++ virtinst-xenbus-disk-index-fix.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.403718427 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.403718427 +0100 @@ -6,11 +6,11 @@ passed to qemu where it error'ed out with the disks having the same index (in this case both are 0). -Index: virt-manager-3.2.0/virtinst/devices/disk.py +Index: virt-manager-3.3.0/virtinst/devices/disk.py =================================================================== ---- virt-manager-3.2.0.orig/virtinst/devices/disk.py -+++ virt-manager-3.2.0/virtinst/devices/disk.py -@@ -896,6 +896,17 @@ class DeviceDisk(Device): +--- virt-manager-3.3.0.orig/virtinst/devices/disk.py ++++ virt-manager-3.3.0/virtinst/devices/disk.py +@@ -895,6 +895,17 @@ class DeviceDisk(Device): :returns: generated target """ prefix, maxnode = self.get_target_prefix() @@ -28,7 +28,7 @@ skip_targets = [t for t in skip_targets if t and t.startswith(prefix)] skip_targets.sort() -@@ -903,11 +914,18 @@ class DeviceDisk(Device): +@@ -902,11 +913,18 @@ class DeviceDisk(Device): first_found = None for i in range(maxnode): ++++++ virtman-add-tooltip-to-firmware.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.415718429 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.419718430 +0100 @@ -2,8 +2,10 @@ 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. ---- virt-manager-3.1.0/virtManager/details/details.py.orig 2020-10-30 13:56:26.748245557 -0600 -+++ virt-manager-3.1.0/virtManager/details/details.py 2020-10-30 13:56:48.952246534 -0600 +Index: virt-manager-3.3.0/virtManager/details/details.py +=================================================================== +--- virt-manager-3.3.0.orig/virtManager/details/details.py ++++ virt-manager-3.3.0/virtManager/details/details.py @@ -5,6 +5,9 @@ # See the COPYING file in the top-level directory. @@ -14,7 +16,7 @@ from gi.repository import Gtk -@@ -424,7 +427,7 @@ class vmmDetails(vmmGObjectUI): +@@ -421,7 +424,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), @@ -23,7 +25,7 @@ "on_overview_chipset_changed": _e(EDIT_MACHTYPE), "on_details_inspection_refresh_clicked": self._inspection_refresh_clicked_cb, -@@ -1125,6 +1128,49 @@ class vmmDetails(vmmGObjectUI): +@@ -1117,6 +1120,49 @@ class vmmDetails(vmmGObjectUI): self.storage_browser.set_browse_reason(reason) self.storage_browser.show(self.topwin) ++++++ virtman-allow-creating-i686-vm.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.431718434 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.435718435 +0100 @@ -1,11 +1,11 @@ References: bsc#919692 Because openSUSE repos combine 32 and 64 bit sources we need to continue showing the 'Architecture' pop-up. -Index: virt-manager-3.2.0/virtManager/createvm.py +Index: virt-manager-3.3.0/virtManager/createvm.py =================================================================== ---- virt-manager-3.2.0.orig/virtManager/createvm.py -+++ virt-manager-3.2.0/virtManager/createvm.py -@@ -864,11 +864,6 @@ class vmmCreateVM(vmmGObjectUI): +--- virt-manager-3.3.0.orig/virtManager/createvm.py ++++ virt-manager-3.3.0/virtManager/createvm.py +@@ -869,11 +869,6 @@ class vmmCreateVM(vmmGObjectUI): for guest in self.conn.caps.guests: if guest.os_type == self._capsinfo.os_type: archs.append(guest.arch) ++++++ virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.447718438 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.451718438 +0100 @@ -6,11 +6,11 @@ 4) Edit the VM's /etc/default/grub file and remove the crashkernel information and then run grub2-mkconfig /boot/grub2/grub.cfg. 5) Start the VM and within the VM's terminal type "echo 'c' > /proc/sysrq-trigger" -Index: virt-manager-3.1.0/virtManager/manager.py +Index: virt-manager-3.3.0/virtManager/manager.py =================================================================== ---- virt-manager-3.1.0.orig/virtManager/manager.py -+++ virt-manager-3.1.0/virtManager/manager.py -@@ -780,7 +780,7 @@ class vmmManager(vmmGObjectUI): +--- virt-manager-3.3.0.orig/virtManager/manager.py ++++ virt-manager-3.3.0/virtManager/manager.py +@@ -776,7 +776,7 @@ class vmmManager(vmmGObjectUI): show_pause = bool(vm and vm.is_unpauseable()) else: show_pause = bool(vm and vm.is_pauseable()) @@ -19,10 +19,10 @@ if vm and vm.managedsave_supported: self.change_run_text(vm.has_managed_save()) -Index: virt-manager-3.1.0/virtManager/vmmenu.py +Index: virt-manager-3.3.0/virtManager/vmmenu.py =================================================================== ---- virt-manager-3.1.0.orig/virtManager/vmmenu.py -+++ virt-manager-3.1.0/virtManager/vmmenu.py +--- virt-manager-3.3.0.orig/virtManager/vmmenu.py ++++ virt-manager-3.3.0/virtManager/vmmenu.py @@ -21,6 +21,7 @@ class _VMMenu(Gtk.Menu): self._parent = src self._current_vm_cb = current_vm_cb @@ -31,7 +31,7 @@ self._init_state() -@@ -85,6 +86,7 @@ class VMShutdownMenu(_VMMenu): +@@ -72,6 +73,7 @@ class VMShutdownMenu(_VMMenu): name = getattr(child, "vmm_widget_name", None) if name in statemap: child.set_sensitive(statemap[name]) @@ -39,17 +39,17 @@ class VMActionMenu(_VMMenu): -@@ -99,7 +101,8 @@ class VMActionMenu(_VMMenu): - self._add_action(_("R_esume"), "resume", VMActionUI.resume, - Gtk.STOCK_MEDIA_PAUSE) +@@ -83,7 +85,8 @@ class VMActionMenu(_VMMenu): + self._add_action(_("_Pause"), "suspend", VMActionUI.suspend) + self._add_action(_("R_esume"), "resume", VMActionUI.resume) s = self._add_action(_("_Shut Down"), "shutdown", None) - s.set_submenu(VMShutdownMenu(self._parent, self._current_vm_cb)) + self._shutdown = VMShutdownMenu(self._parent, self._current_vm_cb) + s.set_submenu(self._shutdown) self.add(Gtk.SeparatorMenuItem()) - self._add_action(_("Clone..."), "clone", -@@ -120,7 +123,7 @@ class VMActionMenu(_VMMenu): + self._add_action(_("Clone..."), "clone", VMActionUI.clone) +@@ -100,7 +103,7 @@ class VMActionMenu(_VMMenu): def update_widget_states(self, vm): statemap = { "run": bool(vm and vm.is_runable()), @@ -58,7 +58,7 @@ "suspend": bool(vm and vm.is_stoppable()), "resume": bool(vm and vm.is_paused()), "migrate": bool(vm and vm.is_stoppable()), -@@ -137,6 +140,8 @@ class VMActionMenu(_VMMenu): +@@ -117,6 +120,8 @@ class VMActionMenu(_VMMenu): child.get_submenu().update_widget_states(vm) if name in statemap: child.set_sensitive(statemap[name]) ++++++ virtman-check-for-valid-display.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.463718442 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.467718443 +0100 @@ -1,10 +1,10 @@ References: bnc#907958 Sanity check for those who forget '-X' on ssh and try to start virt-manager -Index: virt-manager-3.1.0/virtManager/virtmanager.py +Index: virt-manager-3.3.0/virtManager/virtmanager.py =================================================================== ---- virt-manager-3.1.0.orig/virtManager/virtmanager.py -+++ virt-manager-3.1.0/virtManager/virtmanager.py -@@ -62,8 +62,11 @@ def _import_gtk(leftovers): +--- virt-manager-3.3.0.orig/virtManager/virtmanager.py ++++ virt-manager-3.3.0/virtManager/virtmanager.py +@@ -66,8 +66,11 @@ def _import_gtk(leftovers): print("gtk3 3.22.0 or later is required.") sys.exit(1) ++++++ virtman-desktop.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.475718445 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.479718446 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-3.0.0/data/virt-manager.desktop.in +Index: virt-manager-3.3.0/data/virt-manager.desktop.in =================================================================== ---- virt-manager-3.0.0.orig/data/virt-manager.desktop.in -+++ virt-manager-3.0.0/data/virt-manager.desktop.in -@@ -1,8 +1,19 @@ +--- virt-manager-3.3.0.orig/data/virt-manager.desktop.in ++++ virt-manager-3.3.0/data/virt-manager.desktop.in +@@ -1,9 +1,20 @@ [Desktop Entry] Name=Virtual Machine Manager -Comment=Manage virtual machines @@ -13,6 +13,7 @@ +Exec=/usr/bin/virt-manager Type=Application Terminal=false + Keywords=vmm; -Categories=System; +Encoding=UTF-8 +Categories=GTK;GNOME;System;Monitor;X-SuSE-YaST;X-SuSE-YaST-Virtualization; ++++++ virtman-disallow-adding-floppy-disk.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.491718449 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.491718449 +0100 @@ -4,11 +4,11 @@ added. -Index: virt-manager-3.2.0/virtManager/addhardware.py +Index: virt-manager-3.3.0/virtManager/addhardware.py =================================================================== ---- virt-manager-3.2.0.orig/virtManager/addhardware.py -+++ virt-manager-3.2.0/virtManager/addhardware.py -@@ -484,6 +484,9 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-3.3.0.orig/virtManager/addhardware.py ++++ virt-manager-3.3.0/virtManager/addhardware.py +@@ -487,6 +487,9 @@ class vmmAddHardware(vmmGObjectUI): buses = domcaps.devices.disk.get_enum("bus").get_values() else: buses = vmmAddHardware.disk_old_recommended_buses(guest) @@ -18,7 +18,7 @@ bus_map = { "disk": ["ide", "sata", "scsi", "sd", "usb", "virtio", "xen"], -@@ -503,6 +506,7 @@ class vmmAddHardware(vmmGObjectUI): +@@ -506,6 +509,7 @@ class vmmAddHardware(vmmGObjectUI): "usb": _("USB"), "virtio": _("VirtIO"), "xen": _("Xen"), @@ -26,7 +26,7 @@ } return bus_mappings.get(bus, bus) -@@ -687,8 +691,9 @@ class vmmAddHardware(vmmGObjectUI): +@@ -673,8 +677,9 @@ class vmmAddHardware(vmmGObjectUI): "drive-harddisk", _("Disk device")]) target_model.append([DeviceDisk.DEVICE_CDROM, "media-optical", _("CDROM device")]) ++++++ virtman-dont-allow-grub.xen-to-be-deleted.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.503718452 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.507718453 +0100 @@ -1,11 +1,11 @@ Reference: bnc#885094 grub.xen is required to boot Xen PV VMs using BTRFS. It belongs to the grub2-x86_64-xen RPM and should never be deleted. -Index: virt-manager-3.0.0/virtManager/delete.py +Index: virt-manager-3.3.0/virtManager/delete.py =================================================================== ---- virt-manager-3.0.0.orig/virtManager/delete.py -+++ virt-manager-3.0.0/virtManager/delete.py -@@ -458,7 +458,7 @@ def _populate_storage_list(storage_list, +--- virt-manager-3.3.0.orig/virtManager/delete.py ++++ virt-manager-3.3.0/virtManager/delete.py +@@ -459,7 +459,7 @@ def _populate_storage_list(storage_list, model.clear() for diskdata in diskdatas: ++++++ virtman-fix-restore-vm-menu-selection.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.523718457 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.527718458 +0100 @@ -3,11 +3,11 @@ Libvirt returns libvirt.VIR_DOMAIN_PMSUSPENDED after a vm has been 'saved'. -Index: virt-manager-3.2.0/virtManager/object/domain.py +Index: virt-manager-3.3.0/virtManager/object/domain.py =================================================================== ---- virt-manager-3.2.0.orig/virtManager/object/domain.py -+++ virt-manager-3.2.0/virtManager/object/domain.py -@@ -1526,7 +1526,8 @@ class vmmDomain(vmmLibvirtObject): +--- virt-manager-3.3.0.orig/virtManager/object/domain.py ++++ virt-manager-3.3.0/virtManager/object/domain.py +@@ -1581,7 +1581,8 @@ class vmmDomain(vmmLibvirtObject): return (self.is_stoppable() or self.status() in [libvirt.VIR_DOMAIN_CRASHED]) def is_runable(self): ++++++ virtman-increase-setKeepAlive-count.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.543718462 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.547718463 +0100 @@ -2,11 +2,11 @@ For very large memory VMs Xen takes a long time scrubbing memory which causes the libvirt connection to timeout. Upstream was not interested in making this a preferences option (4/11/2015) -Index: virt-manager-3.0.0/virtManager/connection.py +Index: virt-manager-3.3.0/virtManager/connection.py =================================================================== ---- virt-manager-3.0.0.orig/virtManager/connection.py -+++ virt-manager-3.0.0/virtManager/connection.py -@@ -970,7 +970,7 @@ class vmmConnection(vmmGObject): +--- virt-manager-3.3.0.orig/virtManager/connection.py ++++ virt-manager-3.3.0/virtManager/connection.py +@@ -971,7 +971,7 @@ class vmmConnection(vmmGObject): self._add_conn_events() try: ++++++ virtman-modify-gui-defaults.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.567718468 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.571718469 +0100 @@ -1,11 +1,11 @@ Enhancement for the following GUI wizard installation option. 1) If Xen, leave 'Architecture options' expanded so users know PV is the default -Index: virt-manager-3.1.0/virtManager/createvm.py +Index: virt-manager-3.3.0/virtManager/createvm.py =================================================================== ---- virt-manager-3.1.0.orig/virtManager/createvm.py -+++ virt-manager-3.1.0/virtManager/createvm.py -@@ -459,8 +459,20 @@ class vmmCreateVM(vmmGObjectUI): +--- virt-manager-3.3.0.orig/virtManager/createvm.py ++++ virt-manager-3.3.0/virtManager/createvm.py +@@ -460,8 +460,20 @@ class vmmCreateVM(vmmGObjectUI): self.widget("method-local").set_active(True) self.widget("create-conn").set_active(-1) activeconn = self._populate_conn_list(urihint) ++++++ virtman-revert-use-of-AyatanaAppIndicator3.patch ++++++ While AyatanaAppIndicator3 is available on Tumbleweed, it is not available on SLE15. Index: virt-manager-3.3.0/virtManager/systray.py =================================================================== --- virt-manager-3.3.0.orig/virtManager/systray.py +++ virt-manager-3.3.0/virtManager/systray.py @@ -6,7 +6,6 @@ import os -import gi from gi.repository import Gio from gi.repository import Gtk @@ -17,25 +16,14 @@ from . import vmmenu from .baseclass import vmmGObject from .connmanager import vmmConnectionManager - -# pylint: disable=ungrouped-imports -# Prefer AyatantaAppIndicator3 which is the modern maintained -# appindicator library. -try: # pragma: no cover - # pylint: disable=no-name-in-module - gi.require_version('AyatanaAppIndicator3', '0.1') - from gi.repository import AyatanaAppIndicator3 as AppIndicator3 +try: + # pylint: disable=ungrouped-imports + import gi + gi.require_version('AppIndicator3', '0.1') + from gi.repository import AppIndicator3 except Exception: # pragma: no cover AppIndicator3 = None -if not AppIndicator3: - try: # pragma: no cover - # pylint: disable=no-name-in-module - gi.require_version('AppIndicator3', '0.1') - from gi.repository import AppIndicator3 - except Exception: # pragma: no cover - AppIndicator3 = None - def _toggle_manager(*args, **kwargs): ignore = args ++++++ virtman-show-suse-install-repos.patch ++++++ --- /var/tmp/diff_new_pack.tloGb4/_old 2022-03-05 14:44:34.591718474 +0100 +++ /var/tmp/diff_new_pack.tloGb4/_new 2022-03-05 14:44:34.595718475 +0100 @@ -1,11 +1,11 @@ Enhancement that gets installation repos from zypper. These locations are then presented as potential installation sources when creating a VM. -Index: virt-manager-3.1.0/virtManager/createvm.py +Index: virt-manager-3.3.0/virtManager/createvm.py =================================================================== ---- virt-manager-3.1.0.orig/virtManager/createvm.py -+++ virt-manager-3.1.0/virtManager/createvm.py -@@ -163,6 +163,70 @@ class _GuestData: +--- virt-manager-3.3.0.orig/virtManager/createvm.py ++++ virt-manager-3.3.0/virtManager/createvm.py +@@ -164,6 +164,70 @@ class _GuestData: return guest @@ -76,7 +76,7 @@ ############## # Main class # ############## -@@ -421,7 +485,13 @@ class vmmCreateVM(vmmGObjectUI): +@@ -422,7 +486,13 @@ class vmmCreateVM(vmmGObjectUI): self.widget("install-url-entry").set_text("") self.widget("install-url-options").set_expanded(False) urlmodel = self.widget("install-url-combo").get_model()
