Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2014-11-06 16:50:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2014-10-25 08:33:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2014-11-06 16:51:41.000000000 +0100 @@ -1,0 +2,74 @@ +Mon Oct 22 13:33:25 MDT 2014 - [email protected] + +- Update to virt-manager 1.1.0 + virt-manager-1.1.0.tar.bz2 + * Switch to libosinfo as OS metadata database (Giuseppe Scrivano) + * Use libosinfo for OS detection from CDROM media labels (Giuseppe Scrivano) + * Use libosinfo for improved OS defaults, like recommended disk size (Giuseppe Scrivano) + * virt-image tool has been removed, as previously announced + * Enable Hyper-V enlightenments for Windows VMs + * Revert virtio-console default, back to plain serial console + * Experimental q35 option in new VM ‘customize’ dialog + * UI for virtual network QoS settings (Giuseppe Scrivano) + * virt-install: –disk discard= support (Jim Minter) + * addhardware: Add spiceport UI (Marc-André Lureau) + * virt-install: –events on_poweroff etc. support (Chen Hanxiao) + * cli –network portgroup= support and UI support + * cli –boot initargs= and UI support + * addhardware: allow setting controller model (Chen Hanxiao) + * virt-install: support setting hugepage options (Chen Hanxiao) +- Drop upstream patches and old tarball + virt-manager-1.0.1.tar.bz2 + 5332ee4d-enable-media-detection-for-ISO-images.patch + 53341e7e-hide-hardware-removal-for-non-devices.patch + 53342f31-set-right-ip-address-for-ipv6.patch + 53375bad-raise-value-error-when-no-ipaddr-set.patch + 53388de2-show-port-number-for-active-autoport-VM.patch + 53397ae0-check-ip-address-format.patch + 53399b45-hook-into-domain-balloon-event.patch + 533d708d-fix-showing-vcpus-values.patch + 533d7602-fix-changing-graphics-type.patch + 533d7be7-clarify-iscsi-IQN-fields.patch + 5345682c-addstorage-remove-whitespace-for-storage-path.patch + 534bcfa0-use-uniformed-expression-of-Default.patch + 534be092-early-detect-ftp-connection-errors.patch + 534d45db-hiding-removebutton-for-USB-controller.patch + 534d6406-display-the-domain-for-PCI-devices.patch + 534eafe4-avoid-useless-errors-when-connection-closes.patch + 5350d9cc-display-error-on-empty-installation-URL.patch + 535584ed-fix-target-validation-when-editing-device.patch + 535fb6f6-hide-scrollbar-until-something-scrollable.patch + 535fe0c2-fix-screenshot-with-qxl-spice.patch + 535feaca-fix-storage-when-directory-name-contains-whitespace.patch + 535ff0b7-fix-install-when-one-package-is-already-installed.patch + 536152fe-fix-error-detecting-OS-in-show-all-list.patch + 536154d8-show-error-if-launching-delete-dialog-fails.patch + 53615662-call-path_exists-before-getting-storage-volume.patch + 536677aa-better-handling-of-keyboard-input-type.patch + 5385d602-lxc-no-default-disk.patch + 53869170-virt-install-add-events-support.patch + 538a11dc-raise-error-if-populating-summary-page-fails.patch + 538a3609-virtconv-fix-use-of-relative-OVF-file.patch + 538a3ba9-diskbackend-start-pool-if-not-running.patch + 538a6862-vnc-dont-force-keyboard-grab-before-widget-is-realized.patch + 538ca3f3-use-correct-dictionary-keys-for-old-pool-net-polling.patch + 538d00a4-xen-keyboard-cant-be-removed.patch + 538e2f74-fix-pool-create-call.patch + 538edb3b-manpage-fix-incorrect-description.patch + 5397b647-createnet-enable-specifying-29-subnet.patch + 539e8cca-createpool-fix-creation-of-gluster-pools.patch + 53a05e73-fix-edit-maxvcpus.patch + 53a995cb-fix-usb-storage-removable-syntax.patch + 53ac1f8d-createnet-validate-last-page-before-creating-network.patch + 53ac1f8d-fix-show_err-typo.patch + 53ad17e6-createnet-fix-a-small-pylint.patch + 53b39a13-dont-create-disk-images-world-readable-executable.patch + 53b409bc-add-keep-alive-method-and-connection-check.patch + 53b409bd-console-prevent-access-to-deleted-objects.patch + 53b728c6-connection-handle-unsupported-KeepAlive.patch + 53b728c6-report-error-during-connection-bring-up.patch + 53bb1995-network-refresh-XML-definition-on-state-update.patch + 53ce11d1-honor-untoggled-set-fixed-MAC-address.patch +- Dropped xend based virtman-autorestart.patch + +------------------------------------------------------------------- Old: ---- 5332ee4d-enable-media-detection-for-ISO-images.patch 53341e7e-hide-hardware-removal-for-non-devices.patch 53342f31-set-right-ip-address-for-ipv6.patch 53375bad-raise-value-error-when-no-ipaddr-set.patch 53388de2-show-port-number-for-active-autoport-VM.patch 53397ae0-check-ip-address-format.patch 53399b45-hook-into-domain-balloon-event.patch 533d708d-fix-showing-vcpus-values.patch 533d7602-fix-changing-graphics-type.patch 533d7be7-clarify-iscsi-IQN-fields.patch 5345682c-addstorage-remove-whitespace-for-storage-path.patch 534bcfa0-use-uniformed-expression-of-Default.patch 534be092-early-detect-ftp-connection-errors.patch 534d45db-hiding-removebutton-for-USB-controller.patch 534d6406-display-the-domain-for-PCI-devices.patch 534eafe4-avoid-useless-errors-when-connection-closes.patch 5350d9cc-display-error-on-empty-installation-URL.patch 535584ed-fix-target-validation-when-editing-device.patch 535fb6f6-hide-scrollbar-until-something-scrollable.patch 535fe0c2-fix-screenshot-with-qxl-spice.patch 535feaca-fix-storage-when-directory-name-contains-whitespace.patch 535ff0b7-fix-install-when-one-package-is-already-installed.patch 536152fe-fix-error-detecting-OS-in-show-all-list.patch 536154d8-show-error-if-launching-delete-dialog-fails.patch 53615662-call-path_exists-before-getting-storage-volume.patch 536677aa-better-handling-of-keyboard-input-type.patch 5385d602-lxc-no-default-disk.patch 53869170-virt-install-add-events-support.patch 538a11dc-raise-error-if-populating-summary-page-fails.patch 538a3609-virtconv-fix-use-of-relative-OVF-file.patch 538a3ba9-diskbackend-start-pool-if-not-running.patch 538a6862-vnc-dont-force-keyboard-grab-before-widget-is-realized.patch 538ca3f3-use-correct-dictionary-keys-for-old-pool-net-polling.patch 538d00a4-xen-keyboard-cant-be-removed.patch 538e2f74-fix-pool-create-call.patch 538edb3b-manpage-fix-incorrect-description.patch 5397b647-createnet-enable-specifying-29-subnet.patch 539e8cca-createpool-fix-creation-of-gluster-pools.patch 53a05e73-fix-edit-maxvcpus.patch 53a995cb-fix-usb-storage-removable-syntax.patch 53ac1f8d-createnet-validate-last-page-before-creating-network.patch 53ac1f8d-fix-show_err-typo.patch 53ad17e6-createnet-fix-a-small-pylint.patch 53b39a13-dont-create-disk-images-world-readable-executable.patch 53b409bc-add-keep-alive-method-and-connection-check.patch 53b409bd-console-prevent-access-to-deleted-objects.patch 53b728c6-connection-handle-unsupported-KeepAlive.patch 53b728c6-report-error-during-connection-bring-up.patch 53bb1995-network-refresh-XML-definition-on-state-update.patch 53ce11d1-honor-untoggled-set-fixed-MAC-address.patch virt-manager-1.0.1.tar.bz2 virtman-autorestart.patch New: ---- virt-manager-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:43.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:43.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" @@ -23,11 +22,11 @@ %define libvirt_xen_packages "" %define preferred_distros "sles,opensuse" %define kvm_packages "" -%define _version 1.0.1 +%define _version 1.1.0 %define _release 1 Name: virt-manager -Version: 1.0.1 +Version: 1.1.0 Release: 0 Summary: Virtual Machine Manager License: GPL-2.0+ @@ -36,63 +35,12 @@ Source0: %{name}-%{version}.tar.bz2 Source1: virt-install.rb Source2: virt-install.desktop -Patch1: 5332ee4d-enable-media-detection-for-ISO-images.patch -Patch2: 53341e7e-hide-hardware-removal-for-non-devices.patch -Patch3: 53342f31-set-right-ip-address-for-ipv6.patch -Patch4: 53375bad-raise-value-error-when-no-ipaddr-set.patch -Patch5: 53388de2-show-port-number-for-active-autoport-VM.patch -Patch6: 53397ae0-check-ip-address-format.patch -Patch7: 53399b45-hook-into-domain-balloon-event.patch -Patch8: 533d708d-fix-showing-vcpus-values.patch -Patch9: 533d7602-fix-changing-graphics-type.patch -Patch10: 533d7be7-clarify-iscsi-IQN-fields.patch -Patch11: 5345682c-addstorage-remove-whitespace-for-storage-path.patch -Patch12: 534bcfa0-use-uniformed-expression-of-Default.patch -Patch13: 534be092-early-detect-ftp-connection-errors.patch -Patch14: 534d45db-hiding-removebutton-for-USB-controller.patch -Patch15: 534d6406-display-the-domain-for-PCI-devices.patch -Patch16: 534eafe4-avoid-useless-errors-when-connection-closes.patch -Patch17: 5350d9cc-display-error-on-empty-installation-URL.patch -Patch18: 535584ed-fix-target-validation-when-editing-device.patch -Patch19: 535fb6f6-hide-scrollbar-until-something-scrollable.patch -Patch20: 535fe0c2-fix-screenshot-with-qxl-spice.patch -Patch21: 535feaca-fix-storage-when-directory-name-contains-whitespace.patch -Patch22: 535ff0b7-fix-install-when-one-package-is-already-installed.patch -Patch23: 536152fe-fix-error-detecting-OS-in-show-all-list.patch -Patch24: 536154d8-show-error-if-launching-delete-dialog-fails.patch -Patch25: 53615662-call-path_exists-before-getting-storage-volume.patch -Patch26: 536677aa-better-handling-of-keyboard-input-type.patch -Patch27: 5385d602-lxc-no-default-disk.patch -Patch28: 53869170-virt-install-add-events-support.patch -Patch29: 538a11dc-raise-error-if-populating-summary-page-fails.patch -Patch30: 538a3609-virtconv-fix-use-of-relative-OVF-file.patch -Patch31: 538a3ba9-diskbackend-start-pool-if-not-running.patch -Patch32: 538a6862-vnc-dont-force-keyboard-grab-before-widget-is-realized.patch -Patch33: 538ca3f3-use-correct-dictionary-keys-for-old-pool-net-polling.patch -Patch34: 538d00a4-xen-keyboard-cant-be-removed.patch -Patch35: 538e2f74-fix-pool-create-call.patch -Patch36: 538edb3b-manpage-fix-incorrect-description.patch -Patch37: 5397b647-createnet-enable-specifying-29-subnet.patch -Patch38: 539e8cca-createpool-fix-creation-of-gluster-pools.patch -Patch39: 53a05e73-fix-edit-maxvcpus.patch -Patch40: 53a995cb-fix-usb-storage-removable-syntax.patch -Patch41: 53ac1f8d-fix-show_err-typo.patch -Patch42: 53ac1f8d-createnet-validate-last-page-before-creating-network.patch -Patch43: 53ad17e6-createnet-fix-a-small-pylint.patch -Patch44: 53b39a13-dont-create-disk-images-world-readable-executable.patch -Patch45: 53b409bc-add-keep-alive-method-and-connection-check.patch -Patch46: 53b409bd-console-prevent-access-to-deleted-objects.patch -Patch47: 53b728c6-report-error-during-connection-bring-up.patch -Patch48: 53b728c6-connection-handle-unsupported-KeepAlive.patch -Patch49: 53bb1995-network-refresh-XML-definition-on-state-update.patch -Patch50: 53ce11d1-honor-untoggled-set-fixed-MAC-address.patch Patch70: virtman-desktop.patch Patch71: virtman-cdrom.patch Patch72: virtman-kvm.patch Patch73: virtman-keycombo.patch Patch74: virtman-eepro100.patch Patch75: virtman-supported-disk-formats.patch -Patch76: virtman-autorestart.patch Patch80: virtman-default-guest-from-host-os.patch Patch81: virtman-default-to-xen-pv.patch Patch82: virtman-autoyast-support.patch @@ -138,6 +86,7 @@ Requires: dbus-1-x11 Requires: dconf Requires: gtk3 +Requires: libosinfo >= 0.2.10 Requires: python-gconf Requires: virt-manager-common = %{verrel} Requires: vm-install >= 0.5.6 @@ -196,7 +145,6 @@ Provides: python-virtinst Provides: virt-clone Provides: virt-convert -Provides: virt-image Obsoletes: python-virtinst <= 0.600.4 Supplements: virt-manager @@ -208,63 +156,12 @@ %prep %setup -q -%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 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 %patch70 -p1 %patch71 -p1 %patch72 -p1 %patch73 -p1 %patch74 -p1 %patch75 -p1 -%patch76 -p1 %patch80 -p1 %patch81 -p1 %patch82 -p1 @@ -402,23 +299,21 @@ %{_mandir}/man1/virt-install.1* %{_mandir}/man1/virt-clone.1* %{_mandir}/man1/virt-convert.1* -%{_mandir}/man1/virt-image.1* %{_mandir}/man1/virt-xml.1* -%{_mandir}/man5/virt-image.5* %{_datadir}/%{name}/virt-install %{_datadir}/%{name}/virt-clone -%{_datadir}/%{name}/virt-image %{_datadir}/%{name}/virt-convert %{_datadir}/%{name}/virt-xml -%dir %{_datadir}/* -%dir %{_datadir}/*/* +%dir %{_datadir}/YaST2 +%dir %{_datadir}/YaST2/clients +%dir %{_datadir}/applications/YaST2 +%dir %{_datadir}/appdata %{_datadir}/YaST2/clients/virt-install.rb %{_datadir}/applications/YaST2/virt-install.desktop %{_bindir}/virt-install %{_bindir}/virt-clone -%{_bindir}/virt-image %{_bindir}/virt-convert %{_bindir}/virt-xml ++++++ virt-manager-1.0.1.tar.bz2 -> virt-manager-1.1.0.tar.bz2 ++++++ ++++ 329633 lines of diff (skipped) ++++++ virt-manager-Gtk-30.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,26 +1,26 @@ -Index: virt-manager-1.0.1/virtManager/config.py +Index: virt-manager-1.1.0/virtManager/config.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/config.py -+++ virt-manager-1.0.1/virtManager/config.py -@@ -21,8 +21,10 @@ import os +--- virt-manager-1.1.0.orig/virtManager/config.py ++++ virt-manager-1.1.0/virtManager/config.py +@@ -20,8 +20,10 @@ + import os import logging - # pylint: disable=E0611 +import gi from gi.repository import Gio from gi.repository import GLib +gi.require_version('Gtk', '3.0') from gi.repository import Gtk - # pylint: enable=E0611 -Index: virt-manager-1.0.1/virtManager/console.py + from virtinst import CPU +Index: virt-manager-1.1.0/virtManager/console.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/console.py -+++ virt-manager-1.0.1/virtManager/console.py -@@ -21,10 +21,13 @@ +--- virt-manager-1.1.0.orig/virtManager/console.py ++++ virt-manager-1.1.0/virtManager/console.py +@@ -20,10 +20,13 @@ + # MA 02110-1301 USA. # - # pylint: disable=E0611 +import gi from gi.repository import GObject from gi.repository import Gtk @@ -30,4 +30,4 @@ +gi.require_version('SpiceClientGtk', '3.0') from gi.repository import SpiceClientGtk from gi.repository import SpiceClientGLib - # pylint: enable=E0611 + ++++++ virtinst-add-default-rng-device.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,10 +1,10 @@ bnc#885308 -Index: virt-manager-1.0.1/virtinst/guest.py +Index: virt-manager-1.1.0/virtinst/guest.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/guest.py -+++ virt-manager-1.0.1/virtinst/guest.py -@@ -627,6 +627,15 @@ class Guest(XMLBuilder): +--- virt-manager-1.1.0.orig/virtinst/guest.py ++++ virt-manager-1.1.0/virtinst/guest.py +@@ -637,6 +637,15 @@ class Guest(XMLBuilder): return self.add_device(virtinst.VirtualGraphics(self.conn)) @@ -20,7 +20,7 @@ def add_default_devices(self): self.add_default_graphics() self.add_default_video_device() -@@ -634,6 +643,7 @@ class Guest(XMLBuilder): +@@ -644,6 +653,7 @@ class Guest(XMLBuilder): self.add_default_console_device() self.add_default_usb_controller() self.add_default_channels() ++++++ virtinst-detect-suse-distros.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtinst/urlfetcher.py +Index: virt-manager-1.1.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/urlfetcher.py -+++ virt-manager-1.0.1/virtinst/urlfetcher.py -@@ -303,6 +303,88 @@ def _distroFromTreeinfo(fetcher, arch, v +--- virt-manager-1.1.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.1.0/virtinst/urlfetcher.py +@@ -321,6 +321,88 @@ def _distroFromTreeinfo(fetcher, arch, v return ob @@ -91,7 +91,7 @@ def getDistroStore(guest, fetcher): stores = [] -@@ -319,6 +401,10 @@ def getDistroStore(guest, fetcher): +@@ -337,6 +419,10 @@ def getDistroStore(guest, fetcher): if dist: return dist @@ -99,10 +99,10 @@ + if dist: + return dist + - # FIXME: This 'distro ==' doesn't cut it. 'distro' is from our os - # dictionary, so would look like 'fedora9' or 'rhel5', so this needs - # to be a bit more intelligent -@@ -815,12 +901,11 @@ class SLDistro(RHELDistro): + stores = _allstores[:] + + # If user manually specified an os_distro, bump it's URL class +@@ -819,29 +905,59 @@ class SLDistro(RHELDistro): class SuseDistro(Distro): name = "SUSE" @@ -116,20 +116,20 @@ Distro.__init__(self, *args, **kwargs) if re.match(r'i[4-9]86', self.arch): self.arch = 'i386' -@@ -831,22 +916,44 @@ class SuseDistro(Distro): - oldkern += "64" - oldinit += "64" - # Tested with Opensuse >= 10.2, 11, and sles 10 - self._hvm_kernel_paths = [("boot/%s/loader/linux" % self.arch, - "boot/%s/loader/initrd" % self.arch)] -- # Tested with Opensuse 10.0 -- self._hvm_kernel_paths.append(("boot/loader/%s" % oldkern, -- "boot/loader/%s" % oldinit)) - - # Matches Opensuse > 10.2 and sles 10 - self._xen_kernel_paths = [("boot/%s/vmlinuz-xen" % self.arch, - "boot/%s/initrd-xen" % self.arch)] ++ oldkern = "linux" ++ oldinit = "initrd" ++ if self.arch == "x86_64": ++ oldkern += "64" ++ oldinit += "64" ++ + if self.arch == "s390x": + self._hvm_kernel_paths = [ ("boot/%s/linux" % self.arch, + "boot/%s/initrd" % self.arch) ] @@ -171,8 +171,8 @@ return True def _get_method_arg(self): -@@ -867,6 +974,27 @@ class SuseDistro(Distro): - return name +@@ -861,6 +977,27 @@ class SuseDistro(Distro): + return osobj.name return self.os_variant +class SLESDistro(SuseDistro): ++++++ virtinst-detect-windows-media.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtinst/urlfetcher.py +Index: virt-manager-1.1.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/urlfetcher.py -+++ virt-manager-1.0.1/virtinst/urlfetcher.py -@@ -386,6 +386,24 @@ def _distroFromContent(fetcher, arch, vm +--- virt-manager-1.1.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.1.0/virtinst/urlfetcher.py +@@ -404,6 +404,24 @@ def _distroFromContent(fetcher, arch, vm return ob @@ -27,7 +27,7 @@ def getDistroStore(guest, fetcher): stores = [] logging.debug("Finding distro store for location=%s", fetcher.location) -@@ -405,6 +423,10 @@ def getDistroStore(guest, fetcher): +@@ -423,6 +441,10 @@ def getDistroStore(guest, fetcher): if dist: return dist @@ -35,10 +35,10 @@ + if dist: + return dist + - # FIXME: This 'distro ==' doesn't cut it. 'distro' is from our os - # dictionary, so would look like 'fedora9' or 'rhel5', so this needs - # to be a bit more intelligent -@@ -1151,6 +1173,13 @@ class ALTLinuxDistro(Distro): + stores = _allstores[:] + + # If user manually specified an os_distro, bump it's URL class +@@ -1158,6 +1180,13 @@ class ALTLinuxDistro(Distro): logging.debug("Regex didn't match, not a %s distro", self.name) return False @@ -52,22 +52,20 @@ # Build list of all *Distro classes def _build_distro_list(): -Index: virt-manager-1.0.1/virtinst/osdict.py +Index: virt-manager-1.1.0/virtinst/osdict.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/osdict.py -+++ virt-manager-1.0.1/virtinst/osdict.py -@@ -316,9 +316,12 @@ _add_var("win2k", "Microsoft Windows 200 - _add_var("winxp", "Microsoft Windows XP", sortby="mswin5", supported=True, xen_disable_acpi=True, parent="windows") - _add_var("winxp64", "Microsoft Windows XP (x86_64)", supported=True, sortby="mswin564", parent="windows") - _add_var("win2k3", "Microsoft Windows Server 2003", supported=True, sortby="mswinserv2003", parent="windows") --_add_var("win2k8", "Microsoft Windows Server 2008 (or later)", supported=True, sortby="mswinserv2008", parent="windows") +--- virt-manager-1.1.0.orig/virtinst/osdict.py ++++ virt-manager-1.1.0/virtinst/osdict.py +@@ -543,6 +543,12 @@ _add_var("oes11", "Novell Open Enterpris + _add_var("rear", "Relax and Recover", supported=True, virtiodisk=True, virtionet=True, parent="sles11") + _add_var("netware6", "Novell Netware 6 (or later)", supported=True, parent="other") + +_add_var("win2k8", "Microsoft Windows Server 2008", supported=True, sortby="mswinserv2008", parent="windows") +_add_var("win2k12", "Microsoft Windows Server 2012 (or later)", supported=True, sortby="mswinserv2012", parent="windows") - _add_var("vista", "Microsoft Windows Vista", supported=True, sortby="mswin6", parent="windows") --_add_var("win7", "Microsoft Windows 7 (or later)", supported=True, sortby="mswin7", parent="windows") +_add_var("win7", "Microsoft Windows 7", supported=True, sortby="mswin7", parent="windows") +_add_var("win8", "Microsoft Windows 8 (or later)", supported=True, sortby="mswin8", parent="windows") +_add_var("win-unknown", "Microsoft Windows Unknown Version", supported=True, sortby="mswin", parent="windows") ++ - - _add_type("solaris", "Solaris", clock="localtime") + _os_data_loaded = False + _os_loader = None ++++++ virtinst-ignore-error-403-on-directories.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -4,11 +4,11 @@ the OS detection procedure to succeed when Indexes are disabled on the HTTP server. -Index: virt-manager-1.0.1/virtinst/urlfetcher.py +Index: virt-manager-1.1.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/urlfetcher.py -+++ virt-manager-1.0.1/virtinst/urlfetcher.py -@@ -140,8 +140,11 @@ class _HTTPImageFetcher(_URIImageFetcher +--- virt-manager-1.1.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.1.0/virtinst/urlfetcher.py +@@ -142,8 +142,11 @@ class _HTTPImageFetcher(_URIImageFetcher request.get_method = lambda: "HEAD" urllib2.urlopen(request) except Exception, e: ++++++ virtinst-modify-gui-defaults.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/create.py +Index: virt-manager-1.1.0/virtManager/create.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/create.py -+++ virt-manager-1.0.1/virtManager/create.py -@@ -337,7 +337,18 @@ class vmmCreate(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/create.py ++++ virt-manager-1.1.0/virtManager/create.py +@@ -342,7 +342,18 @@ class vmmCreate(vmmGObjectUI): self.widget("method-local").set_active(True) self.widget("create-conn").set_active(-1) activeconn = self.populate_conn_list(urihint) @@ -22,14 +22,14 @@ try: self.set_conn(activeconn, force_validate=True) -Index: virt-manager-1.0.1/virtManager/netlist.py +Index: virt-manager-1.1.0/virtManager/netlist.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/netlist.py -+++ virt-manager-1.0.1/virtManager/netlist.py -@@ -174,10 +174,20 @@ class vmmNetworkList(vmmGObjectUI): - if nic.target_dev and nic.target_dev not in vnet_taps: - vnet_taps.append(nic.target_dev) +--- virt-manager-1.1.0.orig/virtManager/netlist.py ++++ virt-manager-1.1.0/virtManager/netlist.py +@@ -167,9 +167,19 @@ class vmmNetworkList(vmmGObjectUI): + return rows, vnet_bridges, default_label + def _find_physical_devices(self, vnet_bridges): + def check_for_inet(bname): + if bname is not None: + from subprocess import Popen, PIPE @@ -39,33 +39,29 @@ + return True + return False + - bridge_dict = {} - iface_dict = {} - hasShared = False - brIdxLabel = None -+ brIdxLabel_with_inet = None + rows = [] + can_default = False + default_label = None ++ default_label_with_inet = None skip_ifaces = ["lo"] - for name in self.conn.list_net_device_paths(): -@@ -218,6 +228,11 @@ class vmmNetworkList(vmmGObjectUI): - if hasShared and not brIdxLabel: - brIdxLabel = label + vnet_taps = [] +@@ -228,10 +238,18 @@ class vmmNetworkList(vmmGObjectUI): + if can_default and not default_label: + default_label = label + # Default to a bridge that has an actual inet addr -+ if brIdxLabel_with_inet is None: -+ if check_for_inet(bridge_name): -+ brIdxLabel_with_inet = label ++ if default_label_with_inet is None: ++ if check_for_inet(source_name): ++ default_label_with_inet = label + - row = self._build_source_row( - nettype, bridge_name, label, sensitive, True, - key=br.get_name()) -@@ -227,6 +242,9 @@ class vmmNetworkList(vmmGObjectUI): - else: - iface_dict[label] = row + rows.append(self._build_source_row( + nettype, source_name, label, sensitive, True, + key=name)) -+ if brIdxLabel and brIdxLabel_with_inet is not None: -+ brIdxLabel = brIdxLabel_with_inet ++ if default_label and default_label_with_inet is not None: ++ default_label = default_label_with_inet + - return bridge_dict, iface_dict, brIdxLabel + return rows, default_label def _populate_network_list(self): ++++++ virtinst-nfs-install-sanitize.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,10 +1,10 @@ bnc#888251 -Index: virt-manager-1.0.1/virtinst/util.py +Index: virt-manager-1.1.0/virtinst/util.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/util.py -+++ virt-manager-1.0.1/virtinst/util.py -@@ -626,3 +626,22 @@ def getInstallRepos(enabled_sources_only +--- virt-manager-1.1.0.orig/virtinst/util.py ++++ virt-manager-1.1.0/virtinst/util.py +@@ -612,3 +612,22 @@ def getInstallRepos(enabled_sources_only zypper_output.insert(0, dom0_inst_source) return (index_dom0, zypper_output) @@ -27,11 +27,11 @@ + + return url + -Index: virt-manager-1.0.1/virtinst/distroinstaller.py +Index: virt-manager-1.1.0/virtinst/distroinstaller.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/distroinstaller.py -+++ virt-manager-1.0.1/virtinst/distroinstaller.py -@@ -50,6 +50,8 @@ def _sanitize_url(url): +--- virt-manager-1.1.0.orig/virtinst/distroinstaller.py ++++ virt-manager-1.1.0/virtinst/distroinstaller.py +@@ -51,6 +51,8 @@ def _sanitize_url(url): """ Do nothing for http or ftp, but make sure nfs is in the expected format """ @@ -40,10 +40,10 @@ if url.startswith("nfs://"): # Convert RFC compliant NFS nfs://server/path/to/distro # to what mount/anaconda expect nfs:server:/path/to/distro -Index: virt-manager-1.0.1/virtinst/urlfetcher.py +Index: virt-manager-1.1.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/urlfetcher.py -+++ virt-manager-1.0.1/virtinst/urlfetcher.py +--- virt-manager-1.1.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.1.0/virtinst/urlfetcher.py @@ -33,6 +33,7 @@ import urlparse import urlgrabber.grabber as grabber @@ -52,7 +52,7 @@ ######################################################################### -@@ -210,7 +211,8 @@ class _MountedImageFetcher(_LocalImageFe +@@ -223,7 +224,8 @@ class _MountedImageFetcher(_LocalImageFe logging.debug("Preparing mount at " + self.srcdir) if self.location.startswith("nfs:"): ++++++ virtinst-ppc64le.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtinst/guest.py +Index: virt-manager-1.1.0/virtinst/guest.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/guest.py -+++ virt-manager-1.0.1/virtinst/guest.py -@@ -623,7 +623,7 @@ class Guest(XMLBuilder): +--- virt-manager-1.1.0.orig/virtinst/guest.py ++++ virt-manager-1.1.0/virtinst/guest.py +@@ -633,7 +633,7 @@ class Guest(XMLBuilder): return if self.os.is_container(): return @@ -11,7 +11,7 @@ return self.add_device(virtinst.VirtualGraphics(self.conn)) -@@ -752,6 +752,8 @@ class Guest(XMLBuilder): +@@ -771,6 +771,8 @@ class Guest(XMLBuilder): if self.conn.is_qemu(): if self.os.arch == "s390x": preferred_emulator = "/usr/bin/qemu-system-s390x" @@ -20,7 +20,7 @@ else: preferred_emulator = "/usr/bin/qemu-system-x86_64" else: -@@ -847,7 +849,7 @@ class Guest(XMLBuilder): +@@ -877,7 +879,7 @@ class Guest(XMLBuilder): if not self._lookup_osdict_key(key, False): return False @@ -29,7 +29,7 @@ return True if (self.os.is_arm_vexpress() and self.os.dtb and -@@ -898,6 +900,8 @@ class Guest(XMLBuilder): +@@ -928,6 +930,8 @@ class Guest(XMLBuilder): net_model = None elif self._can_virtio("virtionet"): net_model = "virtio" @@ -38,11 +38,11 @@ else: net_model = self._lookup_osdict_key("netmodel", None) -Index: virt-manager-1.0.1/virtinst/osxml.py +Index: virt-manager-1.1.0/virtinst/osxml.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/osxml.py -+++ virt-manager-1.0.1/virtinst/osxml.py -@@ -55,6 +55,8 @@ class OSXML(XMLBuilder): +--- virt-manager-1.1.0.orig/virtinst/osxml.py ++++ virt-manager-1.1.0/virtinst/osxml.py +@@ -60,6 +60,8 @@ class OSXML(XMLBuilder): return self.is_ppc64 and self.machine == "pseries" def is_s390x(self): return self.arch == "s390x" @@ -51,11 +51,11 @@ _XML_ROOT_NAME = "os" _XML_PROP_ORDER = ["arch", "os_type", "loader", -Index: virt-manager-1.0.1/virtinst/urlfetcher.py +Index: virt-manager-1.1.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/urlfetcher.py -+++ virt-manager-1.0.1/virtinst/urlfetcher.py -@@ -940,10 +940,11 @@ class SuseDistro(Distro): +--- virt-manager-1.1.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.1.0/virtinst/urlfetcher.py +@@ -944,10 +944,11 @@ class SuseDistro(Distro): oldkern += "64" oldinit += "64" ++++++ virtinst-pvgrub2-bootloader.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtinst/guest.py +Index: virt-manager-1.1.0/virtinst/guest.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/guest.py -+++ virt-manager-1.0.1/virtinst/guest.py -@@ -351,8 +351,18 @@ class Guest(XMLBuilder): +--- virt-manager-1.1.0.orig/virtinst/guest.py ++++ virt-manager-1.1.0/virtinst/guest.py +@@ -353,8 +353,18 @@ class Guest(XMLBuilder): if (not install and self.os.is_xenpv() and not self.os.kernel): @@ -23,10 +23,10 @@ return self.get_xml_config() -Index: virt-manager-1.0.1/virtinst/installer.py +Index: virt-manager-1.1.0/virtinst/installer.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/installer.py -+++ virt-manager-1.0.1/virtinst/installer.py +--- virt-manager-1.1.0.orig/virtinst/installer.py ++++ virt-manager-1.1.0/virtinst/installer.py @@ -111,7 +111,7 @@ class Installer(object): dev.validate() return dev ++++++ virtinst-refresh_before_fetch_pool.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -12,14 +12,14 @@ Signed-off-by: Chunyan Liu <[email protected]> -Index: virt-manager-1.0.1/virtinst/pollhelpers.py +Index: virt-manager-1.1.0/virtinst/pollhelpers.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/pollhelpers.py -+++ virt-manager-1.0.1/virtinst/pollhelpers.py -@@ -138,6 +138,19 @@ def fetch_pools(backend, origmap, build_ +--- virt-manager-1.1.0.orig/virtinst/pollhelpers.py ++++ virt-manager-1.1.0/virtinst/pollhelpers.py +@@ -133,6 +133,19 @@ def fetch_pools(backend, origmap, build_ if backend.check_support( - backend.SUPPORT_CONN_LISTALLSTORAGEPOOLS): + backend.SUPPORT_CONN_LISTALLSTORAGEPOOLS) and not _force_old_poll: + + # Refresh pools before poll_helper. For those + # 'active' but target path not exist (or other reasons @@ -34,5 +34,5 @@ + pass + return _new_poll_helper(origmap, name, - backend.listAllStoragePools, - "UUIDString", build_func) + backend.listAllStoragePools, build_func) + else: ++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtinst/guest.py +Index: virt-manager-1.1.0/virtinst/guest.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/guest.py -+++ virt-manager-1.0.1/virtinst/guest.py -@@ -346,6 +346,12 @@ class Guest(XMLBuilder): +--- virt-manager-1.1.0.orig/virtinst/guest.py ++++ virt-manager-1.1.0/virtinst/guest.py +@@ -348,6 +348,12 @@ class Guest(XMLBuilder): self.on_reboot = action self.on_crash = action @@ -15,7 +15,7 @@ self._set_defaults() self.bootloader = None -@@ -365,7 +371,10 @@ class Guest(XMLBuilder): +@@ -367,7 +373,10 @@ class Guest(XMLBuilder): self.bootloader = "/usr/bin/pygrub" self.os.clear() ++++++ virtinst-set-qemu-emulator.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-1.0.1/virtinst/guest.py +Index: virt-manager-1.1.0/virtinst/guest.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/guest.py -+++ virt-manager-1.0.1/virtinst/guest.py +--- virt-manager-1.1.0.orig/virtinst/guest.py ++++ virt-manager-1.1.0/virtinst/guest.py @@ -19,6 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. @@ -10,7 +10,7 @@ import logging import urlgrabber.progress as progress -@@ -729,14 +730,22 @@ class Guest(XMLBuilder): +@@ -748,14 +749,22 @@ class Guest(XMLBuilder): self.emulator = None return ++++++ virtinst-storage-ocfs2.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.0/virtinst/storage.py +Index: virt-manager-1.1.0/virtinst/storage.py =================================================================== ---- virt-manager-1.0.0.orig/virtinst/storage.py -+++ virt-manager-1.0.0/virtinst/storage.py -@@ -403,7 +403,7 @@ class StoragePool(_StorageObject): +--- virt-manager-1.1.0.orig/virtinst/storage.py ++++ virt-manager-1.1.0/virtinst/storage.py +@@ -405,7 +405,7 @@ class StoragePool(_StorageObject): def list_formats(self): if self.type == self.TYPE_FS: return ["auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", ++++++ virtinst-support-suse-distros.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,39 +1,26 @@ -Index: virt-manager-1.0.1/virtinst/osdict.py +Index: virt-manager-1.1.0/virtinst/osdict.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/osdict.py -+++ virt-manager-1.0.1/virtinst/osdict.py -@@ -259,11 +259,23 @@ _add_var("fedora18", "Fedora 18", suppor - _add_var("fedora19", "Fedora 19", virtiommio=True, parent="fedora18") - _add_var("fedora20", "Fedora 20 (or later)", parent="fedora19") +--- virt-manager-1.1.0.orig/virtinst/osdict.py ++++ virt-manager-1.1.0/virtinst/osdict.py +@@ -528,6 +528,21 @@ _add_type("unix", "UNIX") + _add_type("other", "Other") + _add_var("generic", "Generic", supported=True, parent="other") --_add_var("opensuse11", "openSuse 11", urldistro="suse", supported=True, virtiodisk=True, virtionet=True, parent="linux") --_add_var("opensuse12", "openSuse 12 (or later)", parent="opensuse11") +_add_var("opensuse11", "openSUSE 11", urldistro="opensuse", supported=True, virtiodisk=True, virtionet=True, parent="linux") +_add_var("opensuse12", "openSUSE 12", inputtype="tablet", inputbus="usb", parent="opensuse11") +_add_var("opensuse13", "openSUSE 13 (or later)", parent="opensuse12") -+ +_add_var("sles", "Suse Linux Enterprise Server", urldistro="suse", supported=True, parent="linux") +_add_var("sles10", "Suse Linux Enterprise Server 10", supported=True, virtiodisk=True, virtionet=True, parent="sles") +_add_var("sles11", "Suse Linux Enterprise Server 11", supported=True, virtiodisk=True, virtionet=True, inputtype="tablet", inputbus="usb", parent="sles10") +_add_var("sles12", "Suse Linux Enterprise Server 12 (or later)", supported=True, virtiodisk=True, virtionet=True, parent="sles11") -+ +_add_var("sled10", "Suse Linux Enterprise Desktop 10", supported=True, virtiodisk=True, virtionet=True, parent="sles10") +_add_var("sled11", "Suse Linux Enterprise Desktop 11", supported=True, virtiodisk=True, virtionet=True, inputtype="tablet", inputbus="usb", parent="sles11") +_add_var("sled12", "Suse Linux Enterprise Desktop 12 (or later)", supported=True, virtiodisk=True, virtionet=True, parent="sles12") - --_add_var("sles10", "Suse Linux Enterprise Server", urldistro="suse", supported=True, parent="linux") --_add_var("sles11", "Suse Linux Enterprise Server 11 (or later)", supported=True, virtiodisk=True, virtionet=True, parent="sles10") +_add_var("oes2l", "Novell Open Enterprise Server 2", supported=True, virtiodisk=True, virtionet=True, parent="sles10") +_add_var("oes11", "Novell Open Enterprise Server 11 (or later)", supported=True, virtiodisk=True, virtionet=True, parent="sles11") -+ +_add_var("rear", "Relax and Recover", supported=True, virtiodisk=True, virtionet=True, parent="sles11") - - _add_var("mandriva2009", "Mandriva Linux 2009 and earlier", urldistro="mandriva", parent="linux") - _add_var("mandriva2010", "Mandriva Linux 2010 (or later)", virtiodisk=True, virtionet=True, parent="mandriva2009") -@@ -333,5 +345,5 @@ _add_type("other", "Other") - _add_var("msdos", "MS-DOS", acpi=False, apic=False, parent="other") - _add_var("netware4", "Novell Netware 4", parent="other") - _add_var("netware5", "Novell Netware 5", parent="other") --_add_var("netware6", "Novell Netware 6 (or later)", parent="other") +_add_var("netware6", "Novell Netware 6 (or later)", supported=True, parent="other") - _add_var("generic", "Generic", supported=True, parent="other") ++ + + _os_data_loaded = False + _os_loader = None ++++++ virtinst-supported-disk-formats.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -15,28 +15,6 @@ CACHE_MODE_NONE = "none" CACHE_MODE_WRITETHROUGH = "writethrough" -Index: virt-manager-1.0.1/virtinst/virtimage.py -=================================================================== ---- virt-manager-1.0.1.orig/virtinst/virtimage.py -+++ virt-manager-1.0.1/virtinst/virtimage.py -@@ -209,6 +209,7 @@ class Disk(object): - FORMAT_QCOW2 = "qcow2" - FORMAT_VMDK = "vmdk" - FORMAT_VDI = "vdi" -+ FORMAT_QED = "qed" - - USE_SYSTEM = "system" - USE_USER = "user" -@@ -240,7 +241,8 @@ class Disk(object): - Disk.FORMAT_QCOW2, - Disk.FORMAT_VMDK, - Disk.FORMAT_ISO, -- Disk.FORMAT_VDI] -+ Disk.FORMAT_VDI, -+ Disk.FORMAT_QED] - validate(formats.count(self.format) > 0, - _("The format for disk %s must be one of %s") % - (self.file, ",".join(formats))) Index: virt-manager-1.0.1/virtinst/support.py =================================================================== --- virt-manager-1.0.1.orig/virtinst/support.py ++++++ virtinst-vol-default-nocow.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -3,11 +3,11 @@ Signed-off-by: Chunyan Liu <[email protected]> -Index: virt-manager-1.0.0/virtinst/storage.py +Index: virt-manager-1.1.0/virtinst/storage.py =================================================================== ---- virt-manager-1.0.0.orig/virtinst/storage.py -+++ virt-manager-1.0.0/virtinst/storage.py -@@ -656,6 +656,11 @@ class StorageVolume(_StorageObject): +--- virt-manager-1.1.0.orig/virtinst/storage.py ++++ virt-manager-1.1.0/virtinst/storage.py +@@ -658,6 +658,11 @@ class StorageVolume(_StorageObject): lazy_refcounts = XMLProperty("./target/features/lazy_refcounts", is_bool=True, default_cb=_lazy_refcounts_default_cb) ++++++ virtinst-xen-drive-type.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,10 +1,10 @@ Reference: bnc#813082 -Index: virt-manager-1.0.1/virtinst/devicedisk.py +Index: virt-manager-1.1.0/virtinst/devicedisk.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/devicedisk.py -+++ virt-manager-1.0.1/virtinst/devicedisk.py -@@ -558,6 +558,12 @@ class VirtualDisk(VirtualDevice): +--- virt-manager-1.1.0.orig/virtinst/devicedisk.py ++++ virt-manager-1.1.0/virtinst/devicedisk.py +@@ -562,6 +562,12 @@ class VirtualDisk(VirtualDevice): return None if self.conn.is_qemu(): return self.DRIVER_QEMU @@ -17,7 +17,7 @@ return None def _get_default_driver_type(self): -@@ -571,6 +577,8 @@ class VirtualDisk(VirtualDevice): +@@ -575,6 +581,8 @@ class VirtualDisk(VirtualDevice): http://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html """ if self.driver_name != self.DRIVER_QEMU: ++++++ virtinst-xenbus-disk-index-fix.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,10 +1,10 @@ bnc#872789 -Index: virt-manager-1.0.1/virtinst/devicedisk.py +Index: virt-manager-1.1.0/virtinst/devicedisk.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/devicedisk.py -+++ virt-manager-1.0.1/virtinst/devicedisk.py -@@ -931,6 +931,17 @@ class VirtualDisk(VirtualDevice): +--- virt-manager-1.1.0.orig/virtinst/devicedisk.py ++++ virt-manager-1.1.0/virtinst/devicedisk.py +@@ -936,6 +936,17 @@ class VirtualDisk(VirtualDevice): @rtype C{str} """ prefix, maxnode = self.get_target_prefix(skip_targets) @@ -22,7 +22,7 @@ skip_targets = [t for t in skip_targets if t and t.startswith(prefix)] skip_targets.sort() -@@ -944,7 +955,12 @@ class VirtualDisk(VirtualDevice): +@@ -949,7 +960,12 @@ class VirtualDisk(VirtualDevice): ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7) for i in ran: ++++++ virtman-add-connect-default.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/engine.py +Index: virt-manager-1.1.0/virtManager/engine.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/engine.py -+++ virt-manager-1.0.1/virtManager/engine.py -@@ -205,9 +205,6 @@ class vmmEngine(vmmGObject): +--- virt-manager-1.1.0.orig/virtManager/engine.py ++++ virt-manager-1.1.0/virtManager/engine.py +@@ -202,9 +202,6 @@ class vmmEngine(vmmGObject): except: logging.exception("Error talking to PackageKit") @@ -12,7 +12,7 @@ warnmsg = _("The 'libvirtd' service will need to be started.\n\n" "After that, virt-manager will connect to libvirt on\n" "the next application start up.") -@@ -221,7 +218,11 @@ class vmmEngine(vmmGObject): +@@ -218,7 +215,11 @@ class vmmEngine(vmmGObject): if not connected and do_start: manager.err.ok(_("Libvirt service must be started"), warnmsg) ++++++ virtman-add-s390x-arch-support.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/create.py +Index: virt-manager-1.1.0/virtManager/create.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/create.py -+++ virt-manager-1.0.1/virtManager/create.py -@@ -415,7 +415,7 @@ class vmmCreate(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/create.py ++++ virt-manager-1.1.0/virtManager/create.py +@@ -428,7 +428,7 @@ class vmmCreate(vmmGObjectUI): can_remote_url = self.conn.get_backend().support_remote_url_install() installable_arch = (self.capsguest.arch in @@ -11,7 +11,7 @@ # Install Options method_tree = self.widget("method-tree") -@@ -677,7 +677,7 @@ class vmmCreate(vmmGObjectUI): +@@ -690,7 +690,7 @@ class vmmCreate(vmmGObjectUI): archs.remove("i686") archs.sort() @@ -20,11 +20,11 @@ if self.conn.caps.host.cpu.arch not in prios: prios = [] else: -Index: virt-manager-1.0.1/virtinst/osxml.py +Index: virt-manager-1.1.0/virtinst/osxml.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/osxml.py -+++ virt-manager-1.0.1/virtinst/osxml.py -@@ -53,6 +53,8 @@ class OSXML(XMLBuilder): +--- virt-manager-1.1.0.orig/virtinst/osxml.py ++++ virt-manager-1.1.0/virtinst/osxml.py +@@ -58,6 +58,8 @@ class OSXML(XMLBuilder): return self.arch == "ppc64" def is_pseries(self): return self.is_ppc64 and self.machine == "pseries" @@ -33,10 +33,10 @@ _XML_ROOT_NAME = "os" _XML_PROP_ORDER = ["arch", "os_type", "loader", -Index: virt-manager-1.0.1/virtinst/guest.py +Index: virt-manager-1.1.0/virtinst/guest.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/guest.py -+++ virt-manager-1.0.1/virtinst/guest.py +--- virt-manager-1.1.0.orig/virtinst/guest.py ++++ virt-manager-1.1.0/virtinst/guest.py @@ -112,7 +112,10 @@ class Guest(XMLBuilder): self.skip_default_channel = False self.skip_default_sound = False @@ -49,7 +49,7 @@ self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY self._os_variant = None -@@ -549,11 +552,13 @@ class Guest(XMLBuilder): +@@ -559,11 +562,13 @@ class Guest(XMLBuilder): self.conn.check_support( self.conn.SUPPORT_CONN_VIRTIO_CONSOLE)): dev.target_type = "virtio" @@ -64,7 +64,7 @@ return if self.get_devices("video"): return -@@ -598,7 +603,7 @@ class Guest(XMLBuilder): +@@ -608,7 +613,7 @@ class Guest(XMLBuilder): return if self.os.is_container(): return @@ -73,7 +73,7 @@ return self.add_device(virtinst.VirtualGraphics(self.conn)) -@@ -804,7 +809,7 @@ class Guest(XMLBuilder): +@@ -834,7 +839,7 @@ class Guest(XMLBuilder): if not self._lookup_osdict_key(key, False): return False ++++++ virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,7 +1,9 @@ bnc#875111 ---- virt-manager-1.0.1/virtManager/manager.py.orig 2014-08-18 17:39:09.506148602 -0600 -+++ virt-manager-1.0.1/virtManager/manager.py 2014-08-18 17:39:12.440170326 -0600 -@@ -892,7 +892,7 @@ class vmmManager(vmmGObjectUI): +Index: virt-manager-1.1.0/virtManager/manager.py +=================================================================== +--- virt-manager-1.1.0.orig/virtManager/manager.py ++++ virt-manager-1.1.0/virtManager/manager.py +@@ -921,7 +921,7 @@ class vmmManager(vmmGObjectUI): show_pause = bool(vm and vm.is_unpauseable()) else: show_pause = bool(vm and vm.is_pauseable()) @@ -10,17 +12,19 @@ if vm and vm.managedsave_supported: self.change_run_text(vm.hasSavedImage()) ---- virt-manager-1.0.1/virtManager/vmmenu.py.orig 2014-08-18 17:39:04.166109065 -0600 -+++ virt-manager-1.0.1/virtManager/vmmenu.py 2014-08-18 17:39:15.265191243 -0600 -@@ -24,6 +24,7 @@ from gi.repository import Gtk +Index: virt-manager-1.1.0/virtManager/vmmenu.py +=================================================================== +--- virt-manager-1.1.0.orig/virtManager/vmmenu.py ++++ virt-manager-1.1.0/virtManager/vmmenu.py +@@ -22,6 +22,7 @@ from gi.repository import Gtk from virtManager import config import platform +import logging #################################################################### - # Build toolbar new button menu (manager and details toolbar) # -@@ -58,6 +59,7 @@ class _VMMenu(Gtk.Menu): + # Build toolbar new button menu (manager and details toolbar) # +@@ -53,6 +54,7 @@ class _VMMenu(Gtk.Menu): self._parent = src self._current_vm_cb = current_vm_cb self._show_open = show_open @@ -28,7 +32,7 @@ self._init_state() -@@ -122,6 +124,7 @@ class VMShutdownMenu(_VMMenu): +@@ -114,6 +116,7 @@ class VMShutdownMenu(_VMMenu): name = getattr(child, "vmm_widget_name", None) if name in statemap: child.set_sensitive(statemap[name]) @@ -36,7 +40,7 @@ class VMActionMenu(_VMMenu): -@@ -133,7 +136,8 @@ class VMActionMenu(_VMMenu): +@@ -122,7 +125,8 @@ class VMActionMenu(_VMMenu): self._add_action(_("_Pause"), "suspend", Gtk.STOCK_MEDIA_PAUSE) self._add_action(_("R_esume"), "resume", Gtk.STOCK_MEDIA_PAUSE) s = self._add_action(_("_Shut Down"), "shutdown", addcb=False) @@ -46,7 +50,7 @@ self.add(Gtk.SeparatorMenuItem()) self._add_action(_("Clone..."), "clone", None) -@@ -149,7 +153,7 @@ class VMActionMenu(_VMMenu): +@@ -138,7 +142,7 @@ class VMActionMenu(_VMMenu): def update_widget_states(self, vm): statemap = { "run": bool(vm and vm.is_runable()), @@ -55,7 +59,7 @@ "suspend": bool(vm and vm.is_stoppable()), "resume": bool(vm and vm.is_paused()), "migrate": bool(vm and vm.is_stoppable()), -@@ -166,6 +170,8 @@ class VMActionMenu(_VMMenu): +@@ -155,6 +159,8 @@ class VMActionMenu(_VMMenu): child.update_widget_states(vm) if name in statemap: child.set_sensitive(statemap[name]) ++++++ virtman-autoyast-support.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,10 +1,10 @@ -Index: virt-manager-1.0.1/virtManager/create.py +Index: virt-manager-1.1.0/virtManager/create.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/create.py -+++ virt-manager-1.0.1/virtManager/create.py -@@ -1230,11 +1230,34 @@ class vmmCreate(vmmGObjectUI): - variant = self.widget("install-os-version") - variant.set_active(0) +--- virt-manager-1.1.0.orig/virtManager/create.py ++++ virt-manager-1.1.0/virtManager/create.py +@@ -1257,11 +1257,34 @@ class vmmCreate(vmmGObjectUI): + if self.widget("install-os-version").get_visible(): + self.widget("install-os-version-entry").grab_focus() + def _update_kickstart_label(self): + # Update label based on os version selected to either kickstart or autoyast @@ -37,7 +37,7 @@ # Get previous type_row = self._selected_os_row() if not type_row: -@@ -1594,7 +1617,10 @@ class vmmCreate(vmmGObjectUI): +@@ -1626,7 +1649,10 @@ class vmmCreate(vmmGObjectUI): if extra: extraargs += extra if ks: @@ -49,7 +49,7 @@ if extraargs: self.guest.installer.extraargs = extraargs -@@ -1992,6 +2018,7 @@ class vmmCreate(vmmGObjectUI): +@@ -2034,6 +2060,7 @@ class vmmCreate(vmmGObjectUI): dl = self.set_os_val(self.widget("install-os-type"), distro_type) vl = self.set_os_val(self.widget("install-os-version"), distro_var) self.set_distro_labels(dl, vl) @@ -57,11 +57,11 @@ def check_detection(self, idx, forward): results = None -Index: virt-manager-1.0.1/ui/create.ui +Index: virt-manager-1.1.0/ui/create.ui =================================================================== ---- virt-manager-1.0.1.orig/ui/create.ui -+++ virt-manager-1.0.1/ui/create.ui -@@ -869,7 +869,7 @@ bar</property> +--- virt-manager-1.1.0.orig/ui/create.ui ++++ virt-manager-1.1.0/ui/create.ui +@@ -841,7 +841,7 @@ bar</property> <property name="column_spacing">6</property> <property name="row_spacing">4</property> <child> ++++++ virtman-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/addhardware.py +Index: virt-manager-1.1.0/virtManager/addhardware.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/addhardware.py -+++ virt-manager-1.0.1/virtManager/addhardware.py -@@ -760,7 +760,7 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/addhardware.py ++++ virt-manager-1.1.0/virtManager/addhardware.py +@@ -800,7 +800,7 @@ class vmmAddHardware(vmmGObjectUI): disk_buses = ["ide", "sata", "scsi", "sd", "usb", "virtio", "virtio-scsi", "xen"] floppy_buses = ["fdc"] ++++++ virtman-check-for-empty-network-name.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,10 +1,10 @@ bnc#885273 -Index: virt-manager-1.0.1/virtManager/createnet.py +Index: virt-manager-1.1.0/virtManager/createnet.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/createnet.py -+++ virt-manager-1.0.1/virtManager/createnet.py -@@ -253,6 +253,8 @@ class vmmCreateNetwork(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/createnet.py ++++ virt-manager-1.1.0/virtManager/createnet.py +@@ -257,6 +257,8 @@ class vmmCreateNetwork(vmmGObjectUI): try: net = self._build_xmlstub() net.name = self.widget("net-name").get_text() ++++++ virtman-default-guest-from-host-os.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-1.0.1/virtManager/create.py +Index: virt-manager-1.1.0/virtManager/create.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/create.py -+++ virt-manager-1.0.1/virtManager/create.py +--- virt-manager-1.1.0.orig/virtManager/create.py ++++ virt-manager-1.1.0/virtManager/create.py @@ -21,6 +21,8 @@ import logging import threading @@ -9,9 +9,9 @@ +import sys +import os - # pylint: disable=E0611 from gi.repository import GObject -@@ -1142,6 +1144,55 @@ class vmmCreate(vmmGObjectUI): + from gi.repository import Gtk +@@ -1167,6 +1169,55 @@ class vmmCreate(vmmGObjectUI): return self.start_detection(forward=forward) @@ -67,8 +67,8 @@ def toggle_detect_os(self, src): dodetect = src.get_active() -@@ -1153,6 +1204,8 @@ class vmmCreate(vmmGObjectUI): - if dodetect: +@@ -1179,6 +1230,8 @@ class vmmCreate(vmmGObjectUI): + self.widget("install-os-version-entry").set_text("") self.mediaDetected = False self.detect_media_os() + else: ++++++ virtman-default-lxc-uri.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -10,11 +10,11 @@ virtManager/connect.py | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) -Index: virt-manager-1.0.1/virtManager/connect.py +Index: virt-manager-1.1.0/virtManager/connect.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/connect.py -+++ virt-manager-1.0.1/virtManager/connect.py -@@ -116,6 +116,10 @@ class vmmConnect(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/connect.py ++++ virt-manager-1.1.0/virtManager/connect.py +@@ -115,6 +115,10 @@ class vmmConnect(vmmGObjectUI): return "qemu:///system" else: return "qemu:///session" ++++++ virtman-default-to-xen-pv.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/create.py +Index: virt-manager-1.1.0/virtManager/create.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/create.py -+++ virt-manager-1.0.1/virtManager/create.py -@@ -862,7 +862,12 @@ class vmmCreate(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/create.py ++++ virt-manager-1.1.0/virtManager/create.py +@@ -876,7 +876,12 @@ class vmmCreate(vmmGObjectUI): if gtype is None: # If none specified, prefer HVM so install options aren't limited # with a default PV choice. ++++++ virtman-dont-allow-grub.xen-to-be-deleted.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,10 +1,10 @@ bnc#885094 -Index: virt-manager-1.0.1/virtManager/delete.py +Index: virt-manager-1.1.0/virtManager/delete.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/delete.py -+++ virt-manager-1.0.1/virtManager/delete.py -@@ -242,7 +242,7 @@ def populate_storage_list(storage_list, +--- virt-manager-1.1.0.orig/virtManager/delete.py ++++ virt-manager-1.1.0/virtManager/delete.py +@@ -240,7 +240,7 @@ def populate_storage_list(storage_list, diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False)) for target, path, ro, shared in diskdata: ++++++ virtman-eepro100.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/addhardware.py +Index: virt-manager-1.1.0/virtManager/addhardware.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/addhardware.py -+++ virt-manager-1.0.1/virtManager/addhardware.py -@@ -555,6 +555,7 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/addhardware.py ++++ virt-manager-1.1.0/virtManager/addhardware.py +@@ -574,6 +574,7 @@ class vmmAddHardware(vmmGObjectUI): if vm.is_hvm(): mod_list = ["rtl8139", "ne2k_pci", "pcnet", "e1000"] if vm.get_hv_type() in ["kvm", "qemu", "test"]: ++++++ virtman-increase-setKeepAlive-count.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,7 +1,9 @@ bnc#892003 ---- virt-manager-1.0.1/virtManager/connection.py.orig 2014-08-18 13:45:50.843688551 -0600 -+++ virt-manager-1.0.1/virtManager/connection.py 2014-08-18 14:13:37.968606032 -0600 -@@ -1114,7 +1114,7 @@ class vmmConnection(vmmGObject): +Index: virt-manager-1.1.0/virtManager/connection.py +=================================================================== +--- virt-manager-1.1.0.orig/virtManager/connection.py ++++ virt-manager-1.1.0/virtManager/connection.py +@@ -1028,7 +1028,7 @@ class vmmConnection(vmmGObject): self._add_conn_events() try: ++++++ virtman-keycombo.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/console.py +Index: virt-manager-1.1.0/virtManager/console.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/console.py -+++ virt-manager-1.0.1/virtManager/console.py -@@ -942,6 +942,16 @@ class vmmConsolePages(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/console.py ++++ virt-manager-1.1.0/virtManager/console.py +@@ -940,6 +940,16 @@ class vmmConsolePages(vmmGObjectUI): make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"]) make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"]) menu.add(Gtk.SeparatorMenuItem()) ++++++ virtman-kvm.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/connect.py +Index: virt-manager-1.1.0/virtManager/connect.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/connect.py -+++ virt-manager-1.0.1/virtManager/connect.py -@@ -110,7 +110,7 @@ class vmmConnect(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/connect.py ++++ virt-manager-1.1.0/virtManager/connect.py +@@ -109,7 +109,7 @@ class vmmConnect(vmmGObjectUI): if (os.path.exists("/usr/bin/qemu") or os.path.exists("/usr/bin/qemu-kvm") or ++++++ virtman-libvirtd-not-running.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/packageutils.py +Index: virt-manager-1.1.0/virtManager/packageutils.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/packageutils.py -+++ virt-manager-1.0.1/virtManager/packageutils.py -@@ -151,8 +151,8 @@ def start_libvirtd(): +--- virt-manager-1.1.0.orig/virtManager/packageutils.py ++++ virt-manager-1.1.0/virtManager/packageutils.py +@@ -149,8 +149,8 @@ def start_libvirtd(): logging.debug("libvirtd not running, asking system-config-services " "to start it") scs = Gio.DBusProxy.new_sync(bus, 0, None, ++++++ virtman-load-stored-uris.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,6 +1,8 @@ ---- virt-manager-1.0.0/virtManager/engine.py.orig 2014-03-13 15:48:17.556984261 -0600 -+++ virt-manager-1.0.0/virtManager/engine.py 2014-03-13 15:48:22.909014154 -0600 -@@ -229,9 +229,22 @@ class vmmEngine(vmmGObject): +Index: virt-manager-1.1.0/virtManager/engine.py +=================================================================== +--- virt-manager-1.1.0.orig/virtManager/engine.py ++++ virt-manager-1.1.0/virtManager/engine.py +@@ -226,9 +226,22 @@ class vmmEngine(vmmGObject): if not uris: return logging.debug("About to connect to uris %s", uris) ++++++ virtman-packages.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.0/setup.py +Index: virt-manager-1.1.0/setup.py =================================================================== ---- virt-manager-1.0.0.orig/setup.py -+++ virt-manager-1.0.0/setup.py -@@ -310,8 +310,11 @@ class configure(Command): +--- virt-manager-1.1.0.orig/setup.py ++++ virt-manager-1.1.0/setup.py +@@ -303,8 +303,11 @@ class configure(Command): ("pkgversion=", None, "user specified version-id"), ("qemu-user=", None, "user libvirt uses to launch qemu processes (default=root)"), @@ -16,7 +16,7 @@ "first run. comma separated string (default=none)"), ("kvm-package-names=", None, "recommended kvm packages virt-manager will check for on first run " -@@ -335,7 +338,8 @@ class configure(Command): +@@ -330,7 +333,8 @@ class configure(Command): self.prefix = sysprefix self.pkgversion = None self.qemu_user = None @@ -26,7 +26,7 @@ self.kvm_package_names = None self.askpass_package_names = None self.preferred_distros = None -@@ -351,8 +355,10 @@ class configure(Command): +@@ -347,8 +351,10 @@ class configure(Command): template += "pkgversion = %s\n" % self.pkgversion if self.qemu_user is not None: template += "default_qemu_user = %s\n" % self.qemu_user @@ -39,11 +39,11 @@ if self.kvm_package_names is not None: template += "hv_packages = %s\n" % self.kvm_package_names if self.askpass_package_names is not None: -Index: virt-manager-1.0.0/virtcli/cliconfig.py +Index: virt-manager-1.1.0/virtcli/cliconfig.py =================================================================== ---- virt-manager-1.0.0.orig/virtcli/cliconfig.py -+++ virt-manager-1.0.0/virtcli/cliconfig.py -@@ -86,5 +86,6 @@ stable_defaults = bool(int(_get_param("s +--- virt-manager-1.1.0.orig/virtcli/cliconfig.py ++++ virt-manager-1.1.0/virtcli/cliconfig.py +@@ -92,6 +92,7 @@ stable_defaults = bool(int(_get_param("s preferred_distros = _split_list(_get_param("preferred_distros", "")) hv_packages = _split_list(_get_param("hv_packages", "")) askpass_package = _split_list(_get_param("askpass_packages", "")) @@ -51,11 +51,12 @@ +libvirt_kvm_packages = _split_list(_get_param("libvirt_kvm_packages", "")) +libvirt_xen_packages = _split_list(_get_param("libvirt_xen_packages", "")) default_graphics = _get_param("default_graphics", "spice") -Index: virt-manager-1.0.0/virtManager/config.py + with_bhyve = bool(int(_get_param("with_bhyve", "0"))) +Index: virt-manager-1.1.0/virtManager/config.py =================================================================== ---- virt-manager-1.0.0.orig/virtManager/config.py -+++ virt-manager-1.0.0/virtManager/config.py -@@ -160,7 +160,8 @@ class vmmConfig(object): +--- virt-manager-1.1.0.orig/virtManager/config.py ++++ virt-manager-1.1.0/virtManager/config.py +@@ -158,7 +158,8 @@ class vmmConfig(object): self.stable_defaults = cliconfig.stable_defaults self.preferred_distros = cliconfig.preferred_distros self.hv_packages = cliconfig.hv_packages @@ -64,12 +65,12 @@ + self.libvirt_xen_packages = cliconfig.libvirt_xen_packages self.askpass_package = cliconfig.askpass_package self.default_graphics_from_config = cliconfig.default_graphics - self.cli_usbredir = None -Index: virt-manager-1.0.0/virtManager/engine.py + self.with_bhyve = cliconfig.with_bhyve +Index: virt-manager-1.1.0/virtManager/engine.py =================================================================== ---- virt-manager-1.0.0.orig/virtManager/engine.py -+++ virt-manager-1.0.0/virtManager/engine.py -@@ -196,21 +196,17 @@ class vmmEngine(vmmGObject): +--- virt-manager-1.1.0.orig/virtManager/engine.py ++++ virt-manager-1.1.0/virtManager/engine.py +@@ -193,21 +193,17 @@ class vmmEngine(vmmGObject): ret = None try: ++++++ virtman-prevent-double-click-starting-vm-twice.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,10 +1,10 @@ bnc#874594 - virt-manager allows issuing of start for xen domain twice, resulting in failure -Index: virt-manager-1.0.1/virtManager/details.py +Index: virt-manager-1.1.0/virtManager/details.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/details.py -+++ virt-manager-1.0.1/virtManager/details.py -@@ -1462,6 +1462,9 @@ class vmmDetails(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/details.py ++++ virt-manager-1.1.0/virtManager/details.py +@@ -1499,6 +1499,9 @@ class vmmDetails(vmmGObjectUI): self.widget("details-menu-usb-redirection").set_sensitive(can_usb) def control_vm_run(self, src_ignore): @@ -12,5 +12,5 @@ + # start the VM twice + self.widget("control-run").set_sensitive(False) self.emit("action-run-domain", - self.vm.conn.get_uri(), self.vm.get_uuid()) + self.vm.conn.get_uri(), self.vm.get_connkey()) ++++++ virtman-s390x-default-to-vminstall.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,16 +1,16 @@ -Index: virt-manager-1.0.1/virtManager/engine.py +Index: virt-manager-1.1.0/virtManager/engine.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/engine.py -+++ virt-manager-1.0.1/virtManager/engine.py -@@ -30,6 +30,7 @@ import re +--- virt-manager-1.1.0.orig/virtManager/engine.py ++++ virt-manager-1.1.0/virtManager/engine.py +@@ -27,6 +27,7 @@ import re import Queue import threading import traceback +import platform + import os from subprocess import * - import libvirt -@@ -854,7 +855,7 @@ class vmmEngine(vmmGObject): +@@ -805,7 +806,7 @@ class vmmEngine(vmmGObject): obj.connect("action-clone-domain", self._do_show_clone) obj.connect("action-show-domain", self._do_show_vm) obj.connect("action-show-preferences", self._do_show_preferences) @@ -19,7 +19,7 @@ obj.connect("action-show-create-vminstall", self._do_show_create_vminstall) obj.connect("action-show-about", self._do_show_about) obj.connect("action-show-host", self._do_show_host) -@@ -900,7 +901,20 @@ class vmmEngine(vmmGObject): +@@ -853,7 +854,20 @@ class vmmEngine(vmmGObject): self.windowCreate = None def _do_show_create_vminstall(self, src, uri): @@ -41,7 +41,7 @@ def _do_show_create(self, src, uri, use_vminstall=False): if uri is None: -@@ -984,7 +998,10 @@ class vmmEngine(vmmGObject): +@@ -937,7 +951,10 @@ class vmmEngine(vmmGObject): def show_domain_creator(self, uri): self.show_manager() @@ -51,21 +51,21 @@ + else: + self._do_show_create(self.get_manager(), uri, False) - def show_domain_console(self, uri, uuid): - self.idle_add(self._show_vm_helper, self.get_manager(), uri, uuid, -Index: virt-manager-1.0.1/virtManager/vmmenu.py + + def _find_vm_by_cli_str(self, uri, clistr): +Index: virt-manager-1.1.0/virtManager/vmmenu.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/vmmenu.py -+++ virt-manager-1.0.1/virtManager/vmmenu.py -@@ -23,6 +23,7 @@ from gi.repository import Gtk - # pylint: enable=E0611 +--- virt-manager-1.1.0.orig/virtManager/vmmenu.py ++++ virt-manager-1.1.0/virtManager/vmmenu.py +@@ -21,6 +21,7 @@ + from gi.repository import Gtk from virtManager import config +import platform #################################################################### - # Build toolbar new button menu (manager and details toolbar) # -@@ -35,8 +36,10 @@ def build_new_button_menu(widget, vminst + # Build toolbar new button menu (manager and details toolbar) # +@@ -33,8 +34,10 @@ def build_new_button_menu(widget, vminst widget.set_menu(menu) vminstallimg = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.MENU) ++++++ virtman-show-suse-install-repos.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-1.0.1/virtManager/create.py +Index: virt-manager-1.1.0/virtManager/create.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/create.py -+++ virt-manager-1.0.1/virtManager/create.py +--- virt-manager-1.1.0.orig/virtManager/create.py ++++ virt-manager-1.1.0/virtManager/create.py @@ -18,6 +18,7 @@ # MA 02110-1301 USA. # @@ -10,7 +10,7 @@ import logging import threading import time -@@ -365,7 +366,13 @@ class vmmCreate(vmmGObjectUI): +@@ -370,7 +371,13 @@ class vmmCreate(vmmGObjectUI): self.widget("install-url-options").set_expanded(False) urlmodel = self.widget("install-url-box").get_model() ksmodel = self.widget("install-ks-box").get_model() @@ -25,10 +25,10 @@ self.populate_media_model(ksmodel, self.config.get_kickstart_urls()) self.set_distro_labels("-", "-", force=True) -Index: virt-manager-1.0.1/virtinst/util.py +Index: virt-manager-1.1.0/virtinst/util.py =================================================================== ---- virt-manager-1.0.1.orig/virtinst/util.py -+++ virt-manager-1.0.1/virtinst/util.py +--- virt-manager-1.1.0.orig/virtinst/util.py ++++ virt-manager-1.1.0/virtinst/util.py @@ -23,12 +23,14 @@ import os import random import re @@ -44,7 +44,7 @@ def listify(l): -@@ -531,3 +533,96 @@ def convert_units(value, old_unit, new_u +@@ -517,3 +519,96 @@ def convert_units(value, old_unit, new_u power = get_power(new_unit) return in_bytes / pow(factor, power) ++++++ virtman-stable-os-support.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,6 +1,8 @@ ---- virt-manager-1.0.0/virtManager/create.py.orig 2014-03-21 10:30:13.000000000 -0600 -+++ virt-manager-1.0.0/virtManager/create.py 2014-03-21 10:56:45.000000000 -0600 -@@ -66,8 +66,9 @@ INSTALL_PAGE_CONTAINER_APP = 4 +Index: virt-manager-1.1.0/virtManager/create.py +=================================================================== +--- virt-manager-1.1.0.orig/virtManager/create.py ++++ virt-manager-1.1.0/virtManager/create.py +@@ -64,8 +64,9 @@ INSTALL_PAGE_CONTAINER_APP = 4 INSTALL_PAGE_CONTAINER_OS = 5 STABLE_OS_SUPPORT = [ ++++++ virtman-supported-disk-formats.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-1.0.1/virtManager/addhardware.py +Index: virt-manager-1.1.0/virtManager/addhardware.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/addhardware.py -+++ virt-manager-1.0.1/virtManager/addhardware.py -@@ -700,11 +700,14 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/addhardware.py ++++ virt-manager-1.1.0/virtManager/addhardware.py +@@ -719,11 +719,14 @@ class vmmAddHardware(vmmGObjectUI): combo.set_model(model) uiutil.set_combo_text_column(combo, 0) ++++++ virtman-sync-vm-startup-for-cpu-usage.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -3,15 +3,15 @@ The orignal object gets the cpu stats from libvirt but the new one is used to update the display but it is never updated with the new stats. -Index: virt-manager-1.0.1/virtManager/connection.py +Index: virt-manager-1.1.0/virtManager/connection.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/connection.py -+++ virt-manager-1.0.1/virtManager/connection.py -@@ -1291,6 +1291,9 @@ class vmmConnection(vmmGObject): +--- virt-manager-1.1.0.orig/virtManager/connection.py ++++ virt-manager-1.1.0/virtManager/connection.py +@@ -1245,6 +1245,9 @@ class vmmConnection(vmmGObject): self.emit("nodedev-added", name) self.idle_add(tick_send_signals) -+ if len(self.vms) < len(vms): ++ if len(self._vms) < len(vms): + # Allow time for tick_send_signals to run + time.sleep(.1) ++++++ virtman-vminstall.patch ++++++ --- /var/tmp/diff_new_pack.aSSpyv/_old 2014-11-06 16:51:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aSSpyv/_new 2014-11-06 16:51:45.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-1.0.1/ui/manager.ui +Index: virt-manager-1.1.0/ui/manager.ui =================================================================== ---- virt-manager-1.0.1.orig/ui/manager.ui -+++ virt-manager-1.0.1/ui/manager.ui +--- virt-manager-1.1.0.orig/ui/manager.ui ++++ virt-manager-1.1.0/ui/manager.ui @@ -277,7 +277,7 @@ <property name="can_focus">False</property> <property name="show_arrow">False</property> @@ -19,11 +19,11 @@ </packing> </child> <child> -Index: virt-manager-1.0.1/virtManager/manager.py +Index: virt-manager-1.1.0/virtManager/manager.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/manager.py -+++ virt-manager-1.0.1/virtManager/manager.py -@@ -95,6 +95,7 @@ class vmmManager(vmmGObjectUI): +--- virt-manager-1.1.0.orig/virtManager/manager.py ++++ virt-manager-1.1.0/virtManager/manager.py +@@ -93,6 +93,7 @@ class vmmManager(vmmGObjectUI): "action-show-host": (GObject.SignalFlags.RUN_FIRST, None, [str]), "action-show-preferences": (GObject.SignalFlags.RUN_FIRST, None, []), "action-show-create": (GObject.SignalFlags.RUN_FIRST, None, [str]), @@ -31,7 +31,7 @@ "action-suspend-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-resume-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-run-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), -@@ -298,7 +299,8 @@ class vmmManager(vmmGObjectUI): +@@ -290,7 +291,8 @@ class vmmManager(vmmGObjectUI): def init_toolbar(self): @@ -41,7 +41,7 @@ self.widget("vm-open").set_icon_name("icon_console") menu = vmmenu.VMShutdownMenu(self, self.current_vm) -@@ -489,6 +491,9 @@ class vmmManager(vmmGObjectUI): +@@ -475,6 +477,9 @@ class vmmManager(vmmGObjectUI): def new_vm(self, src_ignore=None): self.emit("action-show-create", self.current_conn_uri()) @@ -51,19 +51,19 @@ def show_about(self, src_ignore): self.emit("action-show-about") -Index: virt-manager-1.0.1/virtManager/vmmenu.py +Index: virt-manager-1.1.0/virtManager/vmmenu.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/vmmenu.py -+++ virt-manager-1.0.1/virtManager/vmmenu.py -@@ -21,9 +21,28 @@ - # pylint: disable=E0611 +--- virt-manager-1.1.0.orig/virtManager/vmmenu.py ++++ virt-manager-1.1.0/virtManager/vmmenu.py +@@ -19,9 +19,28 @@ + # + from gi.repository import Gtk - # pylint: enable=E0611 +from virtManager import config #################################################################### -+# Build toolbar new button menu (manager and details toolbar) # ++# Build toolbar new button menu (manager and details toolbar) # +#################################################################### + +def build_new_button_menu(widget, vminstall_cb): @@ -84,11 +84,11 @@ # Build toolbar shutdown button menu (manager and details toolbar) # #################################################################### -Index: virt-manager-1.0.1/virtManager/config.py +Index: virt-manager-1.1.0/virtManager/config.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/config.py -+++ virt-manager-1.0.1/virtManager/config.py -@@ -191,6 +191,13 @@ class vmmConfig(object): +--- virt-manager-1.1.0.orig/virtManager/config.py ++++ virt-manager-1.1.0/virtManager/config.py +@@ -190,6 +190,13 @@ class vmmConfig(object): # General app wide helpers (gconf agnostic) @@ -102,24 +102,20 @@ def get_appname(self): return self.appname def get_appversion(self): -Index: virt-manager-1.0.1/virtManager/engine.py +Index: virt-manager-1.1.0/virtManager/engine.py =================================================================== ---- virt-manager-1.0.1.orig/virtManager/engine.py -+++ virt-manager-1.0.1/virtManager/engine.py -@@ -25,9 +25,12 @@ from gi.repository import Gtk - # pylint: enable=E0611 - - import logging -+import os - import re +--- virt-manager-1.1.0.orig/virtManager/engine.py ++++ virt-manager-1.1.0/virtManager/engine.py +@@ -27,6 +27,8 @@ import re import Queue import threading -+import traceback + import traceback ++import os +from subprocess import * - import libvirt from virtinst import util -@@ -76,6 +79,7 @@ class vmmEngine(vmmGObject): + +@@ -74,6 +76,7 @@ class vmmEngine(vmmGObject): self.windowCreate = None self.windowManager = None self.windowMigrate = None @@ -127,7 +123,7 @@ self.conns = {} self.err = vmmErrorDialog() -@@ -841,6 +845,7 @@ class vmmEngine(vmmGObject): +@@ -793,6 +796,7 @@ class vmmEngine(vmmGObject): obj.connect("action-show-domain", self._do_show_vm) obj.connect("action-show-preferences", self._do_show_preferences) obj.connect("action-show-create", self._do_show_create) @@ -135,7 +131,7 @@ obj.connect("action-show-about", self._do_show_about) obj.connect("action-show-host", self._do_show_host) obj.connect("action-show-connect", self._do_show_connect) -@@ -881,11 +886,52 @@ class vmmEngine(vmmGObject): +@@ -835,11 +839,52 @@ class vmmEngine(vmmGObject): self.windowCreate = obj return self.windowCreate @@ -191,5 +187,5 @@ + message_box.run() + message_box.destroy() - def _do_show_migrate(self, src, uri, uuid): + def _do_show_migrate(self, src, uri, connkey): try: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
