Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2015-06-10 09:16:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-05-29 10:45:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2015-06-10 09:16:36.000000000 +0200 @@ -1,0 +2,51 @@ +Mon Jun 8 06:07:48 MDT 2015 - [email protected] + +- Update to virt-manager 1.2.0 + virt-manager-1.2.1.tar.bz2 + * Bugfix release + * Fix connecting to older libvirt versions (Michał Kępień) + * Fix connecting to VM console with non-IP hostname (Giuseppe Scrivano) + * Fix addhardware/create wizard errors when a nodedev disappears + * Fix adding a second cdrom via customize dialog +- Dropped tarball and patches + virt-manager-1.2.0.tar.bz2 + 848123e6-fix-memory-stats-for-shutoff-VM.patch + ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch + c4d26d16-fix-VM-polling-on-old-libvirt.patch + ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch + 88e18c86-fix-sending-net-removed-signal.patch + fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch + 2c1e482b-fix--show-host-summary-error-windows-flooding.patch + 4b5c836a-read-start-mode-from-inactive-conf-XML.patch + 776c1d97-fix-changing-USB-device-model.patch + bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch + f8af2e6b-verify-HYPER-V-support-after-customization.patch + 9ea3fcd1-add-classes-for-SUSE-distros.patch + 23f262ec-fetch-URL-media-from-content-file-for-suse-distros.patch + 5618fa4c-add-support-for-detecting-os-variants-of-suse-distros.patch + 9b99eff7-add-opensuse-13.x-tests.patch + f5a13510-clone-dont-use-separator-when-disk-under-root.patch + +------------------------------------------------------------------- +Fri Jun 5 14:44:31 MDT 2015 - [email protected] + +- Upstream support for suse distros + 9ea3fcd1-add-classes-for-SUSE-distros.patch + 23f262ec-fetch-URL-media-from-content-file-for-suse-distros.patch + 5618fa4c-add-support-for-detecting-os-variants-of-suse-distros.patch + 9b99eff7-add-opensuse-13.x-tests.patch +- Drop virtinst-detect-suse-distros.patch +- Add detection for Open Enterprise Server + virtinst-detect-oes-distros.patch +- Upstream bug fix + f5a13510-clone-dont-use-separator-when-disk-under-root.patch + +------------------------------------------------------------------- +Tue Jun 2 14:08:51 MDT 2015 - [email protected] + +- bsc#933242 - virt-manager: summary=Error launching manager: list + index out of range + virtman-show-suse-install-repos.patch +- Add depedency on typelib(Libosinfo) + +------------------------------------------------------------------- Old: ---- 2c1e482b-fix--show-host-summary-error-windows-flooding.patch 4b5c836a-read-start-mode-from-inactive-conf-XML.patch 776c1d97-fix-changing-USB-device-model.patch 848123e6-fix-memory-stats-for-shutoff-VM.patch 88e18c86-fix-sending-net-removed-signal.patch ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch c4d26d16-fix-VM-polling-on-old-libvirt.patch ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch f8af2e6b-verify-HYPER-V-support-after-customization.patch fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch virt-manager-1.2.0.tar.bz2 virtinst-detect-suse-distros.patch New: ---- virt-manager-1.2.1.tar.bz2 virtinst-detect-oes-distros.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:38.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:38.000000000 +0200 @@ -23,11 +23,11 @@ %define libvirt_xen_packages "" %define preferred_distros "sles12,opensuse13.2" %define kvm_packages "" -%define _version 1.2.0 +%define _version 1.2.1 %define _release 1 Name: virt-manager -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: Virtual Machine Manager License: GPL-2.0+ @@ -37,17 +37,6 @@ Source1: virt-install.rb Source2: virt-install.desktop # Upstream Patches -Patch1: 848123e6-fix-memory-stats-for-shutoff-VM.patch -Patch2: ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch -Patch3: c4d26d16-fix-VM-polling-on-old-libvirt.patch -Patch4: ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch -Patch5: 88e18c86-fix-sending-net-removed-signal.patch -Patch6: fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch -Patch7: 2c1e482b-fix--show-host-summary-error-windows-flooding.patch -Patch8: 4b5c836a-read-start-mode-from-inactive-conf-XML.patch -Patch9: 776c1d97-fix-changing-USB-device-model.patch -Patch10: bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch -Patch11: f8af2e6b-verify-HYPER-V-support-after-customization.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -70,7 +59,7 @@ Patch107: virtman-add-connect-default.patch Patch120: virtinst-storage-ocfs2.patch Patch121: virtinst-default-xen-to-qcow2-format.patch -Patch123: virtinst-detect-suse-distros.patch +Patch123: virtinst-detect-oes-distros.patch Patch124: virtinst-modify-gui-defaults.patch Patch125: virtinst-vol-default-nocow.patch Patch126: virtinst-detect-windows-media.patch @@ -99,6 +88,7 @@ Requires: python-gconf Requires: virt-manager-common = %{verrel} Requires: vm-install >= 0.5.6 +Requires: typelib(Libosinfo) # Libvirt-glib Requires: typelib(LibvirtGLib) @@ -166,17 +156,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 # SUSE Only %patch70 -p1 %patch71 -p1 ++++++ virt-manager-1.2.0.tar.bz2 -> virt-manager-1.2.1.tar.bz2 ++++++ ++++ 98495 lines of diff (skipped) ++++++ virtinst-add-default-rng-device.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,10 +1,10 @@ References: bnc#885308 Enhancement to add a virtio RNG device to non windows VMs. -Index: virt-manager-1.1.0/virtinst/guest.py +Index: virt-manager-1.2.1/virtinst/guest.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/guest.py -+++ virt-manager-1.1.0/virtinst/guest.py -@@ -53,6 +53,7 @@ from .pm import PM +--- virt-manager-1.2.1.orig/virtinst/guest.py ++++ virt-manager-1.2.1/virtinst/guest.py +@@ -54,6 +54,7 @@ from .pm import PM from .seclabel import Seclabel from .xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty from .devicedisk import VirtualDisk @@ -12,7 +12,7 @@ class Guest(XMLBuilder): -@@ -681,6 +682,15 @@ class Guest(XMLBuilder): +@@ -675,6 +676,15 @@ class Guest(XMLBuilder): return self.add_device(VirtualGraphics(self.conn)) @@ -28,11 +28,11 @@ def add_default_devices(self): self.add_default_graphics() self.add_default_video_device() -@@ -688,6 +698,7 @@ class Guest(XMLBuilder): +@@ -682,6 +692,7 @@ class Guest(XMLBuilder): self.add_default_console_device() self.add_default_usb_controller() self.add_default_channels() + self.add_default_rng() - def _set_transient_device_defaults(self, install): - def do_remove_media(d): + def _add_install_cdrom(self): + if self._install_cdrom_device: ++++++ virtinst-detect-oes-distros.patch ++++++ Enhancement to correctly detect Open Enterprise Server media is selected as the installation source. Index: virt-manager-1.2.0/virtinst/urlfetcher.py =================================================================== --- virt-manager-1.2.0.orig/virtinst/urlfetcher.py +++ virt-manager-1.2.0/virtinst/urlfetcher.py @@ -383,6 +383,10 @@ def _distroFromSUSEContent(fetcher, arch dclass = SLEDDistro if distro_version is None: distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]] + elif re.match(".*Open Enterprise Server*", distribution[1]): + dclass = SLESDistro + if distro_version is None: + distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]] elif re.match(".*openSUSE.*", distribution[1]): dclass = OpensuseDistro if distro_version is None: ++++++ virtinst-detect-windows-media.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,14 +1,14 @@ Enhancement to detect windows media. It is based solely upon finding an autorun.inf file in the root of the installation source. It only assumes windows, not the specific version of windows. -Index: virt-manager-1.1.0/virtinst/urlfetcher.py +Index: virt-manager-1.2.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.1.0/virtinst/urlfetcher.py -@@ -407,6 +407,24 @@ def _distroFromContent(fetcher, arch, vm - +--- virt-manager-1.2.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.2.0/virtinst/urlfetcher.py +@@ -408,6 +408,24 @@ def _distroFromSUSEContent(fetcher, arch return ob + +def _distroFromAutorun(fetcher, arch, vmtype=None): + # Just look for autorun.inf (also in uppercase) + # If present media is likely from a windows iso. @@ -30,7 +30,7 @@ def getDistroStore(guest, fetcher): stores = [] logging.debug("Finding distro store for location=%s", fetcher.location) -@@ -426,6 +444,10 @@ def getDistroStore(guest, fetcher): +@@ -427,6 +445,10 @@ def getDistroStore(guest, fetcher): if dist: return dist @@ -41,7 +41,7 @@ stores = _allstores[:] # If user manually specified an os_distro, bump it's URL class -@@ -1204,6 +1226,13 @@ class ALTLinuxDistro(Distro): +@@ -1175,6 +1197,13 @@ class ALTLinuxDistro(Distro): logging.debug("Regex didn't match, not a %s distro", self.name) return False ++++++ virtinst-nfs-install-sanitize.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -5,11 +5,11 @@ and carry the latter form around internally" We need the RFC version to work correctly whereas redhat's anaconda needs their own modified version. -Index: virt-manager-1.1.0/virtinst/util.py +Index: virt-manager-1.2.0/virtinst/util.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/util.py -+++ virt-manager-1.1.0/virtinst/util.py -@@ -557,3 +557,22 @@ def getInstallRepos(enabled_sources_only +--- virt-manager-1.2.0.orig/virtinst/util.py ++++ virt-manager-1.2.0/virtinst/util.py +@@ -559,3 +559,22 @@ def getInstallRepos(enabled_sources_only zypper_output.insert(0, dom0_inst_source) return (index_dom0, zypper_output) @@ -32,10 +32,10 @@ + + return url + -Index: virt-manager-1.1.0/virtinst/distroinstaller.py +Index: virt-manager-1.2.0/virtinst/distroinstaller.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/distroinstaller.py -+++ virt-manager-1.1.0/virtinst/distroinstaller.py +--- virt-manager-1.2.0.orig/virtinst/distroinstaller.py ++++ virt-manager-1.2.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 @@ -45,10 +45,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.1.0/virtinst/urlfetcher.py +Index: virt-manager-1.2.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.1.0/virtinst/urlfetcher.py +--- virt-manager-1.2.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.2.0/virtinst/urlfetcher.py @@ -33,6 +33,7 @@ import urlparse import urlgrabber.grabber as grabber ++++++ virtinst-pvgrub2-bootloader.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +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 newer suse distros like SLE12 and openSUSE 13.2. -Index: virt-manager-1.1.0/virtinst/guest.py +Index: virt-manager-1.2.1/virtinst/guest.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/guest.py -+++ virt-manager-1.1.0/virtinst/guest.py -@@ -364,8 +364,18 @@ class Guest(XMLBuilder): +--- virt-manager-1.2.1.orig/virtinst/guest.py ++++ virt-manager-1.2.1/virtinst/guest.py +@@ -358,8 +358,18 @@ class Guest(XMLBuilder): if (not install and self.os.is_xenpv() and not self.os.kernel): @@ -27,20 +27,20 @@ return self.get_xml_config() -Index: virt-manager-1.1.0/virtinst/installer.py +Index: virt-manager-1.2.1/virtinst/installer.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/installer.py -+++ virt-manager-1.1.0/virtinst/installer.py -@@ -112,7 +112,7 @@ class Installer(object): - dev.validate() - return dev +--- virt-manager-1.2.1.orig/virtinst/installer.py ++++ virt-manager-1.2.1/virtinst/installer.py +@@ -99,7 +99,7 @@ class Installer(object): + break + return bootorder - def alter_bootconfig(self, guest, isinstall): + def alter_bootconfig(self, guest, isinstall, force_update=False): """ Generate the portion of the guest xml that determines boot devices and parameters. (typically the <os></os> block) -@@ -123,7 +123,7 @@ class Installer(object): +@@ -110,7 +110,7 @@ class Installer(object): 'post-install' phase. @type isinstall: C{bool} """ ++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,10 +1,10 @@ Set cache mode for target installation disk to unsafe for better performance. -Index: virt-manager-1.1.0/virtinst/guest.py +Index: virt-manager-1.2.1/virtinst/guest.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/guest.py -+++ virt-manager-1.1.0/virtinst/guest.py -@@ -52,6 +52,7 @@ from .osxml import OSXML +--- virt-manager-1.2.1.orig/virtinst/guest.py ++++ virt-manager-1.2.1/virtinst/guest.py +@@ -53,6 +53,7 @@ from .osxml import OSXML from .pm import PM from .seclabel import Seclabel from .xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty @@ -12,9 +12,9 @@ class Guest(XMLBuilder): -@@ -363,6 +364,14 @@ class Guest(XMLBuilder): - dev.set_defaults(self) - self._set_disk_defaults(disks=self._install_devices) +@@ -357,6 +358,14 @@ class Guest(XMLBuilder): + + self._set_osxml_defaults() + # At install time set the target disk to 'unsafe' for + # better performance if the target is not a block device @@ -27,7 +27,7 @@ self.bootloader = None if (not install and self.os.is_xenpv() and -@@ -380,7 +389,10 @@ class Guest(XMLBuilder): +@@ -374,7 +383,10 @@ class Guest(XMLBuilder): self.bootloader = "/usr/bin/pygrub" self.os.clear() ++++++ virtinst-set-qemu-emulator.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,8 +1,8 @@ Use the correct qemu emulator based on the architecture. -Index: virt-manager-1.2.0/virtinst/guest.py +Index: virt-manager-1.2.1/virtinst/guest.py =================================================================== ---- virt-manager-1.2.0.orig/virtinst/guest.py -+++ virt-manager-1.2.0/virtinst/guest.py +--- virt-manager-1.2.1.orig/virtinst/guest.py ++++ virt-manager-1.2.1/virtinst/guest.py @@ -19,6 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. @@ -11,7 +11,7 @@ import logging import urlgrabber.progress as progress -@@ -815,14 +816,28 @@ class Guest(XMLBuilder): +@@ -811,14 +812,28 @@ class Guest(XMLBuilder): self.emulator = None return ++++++ virtinst-storage-ocfs2.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,9 +1,9 @@ Enhancement to add ocfs2 as a supported FS type -Index: virt-manager-1.2.0/virtinst/storage.py +Index: virt-manager-1.2.1/virtinst/storage.py =================================================================== ---- virt-manager-1.2.0.orig/virtinst/storage.py -+++ virt-manager-1.2.0/virtinst/storage.py -@@ -436,7 +436,7 @@ class StoragePool(_StorageObject): +--- virt-manager-1.2.1.orig/virtinst/storage.py ++++ virt-manager-1.2.1/virtinst/storage.py +@@ -447,7 +447,7 @@ class StoragePool(_StorageObject): def list_formats(self): if self.type == self.TYPE_FS: return ["auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", ++++++ virtinst-vol-default-nocow.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -4,11 +4,11 @@ Signed-off-by: Chunyan Liu <[email protected]> -Index: virt-manager-1.2.0/virtinst/storage.py +Index: virt-manager-1.2.1/virtinst/storage.py =================================================================== ---- virt-manager-1.2.0.orig/virtinst/storage.py -+++ virt-manager-1.2.0/virtinst/storage.py -@@ -705,6 +705,11 @@ class StorageVolume(_StorageObject): +--- virt-manager-1.2.1.orig/virtinst/storage.py ++++ virt-manager-1.2.1/virtinst/storage.py +@@ -716,6 +716,11 @@ class StorageVolume(_StorageObject): lazy_refcounts = XMLProperty("./target/features/lazy_refcounts", is_bool=True, default_cb=_lazy_refcounts_default_cb) ++++++ virtman-add-s390x-arch-support.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,9 +1,9 @@ Reference: bnc#869024 Add s390x support -Index: virt-manager-1.2.0/virtManager/create.py +Index: virt-manager-1.2.1/virtManager/create.py =================================================================== ---- virt-manager-1.2.0.orig/virtManager/create.py -+++ virt-manager-1.2.0/virtManager/create.py +--- virt-manager-1.2.1.orig/virtManager/create.py ++++ virt-manager-1.2.1/virtManager/create.py @@ -417,7 +417,7 @@ class vmmCreate(vmmGObjectUI): can_remote_url = self.conn.get_backend().support_remote_url_install() @@ -22,10 +22,10 @@ if self.conn.caps.host.cpu.arch not in prios: prios = [] else: -Index: virt-manager-1.2.0/virtinst/osxml.py +Index: virt-manager-1.2.1/virtinst/osxml.py =================================================================== ---- virt-manager-1.2.0.orig/virtinst/osxml.py -+++ virt-manager-1.2.0/virtinst/osxml.py +--- virt-manager-1.2.1.orig/virtinst/osxml.py ++++ virt-manager-1.2.1/virtinst/osxml.py @@ -70,6 +70,8 @@ class OSXML(XMLBuilder): return self.arch == "ppc64" or self.arch == "ppc64le" def is_pseries(self): @@ -35,11 +35,11 @@ _XML_ROOT_NAME = "os" _XML_PROP_ORDER = ["arch", "os_type", "loader", "loader_ro", "loader_type", -Index: virt-manager-1.2.0/virtinst/guest.py +Index: virt-manager-1.2.1/virtinst/guest.py =================================================================== ---- virt-manager-1.2.0.orig/virtinst/guest.py -+++ virt-manager-1.2.0/virtinst/guest.py -@@ -119,7 +119,10 @@ class Guest(XMLBuilder): +--- virt-manager-1.2.1.orig/virtinst/guest.py ++++ virt-manager-1.2.1/virtinst/guest.py +@@ -120,7 +120,10 @@ class Guest(XMLBuilder): self.skip_default_channel = False self.skip_default_sound = False self.skip_default_usbredir = False @@ -51,7 +51,7 @@ self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY self.__os_object = None -@@ -611,11 +614,13 @@ class Guest(XMLBuilder): +@@ -605,11 +608,13 @@ class Guest(XMLBuilder): self.conn.check_support( self.conn.SUPPORT_CONN_VIRTIO_CONSOLE)): dev.target_type = "virtio" @@ -66,7 +66,7 @@ return if self.get_devices("video"): return -@@ -660,7 +665,7 @@ class Guest(XMLBuilder): +@@ -654,7 +659,7 @@ class Guest(XMLBuilder): return if self.os.is_container(): return @@ -75,7 +75,7 @@ return self.add_device(VirtualGraphics(self.conn)) -@@ -960,7 +965,7 @@ class Guest(XMLBuilder): +@@ -956,7 +961,7 @@ class Guest(XMLBuilder): if self._hv_only_supports_virtio(): return True ++++++ virtman-autoyast-support.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,10 +1,10 @@ Enhancement to switch the label from 'Kickstart' to 'Autoyast' when a suse distro is selected. -Index: virt-manager-1.2.0/virtManager/create.py +Index: virt-manager-1.2.1/virtManager/create.py =================================================================== ---- virt-manager-1.2.0.orig/virtManager/create.py -+++ virt-manager-1.2.0/virtManager/create.py -@@ -1242,11 +1242,34 @@ class vmmCreate(vmmGObjectUI): +--- virt-manager-1.2.1.orig/virtManager/create.py ++++ virt-manager-1.2.1/virtManager/create.py +@@ -1256,11 +1256,34 @@ class vmmCreate(vmmGObjectUI): self.populate_os_type_model() return @@ -30,7 +30,7 @@ + label.show() + def change_os_version(self, box): - show_all = uiutil.get_list_selection(box, 3) + show_all = uiutil.get_list_selection(box, column=3) if not show_all: return @@ -39,7 +39,7 @@ # 'show all OS' was clicked # Get previous type to reselect it later type_row = self._selected_os_row() -@@ -1611,7 +1634,10 @@ class vmmCreate(vmmGObjectUI): +@@ -1625,7 +1648,10 @@ class vmmCreate(vmmGObjectUI): if extra: extraargs += extra if ks: @@ -51,7 +51,7 @@ if extraargs: self.guest.installer.extraargs = extraargs -@@ -2054,6 +2080,7 @@ class vmmCreate(vmmGObjectUI): +@@ -2068,6 +2094,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) @@ -59,10 +59,10 @@ def check_detection(self, idx, forward): results = None -Index: virt-manager-1.2.0/ui/create.ui +Index: virt-manager-1.2.1/ui/create.ui =================================================================== ---- virt-manager-1.2.0.orig/ui/create.ui -+++ virt-manager-1.2.0/ui/create.ui +--- virt-manager-1.2.1.orig/ui/create.ui ++++ virt-manager-1.2.1/ui/create.ui @@ -843,7 +843,7 @@ bar</property> <property name="column_spacing">6</property> <property name="row_spacing">4</property> ++++++ virtman-default-guest-from-host-os.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,9 +1,9 @@ Enhancement to default to the host os version when creating a VM and media detection of the install source is turned off. -Index: virt-manager-1.1.0/virtManager/create.py +Index: virt-manager-1.2.1/virtManager/create.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/create.py -+++ virt-manager-1.1.0/virtManager/create.py +--- virt-manager-1.2.1.orig/virtManager/create.py ++++ virt-manager-1.2.1/virtManager/create.py @@ -21,6 +21,8 @@ import logging import threading @@ -13,7 +13,7 @@ from gi.repository import GObject from gi.repository import Gtk -@@ -836,7 +838,7 @@ class vmmCreate(vmmGObjectUI): +@@ -842,7 +844,7 @@ class vmmCreate(vmmGObjectUI): preferred = self.config.preferred_distros variants = virtinst.OSDB.list_os(typename=_type, sortpref=preferred) supportl = virtinst.OSDB.list_os(typename=_type, sortpref=preferred, @@ -22,7 +22,7 @@ for v in variants: supported = v in supportl or v.name == "generic" -@@ -1158,6 +1160,53 @@ class vmmCreate(vmmGObjectUI): +@@ -1173,6 +1175,53 @@ class vmmCreate(vmmGObjectUI): return self.start_detection(forward=forward) @@ -76,7 +76,7 @@ def toggle_detect_os(self, src): dodetect = src.get_active() -@@ -1170,6 +1219,8 @@ class vmmCreate(vmmGObjectUI): +@@ -1185,6 +1234,8 @@ class vmmCreate(vmmGObjectUI): self.widget("install-os-version-entry").set_text("") self.mediaDetected = False self.detect_media_os() @@ -84,4 +84,4 @@ + self.detect_host_os() def _selected_os_row(self): - return uiutil.get_list_selection( + return uiutil.get_list_selected_row(self.widget("install-os-type")) ++++++ virtman-default-to-xen-pv.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,9 +1,9 @@ Enhancement to default to PV instead of HVM on Xen host. -Index: virt-manager-1.1.0/virtManager/create.py +Index: virt-manager-1.2.1/virtManager/create.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/create.py -+++ virt-manager-1.1.0/virtManager/create.py -@@ -860,7 +860,12 @@ class vmmCreate(vmmGObjectUI): +--- virt-manager-1.2.1.orig/virtManager/create.py ++++ virt-manager-1.2.1/virtManager/create.py +@@ -877,7 +877,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.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,11 +1,11 @@ Reference: bnc#885094 grub.xen is required to boot Xen PV VMs using BTRFS. It belongs to the grub2-x86_64-xen RPM and should never be deleted. -Index: virt-manager-1.2.0/virtManager/delete.py +Index: virt-manager-1.2.1/virtManager/delete.py =================================================================== ---- virt-manager-1.2.0.orig/virtManager/delete.py -+++ virt-manager-1.2.0/virtManager/delete.py -@@ -254,7 +254,7 @@ def populate_storage_list(storage_list, +--- virt-manager-1.2.1.orig/virtManager/delete.py ++++ virt-manager-1.2.1/virtManager/delete.py +@@ -253,7 +253,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.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,9 +1,9 @@ Enhancement to add the eepro100 NIC for KVM -Index: virt-manager-1.2.0/virtManager/addhardware.py +Index: virt-manager-1.2.1/virtManager/addhardware.py =================================================================== ---- virt-manager-1.2.0.orig/virtManager/addhardware.py -+++ virt-manager-1.2.0/virtManager/addhardware.py -@@ -582,6 +582,7 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-1.2.1.orig/virtManager/addhardware.py ++++ virt-manager-1.2.1/virtManager/addhardware.py +@@ -571,6 +571,7 @@ class vmmAddHardware(vmmGObjectUI): if vm.is_hvm(): mod_list = [] if vm.get_hv_type() in ["kvm", "qemu", "test"]: ++++++ virtman-increase-setKeepAlive-count.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -2,11 +2,11 @@ For very large memory VMs Xen takes a long time scrubbing memory which causes the libvirt connection to timeout. Upstream was not interested in making this a preferences option (4/11/2015) -Index: virt-manager-1.1.0/virtManager/connection.py +Index: virt-manager-1.2.1/virtManager/connection.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/connection.py -+++ virt-manager-1.1.0/virtManager/connection.py -@@ -903,7 +903,7 @@ class vmmConnection(vmmGObject): +--- virt-manager-1.2.1.orig/virtManager/connection.py ++++ virt-manager-1.2.1/virtManager/connection.py +@@ -904,7 +904,7 @@ class vmmConnection(vmmGObject): self.caps.get_cpu_values("x86_64") try: ++++++ virtman-prevent-double-click-starting-vm-twice.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -3,11 +3,11 @@ virt-manager issues two start commands to start the VM which results in a failure. There is code elsewhere to desensitize the button but this patch does it earlier. -Index: virt-manager-1.2.0/virtManager/details.py +Index: virt-manager-1.2.1/virtManager/details.py =================================================================== ---- virt-manager-1.2.0.orig/virtManager/details.py -+++ virt-manager-1.2.0/virtManager/details.py -@@ -1471,6 +1471,9 @@ class vmmDetails(vmmGObjectUI): +--- virt-manager-1.2.1.orig/virtManager/details.py ++++ virt-manager-1.2.1/virtManager/details.py +@@ -1465,6 +1465,9 @@ class vmmDetails(vmmGObjectUI): self.widget("details-menu-usb-redirection").set_sensitive(can_usb) def control_vm_run(self, src_ignore): ++++++ virtman-show-suse-install-repos.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -2,10 +2,10 @@ install.inf and also collects the repos provided by zypper. These locations are then presented as potential installation locations when createing a VM. -Index: virt-manager-1.1.0/virtManager/create.py +Index: virt-manager-1.2.0/virtManager/create.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/create.py -+++ virt-manager-1.1.0/virtManager/create.py +--- virt-manager-1.2.0.orig/virtManager/create.py ++++ virt-manager-1.2.0/virtManager/create.py @@ -359,7 +359,13 @@ class vmmCreate(vmmGObjectUI): self.widget("install-url-options").set_expanded(False) urlmodel = self.widget("install-url-box").get_model() @@ -21,15 +21,16 @@ self.populate_media_model(ksmodel, self.config.get_kickstart_urls()) self.set_distro_labels("-", "-", force=True) -Index: virt-manager-1.1.0/virtinst/util.py +Index: virt-manager-1.2.0/virtinst/util.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/util.py -+++ virt-manager-1.1.0/virtinst/util.py -@@ -23,11 +23,13 @@ import os +--- virt-manager-1.2.0.orig/virtinst/util.py ++++ virt-manager-1.2.0/virtinst/util.py +@@ -23,11 +23,14 @@ import os import random import re import stat -+import commands ++import subprocess ++from subprocess import Popen, PIPE import libvirt @@ -39,7 +40,7 @@ def listify(l): -@@ -462,3 +464,96 @@ def register_libvirt_error_handler(): +@@ -462,3 +465,97 @@ def register_libvirt_error_handler(): ignore = userdata ignore = err libvirt.registerErrorHandler(f=libvirt_callback, ctx=None) @@ -102,35 +103,36 @@ + if os.geteuid() != 0: + return (0, []) + dom0_inst_source = getHostInstallSource() -+ locations = commands.getoutput("/usr/bin/zypper lr -u | awk -F'|' '{ print $6 }'") -+ locations = locations[(locations.rfind('URI')):].split() -+ index = 0 ++ try: ++ if enabled_sources_only is True: ++ cmd = ['/usr/bin/zypper', 'lr', '-u', '-E'] ++ else: ++ cmd = ['/usr/bin/zypper', 'lr', '-u'] ++ p = subprocess.Popen(cmd, stdout=PIPE, stderr=PIPE) ++ stdout, stderr = p.communicate() ++ zypper_output = stdout ++ except: ++ if dom0_inst_source is None: ++ dom0_inst_source = [] ++ return (0, dom0_inst_source) ++ ++ zypper_list = zypper_output.split("\n") ++ zypper_header = [x.strip(' ') for x in zypper_list[0].split("|")] ++ uri_index = zypper_header.index("URI") ++ + index_dom0 = -1 + number_of_sources = 0 + zypper_output = [] -+ # If we only want to list enabled sources -+ if enabled_sources_only == True: -+ enabled = commands.getoutput("/usr/bin/zypper lr -u | awk -F'|' '{ print $4 }'") -+ enabled = enabled[(enabled.rfind('Enabled')):].split() -+ for e in enabled: -+ if e == "Yes": -+ str = locations[index] -+ if str.startswith('ftp://') or str.startswith('http://') or str.startswith('nfs://') or str.startswith('smb://'): -+ zypper_output.append(str) -+ if dom0_inst_source is not None and str == dom0_inst_source: -+ index_dom0 = number_of_sources -+ number_of_sources += 1 -+ index += 1 -+ else: -+ locations.sort() -+ for l in locations: -+ str = locations[index] ++ for repo in zypper_list: ++ repo = [x.strip(' ') for x in repo.split("|")] ++ if len(repo) >= uri_index: ++ str = repo[uri_index] + if str.startswith('ftp://') or str.startswith('http://') or str.startswith('nfs://') or str.startswith('smb://'): + zypper_output.append(str) + if dom0_inst_source is not None and str == dom0_inst_source: + index_dom0 = number_of_sources + number_of_sources += 1 -+ index += 1 ++ + if index_dom0 == -1 and dom0_inst_source: + index_dom0 = 0 + zypper_output.insert(0, dom0_inst_source) ++++++ virtman-supported-disk-formats.patch ++++++ --- /var/tmp/diff_new_pack.eza0hS/_old 2015-06-10 09:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eza0hS/_new 2015-06-10 09:16:40.000000000 +0200 @@ -1,11 +1,11 @@ Reference: bnc#885380 Xen no longer supports vmdk and never supported qed. See /usr/share/doc/packages/xen/misc/xl-disk-configuration.txt -Index: virt-manager-1.2.0/virtManager/addhardware.py +Index: virt-manager-1.2.1/virtManager/addhardware.py =================================================================== ---- virt-manager-1.2.0.orig/virtManager/addhardware.py -+++ virt-manager-1.2.0/virtManager/addhardware.py -@@ -762,11 +762,14 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-1.2.1.orig/virtManager/addhardware.py ++++ virt-manager-1.2.1/virtManager/addhardware.py +@@ -751,11 +751,14 @@ class vmmAddHardware(vmmGObjectUI): combo.set_model(model) uiutil.init_combo_text_column(combo, 0)
