diff --git a/virt-manager-0.9.4.tar.bz2 b/virt-manager-0.9.4.tar.bz2 deleted file mode 100644 index b68d8543..00000000 --- a/virt-manager-0.9.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7e447ed8468d0850b75889d2c71149a3f462c381e7af39cd493e0aa3023983f -size 941625 diff --git a/virt-manager-0.9.5.tar.bz2 b/virt-manager-0.9.5.tar.bz2 new file mode 100644 index 00000000..f995f5b0 --- /dev/null +++ b/virt-manager-0.9.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ae21808c63c61cb0b9be85c6de2114a54c9d9f9f3e1ae4cfc2ee743bf760cb5 +size 993576 diff --git a/virt-manager.changes b/virt-manager.changes index b37b2784..82841ebc 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Apr 2 15:04:34 MDT 2013 - carnold@suse.com + +- Update to virt-manager 0.9.5 + * Enable adding virtio-scsi disks (Chen Hanxiao) + * Support security auto-relabel setting (Martin Kletzander) + * Support disk iotune settings (David Shane Holden) + * Support 'reset' as a reboot option (John Doyle) + * Bug fixes and minor improvements + ------------------------------------------------------------------- Mon Feb 11 10:50:37 MST 2013 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 98ad19dd..bad3f5a0 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -20,7 +20,7 @@ %define gconftool /usr/bin/gconftool-2 %define virtinst_maj 0 %define virtinst_min 600 -%define virtinst_rel 3 +%define virtinst_rel 4 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} %define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") @@ -29,12 +29,10 @@ Name: virt-manager Summary: Virtual Machine Manager License: GPL-2.0+ Group: System/Monitoring -Version: 0.9.4 +Version: 0.9.5 Release: 0 Url: http://virt-manager.et.redhat.com Source0: virt-manager-%{version}.tar.bz2 -Patch0: virtman-git-scsi.diff -Patch1: virtman-git-scsi-lun.diff Patch50: virtman-desktop.diff Patch51: virtman-vminstall.diff Patch52: virtman-cdrom.diff @@ -50,7 +48,6 @@ Patch65: virtman-update-backend.diff Patch66: virtman-slow-mouse.diff Patch67: virtman-virtinstall.diff Patch68: virtman-reverse-serialcon.patch -Patch69: virtman-kvm-packages.diff ExclusiveArch: %{ix86} x86_64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -102,8 +99,6 @@ Authors: %prep %setup -q -%patch0 -p1 -%patch1 -p1 %patch50 -p1 %patch51 -p1 %patch52 -p1 @@ -119,7 +114,6 @@ Authors: %patch66 -p1 %patch67 -p1 %patch68 -p1 -%patch69 -p1 %build # autoreconf -i diff --git a/virtman-autoconnect.diff b/virtman-autoconnect.diff index 7818da14..21bb7ca5 100644 --- a/virtman-autoconnect.diff +++ b/virtman-autoconnect.diff @@ -1,8 +1,8 @@ -Index: virt-manager-0.9.3/src/virtManager/engine.py +Index: virt-manager-0.9.5/src/virtManager/engine.py =================================================================== ---- virt-manager-0.9.3.orig/src/virtManager/engine.py -+++ virt-manager-0.9.3/src/virtManager/engine.py -@@ -214,7 +214,7 @@ class vmmEngine(vmmGObject): +--- virt-manager-0.9.5.orig/src/virtManager/engine.py ++++ virt-manager-0.9.5/src/virtManager/engine.py +@@ -218,7 +218,7 @@ class vmmEngine(vmmGObject): conn = self.add_conn(uri) if autoconnect is not None: diff --git a/virtman-autorestart.diff b/virtman-autorestart.diff index 96268f1a..fad40827 100644 --- a/virtman-autorestart.diff +++ b/virtman-autorestart.diff @@ -1,8 +1,8 @@ -Index: virt-manager-0.9.3/src/virtManager/details.py +Index: virt-manager-0.9.5/src/virtManager/details.py =================================================================== ---- virt-manager-0.9.3.orig/src/virtManager/details.py -+++ virt-manager-0.9.3/src/virtManager/details.py -@@ -2129,11 +2129,9 @@ class vmmDetails(vmmGObjectUI): +--- virt-manager-0.9.5.orig/src/virtManager/details.py ++++ virt-manager-0.9.5/src/virtManager/details.py +@@ -2195,11 +2195,9 @@ class vmmDetails(vmmGObjectUI): return self._change_config_helper(df, da, hf, ha) @@ -17,7 +17,7 @@ Index: virt-manager-0.9.3/src/virtManager/details.py if self.editted(EDIT_AUTOSTART): auto = self.widget("config-autostart") try: -@@ -2143,6 +2141,11 @@ class vmmDetails(vmmGObjectUI): +@@ -2209,6 +2207,11 @@ class vmmDetails(vmmGObjectUI): (_("Error changing autostart value: %s") % str(e))) return False @@ -29,7 +29,7 @@ Index: virt-manager-0.9.3/src/virtManager/details.py if self.editted(EDIT_BOOTORDER): bootdevs = self.get_config_boot_devs() add_define(self.vm.set_boot_device, bootdevs) -@@ -2499,6 +2502,8 @@ class vmmDetails(vmmGObjectUI): +@@ -2580,6 +2583,8 @@ class vmmDetails(vmmGObjectUI): buttons=gtk.BUTTONS_OK, dialog_type=dtype) diff --git a/virtman-cdrom.diff b/virtman-cdrom.diff index b22201f4..aa466650 100644 --- a/virtman-cdrom.diff +++ b/virtman-cdrom.diff @@ -1,12 +1,13 @@ -Index: virt-manager-0.9.4/src/virtManager/addhardware.py +Index: virt-manager-0.9.5/src/virtManager/addhardware.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/addhardware.py -+++ virt-manager-0.9.4/src/virtManager/addhardware.py -@@ -547,6 +547,7 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-0.9.5.orig/src/virtManager/addhardware.py ++++ virt-manager-0.9.5/src/virtManager/addhardware.py +@@ -551,6 +551,8 @@ class vmmAddHardware(vmmGObjectUI): add_dev("virtio-scsi", virtinst.VirtualDisk.DEVICE_LUN, _("Virtio SCSI lun")) - if self.conn.is_xen(): -+ add_dev("xen", virtinst.VirtualDisk.DEVICE_CDROM, "Virtual disk (read only)") - add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, "Virtual disk") + if self.conn.is_xen() or self.conn.is_test_conn(): ++ add_dev("xen", virtinst.VirtualDisk.DEVICE_CDROM, ++ _("Xen Virtual disk (read only)")) + add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, + _("Xen virtual disk")) - def populate_input_model(self, model): diff --git a/virtman-desktop.diff b/virtman-desktop.diff index 0d2e09ca..6f195e49 100644 --- a/virtman-desktop.diff +++ b/virtman-desktop.diff @@ -1,7 +1,7 @@ -Index: virt-manager-0.9.3/src/Makefile.am +Index: virt-manager-0.9.5/src/Makefile.am =================================================================== ---- virt-manager-0.9.3.orig/src/Makefile.am -+++ virt-manager-0.9.3/src/Makefile.am +--- virt-manager-0.9.5.orig/src/Makefile.am ++++ virt-manager-0.9.5/src/Makefile.am @@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.ui) @@ -11,11 +11,11 @@ Index: virt-manager-0.9.3/src/Makefile.am desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop -Index: virt-manager-0.9.3/src/Makefile.in +Index: virt-manager-0.9.5/src/Makefile.in =================================================================== ---- virt-manager-0.9.3.orig/src/Makefile.in -+++ virt-manager-0.9.3/src/Makefile.in -@@ -266,7 +266,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in +--- virt-manager-0.9.5.orig/src/Makefile.in ++++ virt-manager-0.9.5/src/Makefile.in +@@ -288,7 +288,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.ui) @@ -24,10 +24,10 @@ Index: virt-manager-0.9.3/src/Makefile.in desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop dbusdir = $(datadir)/dbus-1/services -Index: virt-manager-0.9.3/src/virt-manager.desktop.in.in +Index: virt-manager-0.9.5/src/virt-manager.desktop.in.in =================================================================== ---- virt-manager-0.9.3.orig/src/virt-manager.desktop.in.in -+++ virt-manager-0.9.3/src/virt-manager.desktop.in.in +--- virt-manager-0.9.5.orig/src/virt-manager.desktop.in.in ++++ virt-manager-0.9.5/src/virt-manager.desktop.in.in @@ -1,8 +1,19 @@ [Desktop Entry] _Name=Virtual Machine Manager diff --git a/virtman-device-flags.diff b/virtman-device-flags.diff index 9eaae31f..7c6adab8 100644 --- a/virtman-device-flags.diff +++ b/virtman-device-flags.diff @@ -1,8 +1,8 @@ -Index: virt-manager-0.9.4/src/virtManager/addhardware.py +Index: virt-manager-0.9.5/src/virtManager/addhardware.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/addhardware.py -+++ virt-manager-0.9.4/src/virtManager/addhardware.py -@@ -1163,6 +1163,19 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-0.9.5.orig/src/virtManager/addhardware.py ++++ virt-manager-0.9.5/src/virtManager/addhardware.py +@@ -1167,6 +1167,19 @@ class vmmAddHardware(vmmGObjectUI): if controller is not None: logging.debug("Adding controller:\n%s", self._dev.vmm_controller.get_xml_config()) @@ -22,11 +22,11 @@ Index: virt-manager-0.9.4/src/virtManager/addhardware.py # Hotplug device attach_err = False try: -Index: virt-manager-0.9.4/src/virtManager/details.py +Index: virt-manager-0.9.5/src/virtManager/details.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/details.py -+++ virt-manager-0.9.4/src/virtManager/details.py -@@ -2385,6 +2385,17 @@ class vmmDetails(vmmGObjectUI): +--- virt-manager-0.9.5.orig/src/virtManager/details.py ++++ virt-manager-0.9.5/src/virtManager/details.py +@@ -2466,6 +2466,17 @@ class vmmDetails(vmmGObjectUI): text1=(_("Are you sure you want to remove this device?"))): return @@ -44,11 +44,11 @@ Index: virt-manager-0.9.4/src/virtManager/details.py # Define the change try: self.vm.remove_device(dev_id_info) -Index: virt-manager-0.9.4/src/virtManager/domain.py +Index: virt-manager-0.9.5/src/virtManager/domain.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/domain.py -+++ virt-manager-0.9.4/src/virtManager/domain.py -@@ -757,6 +757,10 @@ class vmmDomain(vmmLibvirtObject): +--- virt-manager-0.9.5.orig/src/virtManager/domain.py ++++ virt-manager-0.9.5/src/virtManager/domain.py +@@ -797,6 +797,10 @@ class vmmDomain(vmmLibvirtObject): devxml = devobj.get_xml_config() self._backend.attachDevice(devxml) @@ -59,7 +59,7 @@ Index: virt-manager-0.9.4/src/virtManager/domain.py def detach_device(self, devobj): """ Hotunplug device from running guest -@@ -775,6 +779,10 @@ class vmmDomain(vmmLibvirtObject): +@@ -815,6 +819,10 @@ class vmmDomain(vmmLibvirtObject): xml = devobj.get_xml_config() self._backend.updateDeviceFlags(xml, flags) diff --git a/virtman-eepro100.diff b/virtman-eepro100.diff index 486d8120..80438b72 100644 --- a/virtman-eepro100.diff +++ b/virtman-eepro100.diff @@ -1,8 +1,8 @@ -Index: virt-manager-0.9.3/src/virtManager/uihelpers.py +Index: virt-manager-0.9.5/src/virtManager/uihelpers.py =================================================================== ---- virt-manager-0.9.3.orig/src/virtManager/uihelpers.py -+++ virt-manager-0.9.3/src/virtManager/uihelpers.py -@@ -309,6 +309,7 @@ def populate_netmodel_combo(vm, combo): +--- virt-manager-0.9.5.orig/src/virtManager/uihelpers.py ++++ virt-manager-0.9.5/src/virtManager/uihelpers.py +@@ -311,6 +311,7 @@ def populate_netmodel_combo(vm, combo): if vm.is_hvm(): mod_list = ["rtl8139", "ne2k_pci", "pcnet", "e1000"] if vm.get_hv_type() in ["kvm", "qemu", "test"]: diff --git a/virtman-git-scsi-lun.diff b/virtman-git-scsi-lun.diff deleted file mode 100644 index 83e6c772..00000000 --- a/virtman-git-scsi-lun.diff +++ /dev/null @@ -1,33 +0,0 @@ - -Subject: Add virtio lun and virtio-scsi lun disk bus option -From: Chen Hanxiao chenhanxiao@cn.fujitsu.com Tue Dec 11 17:06:38 2012 +0800 -Date: Fri Dec 14 19:21:35 2012 -0500: -Git: 8b22d7a763acab05558f36818b8f890c4b428c1d - - As a result of CVE-2011-4127, libvirt disabled generic SCSI - commands passed through to the underlying disk by qemu - from a guest to a virtio disk when device type is "disk" - afer commit 177db087757e4adb02c211de56336a5991c8eb20. - And libvirt introduce a new device type "lun" - to allow SG_IO commands passing through. - This patch allows VM admin to configure this via virt-manager. - -Signed-off-by: Chen Hanxiao - -Index: virt-manager-0.9.4/src/virtManager/addhardware.py -=================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/addhardware.py -+++ virt-manager-0.9.4/src/virtManager/addhardware.py -@@ -540,8 +540,12 @@ class vmmAddHardware(vmmGObjectUI): - if self.vm.get_hv_type() == "kvm": - add_dev("sata", virtinst.VirtualDisk.DEVICE_DISK, "SATA disk") - add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio disk") -+ add_dev("virtio", virtinst.VirtualDisk.DEVICE_LUN, -+ _("Virtio lun")) - add_dev("virtio-scsi", virtinst.VirtualDisk.DEVICE_DISK, - _("Virtio SCSI disk")) -+ add_dev("virtio-scsi", virtinst.VirtualDisk.DEVICE_LUN, -+ _("Virtio SCSI lun")) - if self.conn.is_xen(): - add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, "Virtual disk") - diff --git a/virtman-git-scsi.diff b/virtman-git-scsi.diff deleted file mode 100644 index d0ae536b..00000000 --- a/virtman-git-scsi.diff +++ /dev/null @@ -1,103 +0,0 @@ - -Subject: Add virtio-scsi disk bus option -From: ChenHanxiao chenhanxiao@cn.fujitsu.com Fri Dec 7 18:21:38 2012 +0800 -Date: Sun Dec 9 14:28:42 2012 -0500: -Git: ad1b24e885670d36b4ffd3a96434fd19dbe2ce98 - -This patch will add virtio-scsi bus option on "Add New Virtual -Hardware" GUI page. It will support users to add a virtual disk -using SCSI bus with a controller model virtio-scsi. -If there is no SCSI controller existed, a new SCSI controller by -model 'virtio-scsi' will be added automatically. - -Signed-off-by: ChenHanxiao - -(crobinso: add Chen to AUTHORS, some cosmetic tweaks) - -Index: virt-manager-0.9.4/AUTHORS -=================================================================== ---- virt-manager-0.9.4.orig/AUTHORS -+++ virt-manager-0.9.4/AUTHORS -@@ -81,6 +81,7 @@ Further patches have been submitted by: - Nathan Bird - Guannan Ren - Eduardo Elias Ferreira -+ ChenHanxiao - - <...send a patch & get your name here...> - -Index: virt-manager-0.9.4/src/virtManager/addhardware.py -=================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/addhardware.py -+++ virt-manager-0.9.4/src/virtManager/addhardware.py -@@ -28,6 +28,7 @@ from virtinst import (VirtualCharDevice, - VirtualVideoDevice, VirtualWatchdog, - VirtualFilesystem, VirtualSmartCardDevice, - VirtualRedirDevice) -+from virtinst.VirtualController import VirtualControllerSCSI - - import virtManager.util as util - import virtManager.uihelpers as uihelpers -@@ -539,6 +540,8 @@ class vmmAddHardware(vmmGObjectUI): - if self.vm.get_hv_type() == "kvm": - add_dev("sata", virtinst.VirtualDisk.DEVICE_DISK, "SATA disk") - add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio disk") -+ add_dev("virtio-scsi", virtinst.VirtualDisk.DEVICE_DISK, -+ _("Virtio SCSI disk")) - if self.conn.is_xen(): - add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, "Virtual disk") - -@@ -1151,9 +1154,15 @@ class vmmAddHardware(vmmGObjectUI): - self._dev.get_xml_config() - logging.debug("Adding device:\n" + self._dev.get_xml_config()) - -+ controller = getattr(self._dev, "vmm_controller", None) -+ if controller is not None: -+ logging.debug("Adding controller:\n%s", -+ self._dev.vmm_controller.get_xml_config()) - # Hotplug device - attach_err = False - try: -+ if controller is not None: -+ self.vm.attach_device(self._dev.vmm_controller) - self.vm.attach_device(self._dev) - except Exception, e: - logging.debug("Device could not be hotplugged: %s", str(e)) -@@ -1176,6 +1185,8 @@ class vmmAddHardware(vmmGObjectUI): - - # Alter persistent config - try: -+ if controller is not None: -+ self.vm.add_device(self._dev.vmm_controller) - self.vm.add_device(self._dev) - except Exception, e: - self.err.show_err(_("Error adding device: %s" % str(e))) -@@ -1221,6 +1232,10 @@ class vmmAddHardware(vmmGObjectUI): - bus, device = self.get_config_disk_target() - cache = self.get_config_disk_cache() - fmt = self.get_config_disk_format() -+ controller_model = None -+ if bus == "virtio-scsi": -+ bus = "scsi" -+ controller_model = "virtio-scsi" - - # Make sure default pool is running - if self.is_default_storage(): -@@ -1315,6 +1330,17 @@ class vmmAddHardware(vmmGObjectUI): - uihelpers.check_path_search_for_qemu(self.topwin, - self.conn, disk.path) - -+ # Add a SCSI controller with model virtio-scsi if needed -+ disk.vmm_controller = None -+ if (controller_model == "virtio-scsi") and (bus == "scsi"): -+ controllers = self.vm.get_controller_devices() -+ controller = VirtualControllerSCSI(conn = self.conn.vmm) -+ controller.set_model(controller_model) -+ disk.vmm_controller = controller -+ for d in controllers: -+ if controller_model == d.model: -+ disk.vmm_controller = None -+ - self._dev = disk - return True - diff --git a/virtman-keycombo.diff b/virtman-keycombo.diff index c285b478..5485e0d8 100644 --- a/virtman-keycombo.diff +++ b/virtman-keycombo.diff @@ -1,8 +1,8 @@ -Index: virt-manager-0.9.3/src/virtManager/uihelpers.py +Index: virt-manager-0.9.5/src/virtManager/uihelpers.py =================================================================== ---- virt-manager-0.9.3.orig/src/virtManager/uihelpers.py -+++ virt-manager-0.9.3/src/virtManager/uihelpers.py -@@ -963,6 +963,16 @@ def build_keycombo_menu(cb): +--- virt-manager-0.9.5.orig/src/virtManager/uihelpers.py ++++ virt-manager-0.9.5/src/virtManager/uihelpers.py +@@ -972,6 +972,16 @@ def build_keycombo_menu(cb): make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"]) make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"]) menu.add(gtk.SeparatorMenuItem()) diff --git a/virtman-kvm-packages.diff b/virtman-kvm-packages.diff deleted file mode 100644 index 8f8ac3fe..00000000 --- a/virtman-kvm-packages.diff +++ /dev/null @@ -1,31 +0,0 @@ -bnc#780660 -Make process fails to substitute "" for ::HV_PACKAGES:: in virt-manager.py when -being built from virt-manager.py.in. Translate HV_ to KVM_ (just like all -the other macros) - -Index: virt-manager-0.9.4/src/Makefile.am -=================================================================== ---- virt-manager-0.9.4.orig/src/Makefile.am -+++ virt-manager-0.9.4/src/Makefile.am -@@ -65,7 +65,7 @@ endif - -e "s,::DEFAULT_QEMU_USER::,$(DEFAULT_QEMU_USER)," \ - -e "s,::ENABLE_UNSUPPORTED_RHEL_OPTS::,$(ENABLE_UNSUPPORTED_RHEL_OPTS)," \ - -e "s|::PREFERRED_DISTROS::|$(PREFERRED_DISTROS)|" \ -- -e "s|::HV_PACKAGES::|$(KVM_PACKAGES)|" \ -+ -e "s|::KVM_PACKAGES::|$(KVM_PACKAGES)|" \ - -e "s|::ASKPASS_PACKAGE::|$(ASKPASS_PACKAGE)|" \ - -e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \ - < $< > $@ -Index: virt-manager-0.9.4/src/Makefile.in -=================================================================== ---- virt-manager-0.9.4.orig/src/Makefile.in -+++ virt-manager-0.9.4/src/Makefile.in -@@ -814,7 +814,7 @@ uninstall-am: uninstall-binSCRIPTS unins - -e "s,::DEFAULT_QEMU_USER::,$(DEFAULT_QEMU_USER)," \ - -e "s,::ENABLE_UNSUPPORTED_RHEL_OPTS::,$(ENABLE_UNSUPPORTED_RHEL_OPTS)," \ - -e "s|::PREFERRED_DISTROS::|$(PREFERRED_DISTROS)|" \ -- -e "s|::HV_PACKAGES::|$(KVM_PACKAGES)|" \ -+ -e "s|::KVM_PACKAGES::|$(KVM_PACKAGES)|" \ - -e "s|::ASKPASS_PACKAGE::|$(ASKPASS_PACKAGE)|" \ - -e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \ - < $< > $@ diff --git a/virtman-kvm.diff b/virtman-kvm.diff index 62395b57..bd0e3650 100644 --- a/virtman-kvm.diff +++ b/virtman-kvm.diff @@ -1,8 +1,8 @@ -Index: virt-manager-0.9.3/src/virtManager/engine.py +Index: virt-manager-0.9.5/src/virtManager/engine.py =================================================================== ---- virt-manager-0.9.3.orig/src/virtManager/engine.py -+++ virt-manager-0.9.3/src/virtManager/engine.py -@@ -57,6 +57,7 @@ def default_uri(): +--- virt-manager-0.9.5.orig/src/virtManager/engine.py ++++ virt-manager-0.9.5/src/virtManager/engine.py +@@ -58,6 +58,7 @@ def default_uri(): os.path.exists("/usr/bin/qemu") or os.path.exists("/usr/bin/qemu-kvm") or os.path.exists("/usr/bin/kvm") or diff --git a/virtman-qed.diff b/virtman-qed.diff index 09201428..df82fc39 100644 --- a/virtman-qed.diff +++ b/virtman-qed.diff @@ -1,8 +1,8 @@ -Index: virt-manager-0.9.3/src/virtManager/uihelpers.py +Index: virt-manager-0.9.5/src/virtManager/uihelpers.py =================================================================== ---- virt-manager-0.9.3.orig/src/virtManager/uihelpers.py -+++ virt-manager-0.9.3/src/virtManager/uihelpers.py -@@ -398,13 +398,12 @@ def build_storage_format_combo(vm, combo +--- virt-manager-0.9.5.orig/src/virtManager/uihelpers.py ++++ virt-manager-0.9.5/src/virtManager/uihelpers.py +@@ -400,13 +400,12 @@ def build_storage_format_combo(vm, combo combo.set_model(dev_model) combo.set_text_column(0) diff --git a/virtman-reverse-serialcon.patch b/virtman-reverse-serialcon.patch index 933c07fb..f30c8952 100644 --- a/virtman-reverse-serialcon.patch +++ b/virtman-reverse-serialcon.patch @@ -2,10 +2,10 @@ Reverses upstream patch: serialcon: Don't open a console with name=None Git: ce94126b707f157d88de113a8c591e628d55db63 bnc#780859 -Index: virt-manager-0.9.4/src/virtManager/serialcon.py +Index: virt-manager-0.9.5/src/virtManager/serialcon.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/serialcon.py -+++ virt-manager-0.9.4/src/virtManager/serialcon.py +--- virt-manager-0.9.5.orig/src/virtManager/serialcon.py ++++ virt-manager-0.9.5/src/virtManager/serialcon.py @@ -191,8 +191,9 @@ class LibvirtConsoleConnection(ConsoleCo name = dev and dev.alias.name or None logging.debug("Opening console stream for dev=%s alias=%s", diff --git a/virtman-slow-mouse.diff b/virtman-slow-mouse.diff index 27a20625..e71062f6 100644 --- a/virtman-slow-mouse.diff +++ b/virtman-slow-mouse.diff @@ -6,11 +6,11 @@ From: Cole Robinson crobinso@redhat.com Mon Sep 26 11:05:55 2011 -0400 Date: Mon Sep 26 11:07:52 2011 -0400: Git: 0a7640c593a54a6a3f558583d82f8b27c7a7d1d1 -Index: virt-manager-0.9.3/src/virtManager/manager.py +Index: virt-manager-0.9.5/src/virtManager/manager.py =================================================================== ---- virt-manager-0.9.3.orig/src/virtManager/manager.py -+++ virt-manager-0.9.3/src/virtManager/manager.py -@@ -777,7 +777,7 @@ class vmmManager(vmmGObjectUI): +--- virt-manager-0.9.5.orig/src/virtManager/manager.py ++++ virt-manager-0.9.5/src/virtManager/manager.py +@@ -787,7 +787,7 @@ class vmmManager(vmmGObjectUI): row.insert(ROW_STATUS, vm.run_status()) row.insert(ROW_STATUS_ICON, vm.run_status_icon_name()) row.insert(ROW_KEY, vm.get_uuid()) @@ -19,7 +19,7 @@ Index: virt-manager-0.9.3/src/virtManager/manager.py row.insert(ROW_IS_CONN, False) row.insert(ROW_IS_CONN_CONNECTED, True) row.insert(ROW_IS_VM, True) -@@ -921,7 +921,7 @@ class vmmManager(vmmGObjectUI): +@@ -931,7 +931,7 @@ class vmmManager(vmmGObjectUI): row[ROW_MARKUP] = self._build_vm_markup(row) if config_changed: diff --git a/virtman-update-backend.diff b/virtman-update-backend.diff index ea4df464..07149e05 100644 --- a/virtman-update-backend.diff +++ b/virtman-update-backend.diff @@ -1,8 +1,8 @@ -Index: virt-manager-0.9.3/src/virtManager/domain.py +Index: virt-manager-0.9.5/src/virtManager/domain.py =================================================================== ---- virt-manager-0.9.3.orig/src/virtManager/domain.py -+++ virt-manager-0.9.3/src/virtManager/domain.py -@@ -1584,7 +1584,14 @@ class vmmDomain(vmmLibvirtObject): +--- virt-manager-0.9.5.orig/src/virtManager/domain.py ++++ virt-manager-0.9.5/src/virtManager/domain.py +@@ -1669,7 +1669,14 @@ class vmmDomain(vmmLibvirtObject): # Invalidate cached values self._invalidate_xml() diff --git a/virtman-virtinstall.diff b/virtman-virtinstall.diff index d15e6345..7b2d822a 100644 --- a/virtman-virtinstall.diff +++ b/virtman-virtinstall.diff @@ -1,7 +1,7 @@ -Index: virt-manager-0.9.4/src/vmm-manager.ui +Index: virt-manager-0.9.5/src/vmm-manager.ui =================================================================== ---- virt-manager-0.9.4.orig/src/vmm-manager.ui -+++ virt-manager-0.9.4/src/vmm-manager.ui +--- virt-manager-0.9.5.orig/src/vmm-manager.ui ++++ virt-manager-0.9.5/src/vmm-manager.ui @@ -293,7 +293,7 @@ False False @@ -19,10 +19,10 @@ Index: virt-manager-0.9.4/src/vmm-manager.ui -Index: virt-manager-0.9.4/src/virtManager/manager.py +Index: virt-manager-0.9.5/src/virtManager/manager.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/manager.py -+++ virt-manager-0.9.4/src/virtManager/manager.py +--- virt-manager-0.9.5.orig/src/virtManager/manager.py ++++ virt-manager-0.9.5/src/virtManager/manager.py @@ -260,7 +260,8 @@ class vmmManager(vmmGObjectUI): self.config.is_vmlist_network_traffic_visible()) @@ -33,7 +33,7 @@ Index: virt-manager-0.9.4/src/virtManager/manager.py self.widget("vm-open").set_icon_name("icon_console") uihelpers.build_shutdown_button_menu(self.widget("vm-shutdown"), self.poweroff_vm, -@@ -506,6 +507,9 @@ class vmmManager(vmmGObjectUI): +@@ -510,6 +511,9 @@ class vmmManager(vmmGObjectUI): def new_vm(self, src_ignore=None): self.emit("action-show-create", self.current_conn_uri()) @@ -43,7 +43,7 @@ Index: virt-manager-0.9.4/src/virtManager/manager.py def show_about(self, src_ignore): self.emit("action-show-about") -@@ -1228,6 +1232,7 @@ vmmManager.signal_new(vmmManager, "actio +@@ -1238,6 +1242,7 @@ vmmManager.signal_new(vmmManager, "actio vmmManager.signal_new(vmmManager, "action-show-host", [str]) vmmManager.signal_new(vmmManager, "action-show-preferences", []) vmmManager.signal_new(vmmManager, "action-show-create", [str]) @@ -51,11 +51,11 @@ Index: virt-manager-0.9.4/src/virtManager/manager.py vmmManager.signal_new(vmmManager, "action-suspend-domain", [str, str]) vmmManager.signal_new(vmmManager, "action-resume-domain", [str, str]) vmmManager.signal_new(vmmManager, "action-run-domain", [str, str]) -Index: virt-manager-0.9.4/src/virtManager/uihelpers.py +Index: virt-manager-0.9.5/src/virtManager/uihelpers.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/uihelpers.py -+++ virt-manager-0.9.4/src/virtManager/uihelpers.py -@@ -835,6 +835,24 @@ def mediadev_set_default_selection(widge +--- virt-manager-0.9.5.orig/src/virtManager/uihelpers.py ++++ virt-manager-0.9.5/src/virtManager/uihelpers.py +@@ -837,6 +837,24 @@ def mediadev_set_default_selection(widge #################################################################### @@ -80,11 +80,11 @@ Index: virt-manager-0.9.4/src/virtManager/uihelpers.py # Build toolbar shutdown button menu (manager and details toolbar) # #################################################################### -Index: virt-manager-0.9.4/src/virtManager/config.py +Index: virt-manager-0.9.5/src/virtManager/config.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/config.py -+++ virt-manager-0.9.4/src/virtManager/config.py -@@ -149,6 +149,13 @@ class vmmConfig(object): +--- virt-manager-0.9.5.orig/src/virtManager/config.py ++++ virt-manager-0.9.5/src/virtManager/config.py +@@ -150,6 +150,13 @@ class vmmConfig(object): # General app wide helpers (gconf agnostic) @@ -98,11 +98,11 @@ Index: virt-manager-0.9.4/src/virtManager/config.py def get_shutdown_icon_name(self): theme = gtk.icon_theme_get_default() iconname = "system-shutdown" -Index: virt-manager-0.9.4/src/virtManager/engine.py +Index: virt-manager-0.9.5/src/virtManager/engine.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/engine.py -+++ virt-manager-0.9.4/src/virtManager/engine.py -@@ -628,6 +628,7 @@ class vmmEngine(vmmGObject): +--- virt-manager-0.9.5.orig/src/virtManager/engine.py ++++ virt-manager-0.9.5/src/virtManager/engine.py +@@ -634,6 +634,7 @@ class vmmEngine(vmmGObject): obj.connect("action-show-vm", self._do_show_vm) obj.connect("action-show-preferences", self._do_show_preferences) obj.connect("action-show-create", self._do_show_create) @@ -110,7 +110,7 @@ Index: virt-manager-0.9.4/src/virtManager/engine.py obj.connect("action-show-help", self._do_show_help) obj.connect("action-show-about", self._do_show_about) obj.connect("action-show-host", self._do_show_host) -@@ -674,14 +675,17 @@ class vmmEngine(vmmGObject): +@@ -680,14 +681,17 @@ class vmmEngine(vmmGObject): def _vmmcreate_closing(self,signal,key): self.windowCreate = None diff --git a/virtman-vminstall.diff b/virtman-vminstall.diff index e1b7c4a3..0fda2553 100644 --- a/virtman-vminstall.diff +++ b/virtman-vminstall.diff @@ -1,7 +1,7 @@ -Index: virt-manager-0.9.4/src/virtManager/engine.py +Index: virt-manager-0.9.5/src/virtManager/engine.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/engine.py -+++ virt-manager-0.9.4/src/virtManager/engine.py +--- virt-manager-0.9.5.orig/src/virtManager/engine.py ++++ virt-manager-0.9.5/src/virtManager/engine.py @@ -24,6 +24,7 @@ import gtk import logging import threading @@ -18,7 +18,7 @@ Index: virt-manager-0.9.4/src/virtManager/engine.py from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog from virtManager.systray import vmmSystray -@@ -671,11 +671,47 @@ class vmmEngine(vmmGObject): +@@ -676,11 +676,47 @@ class vmmEngine(vmmGObject): self.windowCreate = obj return self.windowCreate @@ -70,10 +70,10 @@ Index: virt-manager-0.9.4/src/virtManager/engine.py def _do_show_migrate(self, src, uri, uuid): try: -Index: virt-manager-0.9.4/src/virtManager/create.py +Index: virt-manager-0.9.5/src/virtManager/create.py =================================================================== ---- virt-manager-0.9.4.orig/src/virtManager/create.py -+++ virt-manager-0.9.4/src/virtManager/create.py +--- virt-manager-0.9.5.orig/src/virtManager/create.py ++++ virt-manager-0.9.5/src/virtManager/create.py @@ -176,6 +176,7 @@ class vmmCreate(vmmGObjectUI): def close(self, ignore1=None, ignore2=None): @@ -82,7 +82,7 @@ Index: virt-manager-0.9.4/src/virtManager/create.py self.topwin.hide() self.remove_timers() -@@ -2152,3 +2153,4 @@ class vmmCreate(vmmGObjectUI): +@@ -2158,3 +2159,4 @@ class vmmCreate(vmmGObjectUI): vmmGObjectUI.type_register(vmmCreate) vmmCreate.signal_new(vmmCreate, "action-show-vm", [str, str]) vmmCreate.signal_new(vmmCreate, "action-show-help", [str])