Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2020-09-17 14:50:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Thu Sep 17 14:50:48 2020 rev:209 rq:834972 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2020-09-12 00:08:02.108957075 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new.4249/virt-manager.changes 2020-09-17 14:56:05.416211031 +0200 @@ -1,0 +2,74 @@ +Wed Sep 16 05:24:21 MDT 2020 - [email protected] + +- Update to virt-manager 3.0.0 (fate#326786) + virt-manager-3.0.0.tar.bz2 + * virt-install –cloud-init support (Athina Plaskasoviti, Cole + Robinson) + * The virt-convert tool has been removed. Please use virt-v2v + instead + * A handful of UI XML configuration options have been removed. + The XML editor can be used instead. For a larger discussion see + this thread: https://www.redhat.com/archives/virt-tools-list/ + 2019-June/msg00117.html + * The ‘New VM’ UI now has a ‘Manual Install’ option which creates + a VM without any required install media + * In the ‘New VM’ UI, the network/pxe install option has been + removed. If you need network boot, choose ‘Manual Install’ and + set the boot device after initial VM creation + * ‘Clone VM’ UI has been reworked and simplified + * ‘Migrate VM’ UI now has an XML editor for the destination VM + * Global and per-vm option to disable graphical console + autoconnect. This makes it easier to use virt-manager alongside + another client like virt-viewer + * virt-manager: set guest time after VM restore (Michael Weiser) + * virt-manager: option to delete storage when removing disk + device (Lily Nie) + * virt-manager: show warnings if snapshot operation is unsafe + (Michael Weiser) + * Unattended install improvements (Fabiano Fidêncio) + * cli: new –xml XPATH=VAL option for making direct XML changes + * virt-install: new –reinstall=DOMAIN option + * virt-install: new –autoconsole text|graphical|none option + * virt-install: new –os-variant detect=on,require=on suboptions + * cli: –clock, –keywrap, –blkiotune, –cputune additions (Athina + Plaskasoviti) + * cli: add –features kvm.hint-dedicated.state= (Menno Lageman) + * cli:–iommu option (Menno Lageman) + * cli: Add –graphics websocket= support (Petr Benes) + * cli: Add –disk type=nvme source.* suboptions + * cli: Fill in all –filesystem suboptions + * Translation string improvements (Pino Toscano) + * Convert from .pod to .rst for man pages + * Switch to pytest as our test runner + * Massively improved unittest and uitest code coverage + * Now using github issues as our bug tracker +- Drop patches contained in new tarball + 3c6e8537-guest-fix-warning-message-when-machine-type-is-changed-for-secure-boot.patch + 0c223ab2-guest-Dont-set-default-uefi-if-firmware-is-set.patch + 414ffa5e-virt-install-Use-minutes-instead-of-seconds-on-get_time_string.patch + 53245827-urlfetcher-Force-a-flush-after-writing-to-a-file.patch + 3009888a-urlfetcher-Dont-override-fullurl-when-its-explicitly-set.patch + 9465da41-urlfetcher-Deal-with-file-in-_LocalURLFetcher.patch + 651e5b6d-devices-video-Simplify-model-hvm-check.patch + 1547e16d-domcapabilities-Get-video-devices.patch + 2e20b128-domcapabilities-Add-supports_video_bochs.patch + d9736db9-addhardware-Add-bochs-display-to-the-video-list.patch + 8f4c53ea-video-Prefer-bochs-when-its-supported..patch + ae19d6d6-fix-resizing-of-spice-clients-with-guest-resizing-enabled.patch + 51d84c54-connection-Avoid-repeated-default-pool-creation-attempts.patch + d934d6f2-domcaps-Fix-check-for-uncached-security-features.patch + 29f9f5f2-virt-xml-fix-defined_xml_is_unchanged.patch + 15a9502b-Fix-showing-the-firmware-type-in-case-of-firmware-auto-selection.patch + 5573aeb4-createnet-Fix-XML-editor-error-when-dhcp-fields-are-empty.patch + e8bf16b9-details-fix-detection-of-firmware-auto-selection.patch + 7e3fb3f2-graphics-Default-to-vga-instead-of-qxl-for-non-spice.patch +- Drop deprecated patches + virtman-fix-env-script-interpreter.patch + virtinst-osdict-get_supported.patch + virtconv-python2-to-python3-conversion.patch + virtinst-python2-to-python3-conversion.patch + virtman-python2-to-python3-conversion.patch + virttests-python2-to-python3-conversion.patch + 0002-virtinst-python3-avoid-comparison-of-None-and-int.patch + +------------------------------------------------------------------- Old: ---- 0002-virtinst-python3-avoid-comparison-of-None-and-int.patch 0c223ab2-guest-Dont-set-default-uefi-if-firmware-is-set.patch 1547e16d-domcapabilities-Get-video-devices.patch 15a9502b-Fix-showing-the-firmware-type-in-case-of-firmware-auto-selection.patch 29f9f5f2-virt-xml-fix-defined_xml_is_unchanged.patch 2e20b128-domcapabilities-Add-supports_video_bochs.patch 3009888a-urlfetcher-Dont-override-fullurl-when-its-explicitly-set.patch 3c6e8537-guest-fix-warning-message-when-machine-type-is-changed-for-secure-boot.patch 414ffa5e-virt-install-Use-minutes-instead-of-seconds-on-get_time_string.patch 51d84c54-connection-Avoid-repeated-default-pool-creation-attempts.patch 53245827-urlfetcher-Force-a-flush-after-writing-to-a-file.patch 5573aeb4-createnet-Fix-XML-editor-error-when-dhcp-fields-are-empty.patch 651e5b6d-devices-video-Simplify-model-hvm-check.patch 7e3fb3f2-graphics-Default-to-vga-instead-of-qxl-for-non-spice.patch 8f4c53ea-video-Prefer-bochs-when-its-supported..patch 9465da41-urlfetcher-Deal-with-file-in-_LocalURLFetcher.patch ae19d6d6-fix-resizing-of-spice-clients-with-guest-resizing-enabled.patch d934d6f2-domcaps-Fix-check-for-uncached-security-features.patch d9736db9-addhardware-Add-bochs-display-to-the-video-list.patch e8bf16b9-details-fix-detection-of-firmware-auto-selection.patch virt-manager-2.2.1.tar.bz2 virtconv-python2-to-python3-conversion.patch virtinst-osdict-get_supported.patch virtinst-python2-to-python3-conversion.patch virtman-fix-env-script-interpreter.patch virtman-python2-to-python3-conversion.patch virttests-python2-to-python3-conversion.patch New: ---- virt-manager-3.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:35.024353428 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:35.028353431 +0200 @@ -21,7 +21,7 @@ %global default_hvs "qemu,xen,lxc" Name: virt-manager -Version: 2.2.1 +Version: 3.0.0 Release: 0 Summary: Virtual Machine Manager License: GPL-2.0-or-later @@ -32,25 +32,6 @@ Source2: virt-install.desktop Source3: virt-manager-supportconfig # Upstream Patches -Patch1: 3c6e8537-guest-fix-warning-message-when-machine-type-is-changed-for-secure-boot.patch -Patch2: 0c223ab2-guest-Dont-set-default-uefi-if-firmware-is-set.patch -Patch3: 414ffa5e-virt-install-Use-minutes-instead-of-seconds-on-get_time_string.patch -Patch4: 53245827-urlfetcher-Force-a-flush-after-writing-to-a-file.patch -Patch5: 3009888a-urlfetcher-Dont-override-fullurl-when-its-explicitly-set.patch -Patch6: 9465da41-urlfetcher-Deal-with-file-in-_LocalURLFetcher.patch -Patch7: 651e5b6d-devices-video-Simplify-model-hvm-check.patch -Patch8: 1547e16d-domcapabilities-Get-video-devices.patch -Patch9: 2e20b128-domcapabilities-Add-supports_video_bochs.patch -Patch10: d9736db9-addhardware-Add-bochs-display-to-the-video-list.patch -Patch11: 8f4c53ea-video-Prefer-bochs-when-its-supported..patch -Patch12: ae19d6d6-fix-resizing-of-spice-clients-with-guest-resizing-enabled.patch -Patch13: 51d84c54-connection-Avoid-repeated-default-pool-creation-attempts.patch -Patch14: d934d6f2-domcaps-Fix-check-for-uncached-security-features.patch -Patch15: 29f9f5f2-virt-xml-fix-defined_xml_is_unchanged.patch -Patch16: 15a9502b-Fix-showing-the-firmware-type-in-case-of-firmware-auto-selection.patch -Patch17: 5573aeb4-createnet-Fix-XML-editor-error-when-dhcp-fields-are-empty.patch -Patch18: e8bf16b9-details-fix-detection-of-firmware-auto-selection.patch -Patch19: 7e3fb3f2-graphics-Default-to-vga-instead-of-qxl-for-non-spice.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -58,8 +39,7 @@ Patch73: virtman-dont-allow-grub.xen-to-be-deleted.patch Patch74: virtinst-pvgrub2-bootloader.patch Patch75: virtinst-change-location-for-grub_xen.patch -Patch76: virtman-fix-env-script-interpreter.patch -Patch77: virtinst-set-qemu-emulator.patch +Patch76: virtinst-set-qemu-emulator.patch # Features or Enhancements Patch103: virtman-load-stored-uris.patch Patch120: virtinst-default-xen-to-qcow2-format.patch @@ -81,22 +61,15 @@ Patch156: virtman-dont-specify-gtksource-version.patch Patch157: virtman-fix-restore-vm-menu-selection.patch Patch158: virtman-disallow-adding-floppy-disk.patch -Patch160: virtinst-xen-drive-type.patch -Patch161: virtinst-xenbus-disk-index-fix.patch -Patch162: virtinst-refresh_before_fetch_pool.patch -Patch163: virtinst-use-xenpae-kernel-for-32bit.patch -Patch164: virtinst-use-qemu-for-cdrom-device.patch -Patch165: virtinst-keep-install-iso-attached.patch -Patch166: virtinst-osdict-get_supported.patch -Patch167: virtinst-dont-use-special-copy-cpu-features.patch -Patch168: virtinst-set-default-nic.patch -# Python2 to Python3 patches -Patch200: virtconv-python2-to-python3-conversion.patch -Patch201: virtinst-python2-to-python3-conversion.patch -Patch202: virtman-python2-to-python3-conversion.patch -Patch203: virttests-python2-to-python3-conversion.patch -Patch204: 0002-virtinst-python3-avoid-comparison-of-None-and-int.patch -Patch205: virtman-register-delete-event-for-details-dialog.patch +Patch159: virtman-register-delete-event-for-details-dialog.patch +Patch170: virtinst-xen-drive-type.patch +Patch171: virtinst-xenbus-disk-index-fix.patch +Patch172: virtinst-refresh_before_fetch_pool.patch +Patch173: virtinst-use-xenpae-kernel-for-32bit.patch +Patch174: virtinst-use-qemu-for-cdrom-device.patch +Patch175: virtinst-keep-install-iso-attached.patch +Patch176: virtinst-dont-use-special-copy-cpu-features.patch +Patch177: virtinst-set-default-nic.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -123,6 +96,7 @@ BuildRequires: intltool BuildRequires: perl BuildRequires: python3-devel +BuildRequires: python3-docutils BuildRequires: python3-gobject BuildRequires: python3-libvirt-python >= 0.7.0 BuildRequires: python3-libxml2-python @@ -168,7 +142,6 @@ Requires: python3-requests Provides: python3-virtinst Provides: virt-clone -Provides: virt-convert Obsoletes: python-virtinst <= 0.600.4 Supplements: virt-manager @@ -181,25 +154,6 @@ %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 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 @@ -208,7 +162,6 @@ %patch74 -p1 %patch75 -p1 %patch76 -p1 -%patch77 -p1 # Enhancements %patch103 -p1 %patch120 -p1 @@ -230,22 +183,15 @@ %patch156 -p1 %patch157 -p1 %patch158 -p1 -%patch160 -p1 -%patch161 -p1 -%patch162 -p1 -%patch163 -p1 -%patch164 -p1 -%patch165 -p1 -%patch166 -p1 -%patch167 -p1 -%patch168 -p1 -# Python2 to Python3 patches -%patch200 -p1 -%patch201 -p1 -%patch202 -p1 -%patch203 -p1 -%patch204 -p1 -%patch205 -p1 +%patch159 -p1 +%patch170 -p1 +%patch171 -p1 +%patch172 -p1 +%patch173 -p1 +%patch174 -p1 +%patch175 -p1 +%patch176 -p1 +%patch177 -p1 %build %if %{default_hvs} @@ -295,9 +241,9 @@ %{_mandir}/man1/%{name}.1* -%dir %{_datadir}/virt-manager/ui +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/ui %{_datadir}/%{name}/ui/*.ui -%{_datadir}/%{name}/virt-manager %{_datadir}/%{name}/virtManager %dir %{_datadir}/icons/hicolor @@ -306,7 +252,7 @@ %{_datadir}/%{name}/icons %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/YaST2/virt-install.desktop %{_datadir}/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.xml @@ -318,33 +264,24 @@ %defattr(-,root,root,-) %dir %{_datadir}/%{name} -%{_datadir}/%{name}/virtconv %{_datadir}/%{name}/virtinst %files -n virt-install %defattr(-,root,root,-) %{_mandir}/man1/virt-install.1* %{_mandir}/man1/virt-clone.1* -%{_mandir}/man1/virt-convert.1* %{_mandir}/man1/virt-xml.1* -%{_datadir}/%{name}/virt-install +%{_bindir}/virt-install %{_datadir}/bash-completion/completions/virt-install -%{_datadir}/%{name}/virt-clone +%{_bindir}/virt-clone %{_datadir}/bash-completion/completions/virt-clone -%{_datadir}/%{name}/virt-convert -%{_datadir}/bash-completion/completions/virt-convert -%{_datadir}/%{name}/virt-xml +%{_bindir}/virt-xml %{_datadir}/bash-completion/completions/virt-xml + %dir %{_datadir}/YaST2 %dir %{_datadir}/YaST2/clients %dir %{_datadir}/applications/YaST2 -%dir %{_datadir}/appdata %{_datadir}/YaST2/clients/virt-install.rb -%{_bindir}/virt-install -%{_bindir}/virt-clone -%{_bindir}/virt-convert -%{_bindir}/virt-xml - %changelog ++++++ virt-manager-2.2.1.tar.bz2 -> virt-manager-3.0.0.tar.bz2 ++++++ ++++ 615733 lines of diff (skipped) ++++++ virtinst-add-caasp-support.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.232357424 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.232357424 +0200 @@ -1,10 +1,10 @@ References: bsc#1010060 -Index: virt-manager-2.2.1/virtinst/install/urldetect.py +Index: virt-manager-3.0.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/install/urldetect.py -+++ virt-manager-2.2.1/virtinst/install/urldetect.py -@@ -273,6 +273,12 @@ class _SUSEContent(object): +--- 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): self.product_name.strip().rsplit(' ')[5][2]) distro_version = sle_version @@ -17,17 +17,17 @@ return distro_version -@@ -550,6 +556,9 @@ class _SuseDistro(_RHELDistro): - # Tumbleweed 8 digit date - return "opensusetumbleweed" +@@ -563,6 +569,9 @@ class _SuseDistro(_RHELDistro): + + version = distro_version.split('.', 1)[0].strip() + if self._variant_prefix.startswith(("caasp")): + return self._variant_prefix + distro_version + - if int(version) < 10: - return self._variant_prefix + "9" - -@@ -622,6 +631,14 @@ class _OpensuseDistro(_SuseDistro): + 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): famregex = ".*openSUSE.*" @@ -42,7 +42,7 @@ class _OESDistro(_SuseDistro): PRETTY_NAME = "OES" matching_distros = ["oes"] -@@ -838,6 +855,7 @@ def _build_distro_list(osobj): +@@ -869,6 +886,7 @@ def _build_distro_list(osobj): _SLESDistro, _SLEDDistro, _OpensuseDistro, ++++++ virtinst-add-pvh-support.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.244357435 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.244357435 +0200 @@ -1,24 +1,24 @@ References: fate#326698 - Add pvh support to virt-manager At this time support is disabled in this patch. -Index: virt-manager-2.2.1/virtManager/createvm.py +Index: virt-manager-3.0.0/virtManager/createvm.py =================================================================== ---- virt-manager-2.2.1.orig/virtManager/createvm.py -+++ virt-manager-2.2.1/virtManager/createvm.py -@@ -792,6 +792,9 @@ class vmmCreateVM(vmmGObjectUI): - for guest in guests: - if not guest.domains: +--- virt-manager-3.0.0.orig/virtManager/createvm.py ++++ virt-manager-3.0.0/virtManager/createvm.py +@@ -837,6 +837,9 @@ class vmmCreateVM(vmmGObjectUI): + break + if label is None: continue + # xenpvh is currently unsupported + if guest.os_type == "xenpvh": + continue - gtype = guest.os_type - dom = guest.domains[0] -Index: virt-manager-2.2.1/virtinst/domain/os.py + # Determine if this is the default given by guest_lookup + if (gtype == self._capsinfo.os_type and +Index: virt-manager-3.0.0/virtinst/domain/os.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/domain/os.py -+++ virt-manager-2.2.1/virtinst/domain/os.py +--- virt-manager-3.0.0.orig/virtinst/domain/os.py ++++ virt-manager-3.0.0/virtinst/domain/os.py @@ -32,6 +32,8 @@ class DomainOs(XMLBuilder): return self.os_type == "hvm" def is_xenpv(self): @@ -28,11 +28,11 @@ def is_container(self): return self.os_type == "exe" -Index: virt-manager-2.2.1/virtinst/guest.py +Index: virt-manager-3.0.0/virtinst/guest.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/guest.py -+++ virt-manager-2.2.1/virtinst/guest.py -@@ -824,7 +824,7 @@ class Guest(XMLBuilder): +--- virt-manager-3.0.0.orig/virtinst/guest.py ++++ virt-manager-3.0.0/virtinst/guest.py +@@ -814,7 +814,7 @@ class Guest(XMLBuilder): usb_tablet = False usb_keyboard = False @@ -41,11 +41,11 @@ usb_tablet = self.osinfo.supports_usbtablet() if (self.os.is_arm_machvirt() or self.os.is_riscv_virt() or -Index: virt-manager-2.2.1/virtManager/object/domain.py +Index: virt-manager-3.0.0/virtManager/object/domain.py =================================================================== ---- virt-manager-2.2.1.orig/virtManager/object/domain.py -+++ virt-manager-2.2.1/virtManager/object/domain.py -@@ -1150,6 +1150,8 @@ class vmmDomain(vmmLibvirtObject): +--- virt-manager-3.0.0.orig/virtManager/object/domain.py ++++ virt-manager-3.0.0/virtManager/object/domain.py +@@ -1223,6 +1223,8 @@ class vmmDomain(vmmLibvirtObject): return self.get_xmlobj().os.is_xenpv() def is_hvm(self): return self.get_xmlobj().os.is_hvm() @@ -54,11 +54,11 @@ def get_uuid(self): if self._uuid is None: -Index: virt-manager-2.2.1/virtManager/connection.py +Index: virt-manager-3.0.0/virtManager/connection.py =================================================================== ---- virt-manager-2.2.1.orig/virtManager/connection.py -+++ virt-manager-2.2.1/virtManager/connection.py -@@ -223,6 +223,8 @@ class vmmConnection(vmmGObject): +--- virt-manager-3.0.0.orig/virtManager/connection.py ++++ virt-manager-3.0.0/virtManager/connection.py +@@ -211,6 +211,8 @@ class vmmConnection(vmmGObject): label = "xen (paravirt)" elif gtype == "hvm": label = "xen (fullvirt)" ++++++ virtinst-add-sle15-detection-support.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.256357446 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.256357446 +0200 @@ -1,10 +1,10 @@ References: bsc#1054986 -Index: virt-manager-2.2.1/virtinst/install/urldetect.py +Index: virt-manager-3.0.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/install/urldetect.py -+++ virt-manager-2.2.1/virtinst/install/urldetect.py -@@ -586,6 +586,10 @@ class _SuseDistro(_RHELDistro): +--- 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): 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: -@@ -593,7 +597,10 @@ class _SuseDistro(_RHELDistro): +@@ -603,7 +607,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 -@@ -607,6 +614,14 @@ class _SuseDistro(_RHELDistro): +@@ -617,6 +624,14 @@ class _SuseDistro(_RHELDistro): return var @@ -42,7 +42,7 @@ class _SLESDistro(_SuseDistro): PRETTY_NAME = "SLES" matching_distros = ["sles"] -@@ -852,6 +867,7 @@ def _build_distro_list(osobj): +@@ -883,6 +898,7 @@ def _build_distro_list(osobj): _FedoraDistro, _RHELDistro, _CentOSDistro, ++++++ virtinst-change-location-for-grub_xen.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.268357457 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.268357457 +0200 @@ -1,10 +1,10 @@ References: fate#326960, bsc#1123942 -Index: virt-manager-2.2.1/virtinst/install/installer.py +Index: virt-manager-3.0.0/virtinst/install/installer.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/install/installer.py -+++ virt-manager-2.2.1/virtinst/install/installer.py -@@ -446,7 +446,10 @@ class Installer(object): +--- virt-manager-3.0.0.orig/virtinst/install/installer.py ++++ virt-manager-3.0.0/virtinst/install/installer.py +@@ -594,7 +594,10 @@ class Installer(object): guest.bootloader = "pygrub" else: guest.bootloader = None @@ -16,16 +16,16 @@ log.debug("Using grub.xen to boot guest") on_reboot_value = guest.on_reboot self._alter_bootconfig(guest) -Index: virt-manager-2.2.1/virtManager/delete.py +Index: virt-manager-3.0.0/virtManager/delete.py =================================================================== ---- virt-manager-2.2.1.orig/virtManager/delete.py -+++ virt-manager-2.2.1/virtManager/delete.py -@@ -246,7 +246,7 @@ def populate_storage_list(storage_list, - diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False, True)) +--- 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, + model.clear() - for target, path, ro, shared, is_media in diskdata: -- if not path or path == "/usr/lib/grub2/x86_64-xen/grub.xen": -+ if not path or "grub.xen" in path: + for diskdata in diskdatas: +- if not diskdata.path or diskdata.path == "/usr/lib/grub2/x86_64-xen/grub.xen": ++ if not diskdata.path or "grub.xen" in diskdata.path: continue # There are a few pieces here ++++++ virtinst-default-xen-to-qcow2-format.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.276357465 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.280357469 +0200 @@ -1,10 +1,10 @@ Reference: bnc#885380 Allow Xen based VMs to default to using qcow2 -Index: virt-manager-2.2.0/virtinst/support.py +Index: virt-manager-3.0.0/virtinst/support.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/support.py -+++ virt-manager-2.2.0/virtinst/support.py -@@ -249,7 +249,7 @@ class SupportCache: +--- virt-manager-3.0.0.orig/virtinst/support.py ++++ virt-manager-3.0.0/virtinst/support.py +@@ -242,7 +242,7 @@ class SupportCache: # This is an arbitrary check to say whether it's a good idea to # default to qcow2. It might be fine for xen or qemu older than the versions # here, but until someone tests things I'm going to be a bit conservative. ++++++ virtinst-detect-oes-distros.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.292357480 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.296357484 +0200 @@ -1,19 +1,19 @@ Enhancement to correctly detect Open Enterprise Server media is selected as the installation source. -Index: virt-manager-2.2.1/virtinst/install/urldetect.py +Index: virt-manager-3.0.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/install/urldetect.py -+++ virt-manager-2.2.1/virtinst/install/urldetect.py -@@ -553,7 +553,7 @@ class _SuseDistro(_RHELDistro): - if int(version) < 10: - return self._variant_prefix + "9" +--- 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): + + version = distro_version.split('.', 1)[0].strip() - if str(self._variant_prefix).startswith(("sles", "sled")): + if str(self._variant_prefix).startswith(("sles", "sled", "oes")): sp_version = "" if len(distro_version.split('.', 1)) == 2: sp_version = 'sp' + distro_version.split('.', 1)[1].strip() -@@ -622,6 +622,14 @@ class _OpensuseDistro(_SuseDistro): +@@ -632,6 +632,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/ -@@ -830,6 +838,7 @@ def _build_distro_list(osobj): +@@ -861,6 +869,7 @@ def _build_distro_list(osobj): _SLESDistro, _SLEDDistro, _OpensuseDistro, ++++++ virtinst-dont-use-special-copy-cpu-features.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.304357492 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.308357496 +0200 @@ -12,11 +12,11 @@ and "CPUs" -> "Copy host CPU definition" also inserts 'host-model' so this change mirrors what is already done there. -Index: virt-manager-2.2.0/virtinst/domain/cpu.py +Index: virt-manager-3.0.0/virtinst/domain/cpu.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/domain/cpu.py -+++ virt-manager-2.2.0/virtinst/domain/cpu.py -@@ -89,12 +89,16 @@ class DomainCpu(XMLBuilder): +--- 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 if (val == self.SPECIAL_MODE_HOST_MODEL or ++++++ virtinst-keep-install-iso-attached.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.320357507 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.320357507 +0200 @@ -2,11 +2,11 @@ Newer SLE PV guests hang when a cdrom device is attached without an ISO file. -Index: virt-manager-2.2.0/virtinst/install/installer.py +Index: virt-manager-3.0.0/virtinst/install/installer.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/install/installer.py -+++ virt-manager-2.2.0/virtinst/install/installer.py -@@ -111,7 +111,8 @@ class Installer(object): +--- virt-manager-3.0.0.orig/virtinst/install/installer.py ++++ virt-manager-3.0.0/virtinst/install/installer.py +@@ -166,7 +166,8 @@ class Installer(object): def _remove_install_cdrom_media(self, guest): if not self._install_cdrom_device_added: return ++++++ virtinst-media-detection.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.332357519 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.332357519 +0200 @@ -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-2.2.0/virtinst/install/urldetect.py +Index: virt-manager-3.0.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/install/urldetect.py -+++ virt-manager-2.2.0/virtinst/install/urldetect.py -@@ -488,8 +488,23 @@ class _SuseDistro(_RHELDistro): +--- 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): cache.checked_for_suse_content = True content_str = cache.acquire_file_content("content") if content_str is None: @@ -31,4 +31,4 @@ + content_str = products_str + "\n" + media_str try: cache.suse_content = _SUSEContent(content_str) - except Exception as e: + except Exception as e: # pragma: no cover ++++++ virtinst-modify-gui-defaults.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.344357530 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.344357530 +0200 @@ -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-2.2.1/virtManager/createvm.py +Index: virt-manager-3.0.0/virtManager/createvm.py =================================================================== ---- virt-manager-2.2.1.orig/virtManager/createvm.py -+++ virt-manager-2.2.1/virtManager/createvm.py -@@ -404,8 +404,20 @@ class vmmCreateVM(vmmGObjectUI): +--- virt-manager-3.0.0.orig/virtManager/createvm.py ++++ virt-manager-3.0.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) ++++++ virtinst-pvgrub2-bootloader.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.352357538 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.352357538 +0200 @@ -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-2.2.1/virtinst/install/installer.py +Index: virt-manager-3.0.0/virtinst/install/installer.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/install/installer.py -+++ virt-manager-2.2.1/virtinst/install/installer.py -@@ -167,7 +167,8 @@ class Installer(object): +--- virt-manager-3.0.0.orig/virtinst/install/installer.py ++++ virt-manager-3.0.0/virtinst/install/installer.py +@@ -218,7 +218,8 @@ class Installer(object): def _alter_treemedia_bootconfig(self, guest): if not self._treemedia: @@ -16,7 +16,7 @@ kernel, initrd, kernel_args = self._treemedia_bootconfig if kernel: -@@ -436,6 +437,20 @@ class Installer(object): +@@ -584,6 +585,20 @@ class Installer(object): install_xml = None if self.has_install_phase(): install_xml = self._get_install_xml(guest, meter) @@ -34,6 +34,6 @@ + on_reboot_value = guest.on_reboot + self._alter_bootconfig(guest) + guest.on_reboot = on_reboot_value - final_xml = guest.get_xml() + final_xml = self._pre_reinstall_xml or guest.get_xml() log.debug("Generated install XML: %s", ++++++ virtinst-refresh_before_fetch_pool.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.364357549 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.364357549 +0200 @@ -13,27 +13,27 @@ Signed-off-by: Chunyan Liu <[email protected]> -Index: virt-manager-2.2.0/virtinst/pollhelpers.py +Index: virt-manager-3.0.0/virtinst/pollhelpers.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/pollhelpers.py -+++ virt-manager-2.2.0/virtinst/pollhelpers.py -@@ -119,6 +119,19 @@ def fetch_pools(backend, origmap, build_ - name = "pool" - - if backend.support.conn_listallstoragepools() and not FORCE_OLD_POLL: +--- virt-manager-3.0.0.orig/virtinst/pollhelpers.py ++++ virt-manager-3.0.0/virtinst/pollhelpers.py +@@ -48,6 +48,19 @@ def fetch_pools(backend, origmap, build_ + typename = "pool" + list_cb = backend.listAllStoragePools + support_cb = backend.support.conn_storage + -+ # Refresh pools before poll_helper. For those -+ # 'active' but target path not exist (or other reasons -+ # causing the pool not working), but libvirtd not -+ # refresh the status, this will make it refreshed -+ # and mark that pool as 'inactive'. -+ objs = backend.listAllStoragePools() -+ for obj in objs: -+ try: -+ obj.refresh(0) -+ except Exception, e: -+ pass ++ # Refresh pools before poll_helper. For those ++ # 'active' but target path not exist (or other reasons ++ # causing the pool not working), but libvirtd not ++ # refresh the status, this will make it refreshed ++ # and mark that pool as 'inactive'. ++ objs = backend.listAllStoragePools() ++ for obj in objs: ++ try: ++ obj.refresh(0) ++ except Exception as e: # pragma: no cover ++ pass + - return _new_poll_helper(origmap, name, - backend.listAllStoragePools, build_func) - else: + return _new_poll_helper(origmap, typename, list_cb, build_cb, support_cb) + + ++++++ virtinst-s390x-disable-graphics.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.376357560 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.376357560 +0200 @@ -1,10 +1,10 @@ Reference: bnc#869024 Disable graphics on s390x -Index: virt-manager-2.2.1/virtinst/guest.py +Index: virt-manager-3.0.0/virtinst/guest.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/guest.py -+++ virt-manager-2.2.1/virtinst/guest.py -@@ -225,7 +225,10 @@ class Guest(XMLBuilder): +--- virt-manager-3.0.0.orig/virtinst/guest.py ++++ virt-manager-3.0.0/virtinst/guest.py +@@ -195,7 +195,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.disable_default_memballoon = False self.x86_cpu_default = self.cpu.SPECIAL_MODE_APP_DEFAULT -@@ -480,7 +483,7 @@ class Guest(XMLBuilder): + +@@ -337,7 +340,7 @@ class Guest(XMLBuilder): if not os_support: return False @@ -24,8 +24,8 @@ + if self.os.is_x86() or self.os.is_s390x(): return True - return False -@@ -864,7 +867,7 @@ class Guest(XMLBuilder): + return False # pragma: no cover +@@ -854,7 +857,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.Vr9iUM/_old 2020-09-17 14:58:39.388357571 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.388357571 +0200 @@ -1,10 +1,10 @@ Set cache mode for target installation disk to unsafe for better performance. -Index: virt-manager-2.2.1/virtinst/install/installer.py +Index: virt-manager-3.0.0/virtinst/install/installer.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/install/installer.py -+++ virt-manager-2.2.1/virtinst/install/installer.py -@@ -422,11 +422,22 @@ class Installer(object): +--- virt-manager-3.0.0.orig/virtinst/install/installer.py ++++ virt-manager-3.0.0/virtinst/install/installer.py +@@ -570,11 +570,22 @@ class Installer(object): guest.memory) = data def _get_install_xml(self, guest, meter): ++++++ virtinst-set-default-nic.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.400357583 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.404357587 +0200 @@ -1,11 +1,11 @@ References: bsc#1172356 Libvirt doesn't accept "Hypervisor default" as a model name -Index: virt-manager-2.2.1/virtinst/devices/interface.py +Index: virt-manager-3.0.0/virtinst/devices/interface.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/devices/interface.py -+++ virt-manager-2.2.1/virtinst/devices/interface.py -@@ -256,6 +256,8 @@ class DeviceInterface(Device): +--- virt-manager-3.0.0.orig/virtinst/devices/interface.py ++++ virt-manager-3.0.0/virtinst/devices/interface.py +@@ -284,6 +284,8 @@ class DeviceInterface(Device): return "e1000e" if not guest.os.is_x86(): return None ++++++ virtinst-set-qemu-emulator.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.420357602 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.424357606 +0200 @@ -1,11 +1,11 @@ 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-2.2.1/virtinst/guest.py +Index: virt-manager-3.0.0/virtinst/guest.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/guest.py -+++ virt-manager-2.2.1/virtinst/guest.py -@@ -740,6 +740,10 @@ class Guest(XMLBuilder): +--- 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() self.clock.set_defaults(self) ++++++ virtinst-use-qemu-for-cdrom-device.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.432357613 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.432357613 +0200 @@ -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-2.2.0/virtinst/devices/disk.py +Index: virt-manager-3.0.0/virtinst/devices/disk.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/devices/disk.py -+++ virt-manager-2.2.0/virtinst/devices/disk.py -@@ -389,7 +389,8 @@ class DeviceDisk(Device): +--- virt-manager-3.0.0.orig/virtinst/devices/disk.py ++++ virt-manager-3.0.0/virtinst/devices/disk.py +@@ -384,7 +384,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.Vr9iUM/_old 2020-09-17 14:58:39.444357625 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.444357625 +0200 @@ -4,11 +4,11 @@ virtualized if the pae kernel is selected. Note that sles12 and newer has no 32bit release. -Index: virt-manager-2.2.0/virtinst/install/urldetect.py +Index: virt-manager-3.0.0/virtinst/install/urldetect.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/install/urldetect.py -+++ virt-manager-2.2.0/virtinst/install/urldetect.py -@@ -533,9 +533,14 @@ class _SuseDistro(_RHELDistro): +--- 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): if self.type == "xen": # Matches Opensuse > 10.2 and sles 10 ++++++ virtinst-vol-default-nocow.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.456357636 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.456357636 +0200 @@ -4,11 +4,11 @@ Signed-off-by: Chunyan Liu <[email protected]> -Index: virt-manager-2.2.1/virtinst/storage.py +Index: virt-manager-3.0.0/virtinst/storage.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/storage.py -+++ virt-manager-2.2.1/virtinst/storage.py -@@ -548,6 +548,11 @@ class StorageVolume(_StorageObject): +--- virt-manager-3.0.0.orig/virtinst/storage.py ++++ virt-manager-3.0.0/virtinst/storage.py +@@ -569,6 +569,11 @@ class StorageVolume(_StorageObject): return self._pool_xml.get_disk_type() file_type = property(_get_vol_type) @@ -20,11 +20,11 @@ ################## # XML properties # -Index: virt-manager-2.2.1/virtinst/support.py +Index: virt-manager-3.0.0/virtinst/support.py =================================================================== ---- virt-manager-2.2.1.orig/virtinst/support.py -+++ virt-manager-2.2.1/virtinst/support.py -@@ -283,6 +283,7 @@ class SupportCache: +--- virt-manager-3.0.0.orig/virtinst/support.py ++++ virt-manager-3.0.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}) conn_riscv_virt_pci_default = _make(version="5.3.0", hv_version={"qemu": "4.0.0"}) ++++++ virtinst-xen-drive-type.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.468357648 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.472357652 +0200 @@ -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-2.2.0/virtinst/devices/disk.py +Index: virt-manager-3.0.0/virtinst/devices/disk.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/devices/disk.py -+++ virt-manager-2.2.0/virtinst/devices/disk.py -@@ -406,6 +406,10 @@ class DeviceDisk(Device): +--- virt-manager-3.0.0.orig/virtinst/devices/disk.py ++++ virt-manager-3.0.0/virtinst/devices/disk.py +@@ -401,6 +401,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.Vr9iUM/_old 2020-09-17 14:58:39.484357663 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.484357663 +0200 @@ -6,14 +6,14 @@ passed to qemu where it error'ed out with the disks having the same index (in this case both are 0). -Index: virt-manager-2.2.0/virtinst/devices/disk.py +Index: virt-manager-3.0.0/virtinst/devices/disk.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/devices/disk.py -+++ virt-manager-2.2.0/virtinst/devices/disk.py -@@ -861,6 +861,17 @@ class DeviceDisk(Device): +--- virt-manager-3.0.0.orig/virtinst/devices/disk.py ++++ virt-manager-3.0.0/virtinst/devices/disk.py +@@ -850,6 +850,17 @@ class DeviceDisk(Device): :returns: generated target """ - prefix, maxnode = self.get_target_prefix(skip_targets) + prefix, maxnode = self.get_target_prefix() + postfix_targets = [] + if self.conn.is_xen(): + prefixes = [ "hd", "xvd", "vd", "sd", "fd" ] @@ -28,10 +28,10 @@ skip_targets = [t for t in skip_targets if t and t.startswith(prefix)] skip_targets.sort() -@@ -874,7 +885,12 @@ class DeviceDisk(Device): - ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7) +@@ -857,7 +868,12 @@ class DeviceDisk(Device): + first_found = None - for i in ran: + for i in range(maxnode): - gen_t = prefix + self.num_to_target(i + 1) + postfix = self.num_to_target(i + 1) + gen_t = prefix + postfix ++++++ virtman-allow-creating-i686-vm.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.500357678 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.504357682 +0200 @@ -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-2.2.1/virtManager/createvm.py +Index: virt-manager-3.0.0/virtManager/createvm.py =================================================================== ---- virt-manager-2.2.1.orig/virtManager/createvm.py -+++ virt-manager-2.2.1/virtManager/createvm.py -@@ -830,11 +830,6 @@ class vmmCreateVM(vmmGObjectUI): +--- virt-manager-3.0.0.orig/virtManager/createvm.py ++++ virt-manager-3.0.0/virtManager/createvm.py +@@ -862,11 +862,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.Vr9iUM/_old 2020-09-17 14:58:39.512357689 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.512357689 +0200 @@ -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-2.2.0/virtManager/manager.py +Index: virt-manager-3.0.0/virtManager/manager.py =================================================================== ---- virt-manager-2.2.0.orig/virtManager/manager.py -+++ virt-manager-2.2.0/virtManager/manager.py -@@ -784,7 +784,7 @@ class vmmManager(vmmGObjectUI): +--- virt-manager-3.0.0.orig/virtManager/manager.py ++++ virt-manager-3.0.0/virtManager/manager.py +@@ -779,7 +779,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-2.2.0/virtManager/vmmenu.py +Index: virt-manager-3.0.0/virtManager/vmmenu.py =================================================================== ---- virt-manager-2.2.0.orig/virtManager/vmmenu.py -+++ virt-manager-2.2.0/virtManager/vmmenu.py +--- virt-manager-3.0.0.orig/virtManager/vmmenu.py ++++ virt-manager-3.0.0/virtManager/vmmenu.py @@ -21,6 +21,7 @@ class _VMMenu(Gtk.Menu): self._parent = src self._current_vm_cb = current_vm_cb @@ -31,15 +31,15 @@ self._init_state() -@@ -84,6 +85,7 @@ class VMShutdownMenu(_VMMenu): +@@ -85,6 +86,7 @@ class VMShutdownMenu(_VMMenu): name = getattr(child, "vmm_widget_name", None) if name in statemap: child.set_sensitive(statemap[name]) + child.set_visible(statemap[name]) - if name == "reset": - child.set_tooltip_text(None) -@@ -105,7 +107,8 @@ class VMActionMenu(_VMMenu): + + class VMActionMenu(_VMMenu): +@@ -99,7 +101,8 @@ class VMActionMenu(_VMMenu): self._add_action(_("R_esume"), "resume", VMActionUI.resume, Gtk.STOCK_MEDIA_PAUSE) s = self._add_action(_("_Shut Down"), "shutdown", None) @@ -49,7 +49,7 @@ self.add(Gtk.SeparatorMenuItem()) self._add_action(_("Clone..."), "clone", -@@ -125,7 +128,7 @@ class VMActionMenu(_VMMenu): +@@ -120,7 +123,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()), -@@ -142,6 +145,8 @@ class VMActionMenu(_VMMenu): +@@ -137,6 +140,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.Vr9iUM/_old 2020-09-17 14:58:39.520357697 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.520357697 +0200 @@ -1,16 +1,16 @@ References: bnc#907958 Sanity check for those who forget '-X' on ssh and try to start virt-manager -Index: virt-manager-2.2.0/virt-manager +Index: virt-manager-3.0.0/virtManager/virtmanager.py =================================================================== ---- virt-manager-2.2.0.orig/virt-manager -+++ virt-manager-2.2.0/virt-manager -@@ -66,8 +66,11 @@ def _import_gtk(leftovers): +--- virt-manager-3.0.0.orig/virtManager/virtmanager.py ++++ virt-manager-3.0.0/virtManager/virtmanager.py +@@ -67,8 +67,11 @@ def _import_gtk(leftovers): print("gtk3 3.22.0 or later is required.") sys.exit(1) - # This will error if Gtk wasn't correctly initialized - Gtk.init() -+ if os.environ.has_key('DISPLAY') and os.environ['DISPLAY']: ++ if 'DISPLAY' in os.environ and os.environ['DISPLAY']: + # This will error if Gtk wasn't correctly initialized + Gtk.Window() + else: ++++++ virtman-desktop.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.532357708 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.536357712 +0200 @@ -1,12 +1,12 @@ -Index: virt-manager-2.0.0/data/virt-manager.desktop.in +Index: virt-manager-3.0.0/data/virt-manager.desktop.in =================================================================== ---- virt-manager-2.0.0.orig/data/virt-manager.desktop.in -+++ virt-manager-2.0.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 @@ [Desktop Entry] - _Name=Virtual Machine Manager --_Comment=Manage virtual machines -+_Comment=Manage Virtual Machines for Xen and KVM + Name=Virtual Machine Manager +-Comment=Manage virtual machines ++Comment=Manage Virtual Machines for Xen and KVM Icon=virt-manager -Exec=virt-manager +Version=1.0 ++++++ virtman-disallow-adding-floppy-disk.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.544357720 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.548357724 +0200 @@ -4,11 +4,11 @@ added. -Index: virt-manager-2.2.1/virtManager/addhardware.py +Index: virt-manager-3.0.0/virtManager/addhardware.py =================================================================== ---- virt-manager-2.2.1.orig/virtManager/addhardware.py -+++ virt-manager-2.2.1/virtManager/addhardware.py -@@ -528,6 +528,9 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-3.0.0.orig/virtManager/addhardware.py ++++ virt-manager-3.0.0/virtManager/addhardware.py +@@ -481,6 +481,9 @@ class vmmAddHardware(vmmGObjectUI): buses = domcaps.devices.disk.get_enum("bus").get_values() else: buses = vmmAddHardware.disk_old_recommended_buses(guest) @@ -18,16 +18,15 @@ bus_map = { "disk": ["ide", "sata", "scsi", "sd", "usb", "virtio", "xen"], -@@ -539,7 +542,7 @@ class vmmAddHardware(vmmGObjectUI): +@@ -500,6 +503,7 @@ class vmmAddHardware(vmmGObjectUI): + "usb": _("USB"), + "virtio": _("VirtIO"), + "xen": _("Xen"), ++ "fdc": _("FDC"), + } + return bus_mappings.get(bus, bus) - @staticmethod - def disk_pretty_bus(bus): -- if bus in ["ide", "sata", "scsi", "usb", "sd"]: -+ if bus in ["ide", "sata", "scsi", "usb", "sd", "fdc"]: - return bus.upper() - if bus in ["xen"]: - return bus.capitalize() -@@ -724,8 +727,9 @@ class vmmAddHardware(vmmGObjectUI): +@@ -681,8 +685,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.Vr9iUM/_old 2020-09-17 14:58:39.560357735 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.560357735 +0200 @@ -1,16 +1,16 @@ 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-2.0.0/virtManager/delete.py +Index: virt-manager-3.0.0/virtManager/delete.py =================================================================== ---- virt-manager-2.0.0.orig/virtManager/delete.py -+++ virt-manager-2.0.0/virtManager/delete.py -@@ -246,7 +246,7 @@ def populate_storage_list(storage_list, - diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False, True)) +--- 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, + model.clear() - for target, path, ro, shared, is_media in diskdata: -- if not path: -+ if not path or path == "/usr/lib/grub2/x86_64-xen/grub.xen": + for diskdata in diskdatas: +- if not diskdata.path: ++ if not diskdata.path or diskdata.path == "/usr/lib/grub2/x86_64-xen/grub.xen": continue # There are a few pieces here ++++++ virtman-dont-specify-gtksource-version.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.572357746 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.572357746 +0200 @@ -1,5 +1,7 @@ ---- virt-manager-2.2.0/virtManager/xmleditor.py.orig 2019-06-25 12:21:53.267971599 -0600 -+++ virt-manager-2.2.0/virtManager/xmleditor.py 2019-06-25 12:22:20.854908884 -0600 +Index: virt-manager-3.0.0/virtManager/xmleditor.py +=================================================================== +--- virt-manager-3.0.0.orig/virtManager/xmleditor.py ++++ virt-manager-3.0.0/virtManager/xmleditor.py @@ -7,12 +7,12 @@ import gi from virtinst import log @@ -7,13 +9,13 @@ -try: - gi.require_version("GtkSource", "4") - log.debug("Using GtkSource 4") --except ValueError: +-except ValueError: # pragma: no cover - gi.require_version("GtkSource", "3.0") - log.debug("Using GtkSource 3.0") +#try: +# gi.require_version("GtkSource", "4") +# log.debug("Using GtkSource 4") -+#except ValueError: ++#except ValueError: # pragma: no cover +# gi.require_version("GtkSource", "3.0") +# log.debug("Using GtkSource 3.0") from gi.repository import GtkSource ++++++ virtman-dont-specify-vte-version.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.584357758 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.584357758 +0200 @@ -2,10 +2,10 @@ version of vte is really allowed. Vte 2.91 is installed on the host but the RPM is built requiring 2.90. -Index: virt-manager-2.2.0/virtManager/details/serialcon.py +Index: virt-manager-3.0.0/virtManager/details/serialcon.py =================================================================== ---- virt-manager-2.2.0.orig/virtManager/details/serialcon.py -+++ virt-manager-2.2.0/virtManager/details/serialcon.py +--- virt-manager-3.0.0.orig/virtManager/details/serialcon.py ++++ virt-manager-3.0.0/virtManager/details/serialcon.py @@ -12,12 +12,12 @@ from gi.repository import Gtk from virtinst import log @@ -13,13 +13,13 @@ -try: - gi.require_version("Vte", "2.91") - log.debug("Using VTE API 2.91") --except ValueError: +-except ValueError: # pragma: no cover - gi.require_version("Vte", "2.90") - log.debug("Using VTE API 2.90") +#try: +# gi.require_version("Vte", "2.91") +# log.debug("Using VTE API 2.91") -+#except ValueError: ++#except ValueError: # pragma: no cover +# gi.require_version("Vte", "2.90") +# log.debug("Using VTE API 2.90") from gi.repository import Vte ++++++ virtman-fix-restore-vm-menu-selection.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.596357769 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.596357769 +0200 @@ -3,11 +3,11 @@ Libvirt returns libvirt.VIR_DOMAIN_PMSUSPENDED after a vm has been 'saved'. -Index: virt-manager-2.2.0/virtManager/object/domain.py +Index: virt-manager-3.0.0/virtManager/object/domain.py =================================================================== ---- virt-manager-2.2.0.orig/virtManager/object/domain.py -+++ virt-manager-2.2.0/virtManager/object/domain.py -@@ -1454,7 +1454,8 @@ class vmmDomain(vmmLibvirtObject): +--- virt-manager-3.0.0.orig/virtManager/object/domain.py ++++ virt-manager-3.0.0/virtManager/object/domain.py +@@ -1530,7 +1530,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.Vr9iUM/_old 2020-09-17 14:58:39.608357780 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.608357780 +0200 @@ -2,16 +2,16 @@ 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-2.2.1/virtManager/connection.py +Index: virt-manager-3.0.0/virtManager/connection.py =================================================================== ---- virt-manager-2.2.1.orig/virtManager/connection.py -+++ virt-manager-2.2.1/virtManager/connection.py -@@ -995,7 +995,7 @@ class vmmConnection(vmmGObject): +--- virt-manager-3.0.0.orig/virtManager/connection.py ++++ virt-manager-3.0.0/virtManager/connection.py +@@ -970,7 +970,7 @@ class vmmConnection(vmmGObject): self._add_conn_events() try: - self._backend.setKeepAlive(20, 1) + self._backend.setKeepAlive(20, 10) except Exception as e: - if (not isinstance(e, AttributeError) and - not self.support.is_error_nosupport(e)): + log.debug("Failed to setKeepAlive: %s", str(e)) + ++++++ virtman-kvm.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.620357792 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.620357792 +0200 @@ -1,15 +1,15 @@ /usr/bin/kvm doesn't exist on suse distros so check instead for /usr/bin/qemu-system-x86_64 -Index: virt-manager-2.2.0/virtManager/createconn.py +Index: virt-manager-3.0.0/virtManager/createconn.py =================================================================== ---- virt-manager-2.2.0.orig/virtManager/createconn.py -+++ virt-manager-2.2.0/virtManager/createconn.py -@@ -67,7 +67,7 @@ class vmmCreateConn(vmmGObjectUI): +--- virt-manager-3.0.0.orig/virtManager/createconn.py ++++ virt-manager-3.0.0/virtManager/createconn.py +@@ -33,7 +33,7 @@ def _default_uri(): # pragma: no cover - if (os.path.exists("/usr/bin/qemu") or - os.path.exists("/usr/bin/qemu-kvm") or -- os.path.exists("/usr/bin/kvm") or -+ os.path.exists("/usr/bin/qemu-system-x86_64") or - os.path.exists("/usr/libexec/qemu-kvm") or - glob.glob("/usr/bin/qemu-system-*")): - return "qemu:///system" + if (os.path.exists("/usr/bin/qemu") or + os.path.exists("/usr/bin/qemu-kvm") or +- os.path.exists("/usr/bin/kvm") or ++ os.path.exists("/usr/bin/qemu-system-x86_64") or + os.path.exists("/usr/libexec/qemu-kvm") or + glob.glob("/usr/bin/qemu-system-*")): + return "qemu:///system" ++++++ virtman-register-delete-event-for-details-dialog.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.632357803 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.632357803 +0200 @@ -6,12 +6,12 @@ need to set the connection event. Not getting the event to cleanup leaves us in a bad state for when the details dialog is reopened. -Index: virt-manager-2.2.0/virtManager/vmwindow.py +Index: virt-manager-3.0.0/virtManager/vmwindow.py =================================================================== ---- virt-manager-2.2.0.orig/virtManager/vmwindow.py -+++ virt-manager-2.2.0/virtManager/vmwindow.py -@@ -141,6 +141,9 @@ class vmmVMWindow(vmmGObjectUI): - self.console.details_auth_login), +--- virt-manager-3.0.0.orig/virtManager/vmwindow.py ++++ virt-manager-3.0.0/virtManager/vmwindow.py +@@ -131,6 +131,9 @@ class vmmVMWindow(vmmGObjectUI): + "on_details_menu_view_autoconnect_activate": self._autoconnect_ui_changed_cb, }) + # Make sure the delete event is properly registered for the details dialog ++++++ virtman-show-suse-install-repos.patch ++++++ --- /var/tmp/diff_new_pack.Vr9iUM/_old 2020-09-17 14:58:39.644357815 +0200 +++ /var/tmp/diff_new_pack.Vr9iUM/_new 2020-09-17 14:58:39.644357815 +0200 @@ -1,12 +1,12 @@ Enhancement that gets installation repos from zypper. These locations are then presented as potential installation sources when creating a VM. -Index: virt-manager-2.2.1/virtManager/createvm.py +Index: virt-manager-3.0.0/virtManager/createvm.py =================================================================== ---- virt-manager-2.2.1.orig/virtManager/createvm.py -+++ virt-manager-2.2.1/virtManager/createvm.py -@@ -99,6 +99,70 @@ def is_virt_bootstrap_installed(): - return pkgutil.find_loader('virtBootstrap') is not None +--- virt-manager-3.0.0.orig/virtManager/createvm.py ++++ virt-manager-3.0.0/virtManager/createvm.py +@@ -164,6 +164,70 @@ class _GuestData: + return guest +################################################ @@ -76,7 +76,7 @@ ############## # Main class # ############## -@@ -368,7 +432,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()
