pool/virt-manager
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Update to virt-manager 0.9.1

Browse Source 
* Support for adding usb redirection devices (Marc-André Lureau)
  * Option to switch usb controller to support usb2.0 (Marc-André Lureau)
  * Option to specify machine type for non-x86 guests (Li Zhang)
  * Support for filesystem device type and write policy (Deepak C Shetty)
  * Many bug fixes!
- Update to virtinst 0.600.1
  * virt-install: --redir option for usb redirection (Marc-André Lureau)
  * virt-install: Advanced --controller support for usb2 (Marc-André Lureau)
  * Many bug fixes and minor improvments.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=86
This commit is contained in:
Charles Arnold 2012-02-03 15:47:45 +00:00 committed by Git OBS Bridge
parent 560ed2b083
commit d9d300204b
23 changed files with 115 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
virt-manager-0.9.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:556023015ba2fd0194760af2ac0d7d418b58d32c624b622f9ad0343271840cd9
size 1131336

3
virt-manager-0.9.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d740bb8307be8fe8b466a4a690bf38f901ba7ca0cd164608469c49c668480d4
size 1131634

14
virt-manager.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Feb 3 05:49:34 MST 2012 - carnold@novell.com
- Update to virt-manager 0.9.1
* Support for adding usb redirection devices (Marc-André Lureau)
* Option to switch usb controller to support usb2.0 (Marc-André Lureau)
* Option to specify machine type for non-x86 guests (Li Zhang)
* Support for filesystem device type and write policy (Deepak C Shetty)
* Many bug fixes!
- Update to virtinst 0.600.1
* virt-install: --redir option for usb redirection (Marc-André Lureau)
* virt-install: Advanced --controller support for usb2 (Marc-André Lureau)
* Many bug fixes and minor improvments.
-------------------------------------------------------------------
Thu Jan 5 14:51:48 MST 2012 - carnold@novell.com

12
virt-manager.spec
View File

@ -20,7 +20,7 @@
%define gconftool /usr/bin/gconftool-2
%define virtinst_maj 0
%define virtinst_min 600
%define virtinst_rel 0
%define virtinst_rel 1
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
@ -29,15 +29,13 @@ Name: virt-manager
Summary: Virtual Machine Manager
License: GPL-2.0+
Group: System/Monitoring
Version: 0.9.0
Version: 0.9.1
Release: 0
Url: http://virt-manager.et.redhat.com
Source0: virt-manager-%{version}.tar.bz2
Source1: %{virtinst_name}.tar.bz2
# see https://bugzilla.redhat.com/show_bug.cgi?id=620216,
# https://bugzilla.novell.com/show_bug.cgi?id=641981
Patch0: virtman-git-reconnect.diff
Patch1: virtman-git-sata-support.diff
Patch50: virtman-desktop.diff
Patch51: virtman-vminstall.diff
Patch52: virtman-cdrom.diff
@ -52,7 +50,6 @@ Patch63: virtman-eepro100.diff
Patch64: virtman-qed.diff
Patch65: virtman-update-backend.diff
Patch66: virtman-reverse-git-tooltip.patch
Patch100: virtinst-git-sata-support.diff
Patch150: virtinst-cdrom.diff
Patch151: virtinst-storage-ocfs2.diff
Patch152: virtinst-qed.diff
@ -138,8 +135,6 @@ Authors:
%prep
%setup -q
%setup -b 1
%patch0 -p1
%patch1 -p1
%patch50 -p1
%patch51 -p1
%patch52 -p1
@ -153,9 +148,8 @@ Authors:
%patch63 -p1
%patch64 -p1
%patch65 -p1
%patch66 -p1
#%patch66 -p1
pushd $RPM_BUILD_DIR/%{virtinst_name}
%patch100 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1

3
virtinst-0.600.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1af76c73010cd711d179a52c3b1f2fea5c54fd0e9c87da79f5faa26865769231
size 7987701

3
virtinst-0.600.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:958bae29dd07e194097a54d0a467f510ccf027c00a032f5db323b802583b742d
size 7986321

24
virtinst-cdrom.diff
View File

@ -1,17 +1,19 @@
Index: virtinst-0.600.0/virtinst/VirtualDisk.py
Index: virtinst-0.600.1/virtinst/VirtualDisk.py
===================================================================
--- virtinst-0.600.0.orig/virtinst/VirtualDisk.py
+++ virtinst-0.600.0/virtinst/VirtualDisk.py
@@ -1718,14 +1718,18 @@ class VirtualDisk(VirtualDevice):
self.target = "hdc"
return self.target
--- virtinst-0.600.1.orig/virtinst/VirtualDisk.py
+++ virtinst-0.600.1/virtinst/VirtualDisk.py
@@ -1735,7 +1735,7 @@ class VirtualDisk(VirtualDevice):
if maxnode > (26 * 26 * 26):
raise RuntimeError("maxnode value is too high")
- # Regular scanning
+ # Start cdrom at 'c' and skip 'c' for non-cdrom
for i in range(maxnode):
gen_t = "%s%c" % (prefix, ord('a') + i)
- if gen_t in except_targets:
- continue
+ # Start cdrom at 'c' and skip 'c' for non-cdrom
for i in range(1, maxnode + 1):
gen_t = prefix
@@ -1761,8 +1761,14 @@ class VirtualDisk(VirtualDevice):
if gen_t in except_targets:
continue
if gen_t not in skip_targets:
- self.target = gen_t
- return self.target

90
virtinst-git-sata-support.diff
View File

@ -1,90 +0,0 @@
Subject: VirtualDisk: Support sata bus
From: Jim Fehlig jfehlig@suse.com Thu Dec 22 13:16:04 2011 -0500
Date: Thu Dec 22 13:16:04 2011 -0500:
Git: 580457e92453a0668cce1a65943040a8e919a7f5
(crobinso: add a cli test)
Index: virtinst-0.600.0/man/en/virt-install.1
===================================================================
--- virtinst-0.600.0.orig/man/en/virt-install.1
+++ virtinst-0.600.0/man/en/virt-install.1
@@ -532,9 +532,9 @@ Disk device type. Value can be 'cdrom',
cdrom is used as the install media.
.IP "\fBbus\fR" 4
.IX Item "bus"
-Disk bus type. Value can be 'ide', 'scsi', 'usb', 'virtio' or 'xen'. The
-default is hypervisor dependent since not all hypervisors support all bus
-types.
+Disk bus type. Value can be 'ide', 'sata', 'scsi', 'usb', 'virtio' or 'xen'.
+The default is hypervisor dependent since not all hypervisors support all
+bus types.
.IP "\fBperms\fR" 4
.IX Item "perms"
Disk permissions. Value can be 'rw' (Read/Write), 'ro' (Readonly),
Index: virtinst-0.600.0/man/en/virt-install.pod.in
===================================================================
--- virtinst-0.600.0.orig/man/en/virt-install.pod.in
+++ virtinst-0.600.0/man/en/virt-install.pod.in
@@ -420,9 +420,9 @@ cdrom is used as the install media.
=item B<bus>
-Disk bus type. Value can be 'ide', 'scsi', 'usb', 'virtio' or 'xen'. The
-default is hypervisor dependent since not all hypervisors support all bus
-types.
+Disk bus type. Value can be 'ide', 'sata', 'scsi', 'usb', 'virtio' or 'xen'.
+The default is hypervisor dependent since not all hypervisors support all
+bus types.
=item B<perms>
Index: virtinst-0.600.0/tests/cli-test-xml/compare/many-devices.xml
===================================================================
--- virtinst-0.600.0.orig/tests/cli-test-xml/compare/many-devices.xml
+++ virtinst-0.600.0/tests/cli-test-xml/compare/many-devices.xml
@@ -35,7 +35,7 @@
<readonly/>
</disk>
<disk type='block' device='cdrom'>
- <target dev='hdc' bus='ide'/>
+ <target dev='sda' bus='sata'/>
<readonly/>
</disk>
<controller type='usb' index='0' model='ich9-ehci1'>
@@ -116,7 +116,7 @@
<readonly/>
</disk>
<disk type='block' device='cdrom'>
- <target dev='hdc' bus='ide'/>
+ <target dev='sda' bus='sata'/>
<readonly/>
</disk>
<controller type='usb' index='0' model='ich9-ehci1'>
Index: virtinst-0.600.0/tests/clitest.py
===================================================================
--- virtinst-0.600.0.orig/tests/clitest.py
+++ virtinst-0.600.0/tests/clitest.py
@@ -606,7 +606,7 @@ args_dict = {
"--controller usb,model=ich9-uhci3,address=0:0:4.2,index=0,master=4 "
"--disk %(EXISTIMG1)s,cache=writeback,io=threads,perms=sh,serial=WD-WMAP9A966149 "
"--disk %(NEWIMG1)s,sparse=false,size=.001,perms=ro,error_policy=enospace "
- "--disk device=cdrom "
+ "--disk device=cdrom,bus=sata "
"--serial tcp,host=:2222,mode=bind,protocol=telnet "
"--filesystem /source,/target,mode=squash "
"--network user,mac=12:34:56:78:11:22 "
Index: virtinst-0.600.0/virtinst/VirtualDisk.py
===================================================================
--- virtinst-0.600.0.orig/virtinst/VirtualDisk.py
+++ virtinst-0.600.0/virtinst/VirtualDisk.py
@@ -1682,7 +1682,7 @@ class VirtualDisk(VirtualDevice):
# error as appropriate.
if self.bus == "virtio":
return ("vd", 1024)
- elif self.bus == "scsi" or self.bus == "usb":
+ elif self.bus in ["sata", "scsi", "usb"]:
return ("sd", 1024)
elif self.bus == "xen":
return ("xvd", 1024)

26
virtinst-qed.diff
View File

@ -1,8 +1,8 @@
Index: virtinst-0.600.0/virtinst/VirtualDisk.py
Index: virtinst-0.600.1/virtinst/VirtualDisk.py
===================================================================
--- virtinst-0.600.0.orig/virtinst/VirtualDisk.py
+++ virtinst-0.600.0/virtinst/VirtualDisk.py
@@ -292,10 +292,11 @@ class VirtualDisk(VirtualDevice):
--- virtinst-0.600.1.orig/virtinst/VirtualDisk.py
+++ virtinst-0.600.1/virtinst/VirtualDisk.py
@@ -295,10 +295,11 @@ class VirtualDisk(VirtualDevice):
DRIVER_TAP_RAW = "aio"
DRIVER_TAP_QCOW = "qcow"
@ -15,10 +15,10 @@ Index: virtinst-0.600.0/virtinst/VirtualDisk.py
CACHE_MODE_NONE = "none"
CACHE_MODE_WRITETHROUGH = "writethrough"
Index: virtinst-0.600.0/virtinst/ImageParser.py
Index: virtinst-0.600.1/virtinst/ImageParser.py
===================================================================
--- virtinst-0.600.0.orig/virtinst/ImageParser.py
+++ virtinst-0.600.0/virtinst/ImageParser.py
--- virtinst-0.600.1.orig/virtinst/ImageParser.py
+++ virtinst-0.600.1/virtinst/ImageParser.py
@@ -200,6 +200,7 @@ class Disk:
FORMAT_ISO = "iso"
FORMAT_QCOW = "qcow"
@ -36,10 +36,10 @@ Index: virtinst-0.600.0/virtinst/ImageParser.py
validate(formats.count(self.format) > 0,
_("The format for disk %s must be one of %s") %
(self.file, ",".join(formats)))
Index: virtinst-0.600.0/virtconv/diskcfg.py
Index: virtinst-0.600.1/virtconv/diskcfg.py
===================================================================
--- virtinst-0.600.0.orig/virtconv/diskcfg.py
+++ virtinst-0.600.0/virtconv/diskcfg.py
--- virtinst-0.600.1.orig/virtconv/diskcfg.py
+++ virtinst-0.600.1/virtconv/diskcfg.py
@@ -35,6 +35,7 @@ DISK_FORMAT_VDISK = 3
DISK_FORMAT_QCOW = 4
DISK_FORMAT_QCOW2 = 5
@ -82,10 +82,10 @@ Index: virtinst-0.600.0/virtconv/diskcfg.py
raise NotImplementedError(_("Cannot convert to disk format %s") %
output_format)
Index: virtinst-0.600.0/virtconv/parsers/virtimage.py
Index: virtinst-0.600.1/virtconv/parsers/virtimage.py
===================================================================
--- virtinst-0.600.0.orig/virtconv/parsers/virtimage.py
+++ virtinst-0.600.0/virtconv/parsers/virtimage.py
--- virtinst-0.600.1.orig/virtconv/parsers/virtimage.py
+++ virtinst-0.600.1/virtconv/parsers/virtimage.py
@@ -246,6 +246,7 @@ class virtimage_parser(formats.parser):
ImageParser.Disk.FORMAT_VMDK: diskcfg.DISK_FORMAT_VMDK,
ImageParser.Disk.FORMAT_QCOW: diskcfg.DISK_FORMAT_QCOW,

6
virtinst-storage-ocfs2.diff
View File

@ -1,7 +1,7 @@
Index: virtinst-0.600.0/virtinst/Storage.py
Index: virtinst-0.600.1/virtinst/Storage.py
===================================================================
--- virtinst-0.600.0.orig/virtinst/Storage.py
+++ virtinst-0.600.0/virtinst/Storage.py
--- virtinst-0.600.1.orig/virtinst/Storage.py
+++ virtinst-0.600.1/virtinst/Storage.py
@@ -534,7 +534,7 @@ class FilesystemPool(StoragePool):
get_volume_class = staticmethod(get_volume_class)

6
virtman-autoconnect.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.9.0/src/virtManager/engine.py
Index: virt-manager-0.9.1/src/virtManager/engine.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/engine.py
+++ virt-manager-0.9.0/src/virtManager/engine.py
--- virt-manager-0.9.1.orig/src/virtManager/engine.py
+++ virt-manager-0.9.1/src/virtManager/engine.py
@@ -361,7 +361,7 @@ class vmmEngine(vmmGObject):
conn = self.add_conn(uri)

12
virtman-autorestart.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.9.0/src/virtManager/details.py
Index: virt-manager-0.9.1/src/virtManager/details.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/details.py
+++ virt-manager-0.9.0/src/virtManager/details.py
@@ -2069,11 +2069,9 @@ class vmmDetails(vmmGObjectUI):
--- virt-manager-0.9.1.orig/src/virtManager/details.py
+++ virt-manager-0.9.1/src/virtManager/details.py
@@ -2102,11 +2102,9 @@ class vmmDetails(vmmGObjectUI):
return self._change_config_helper(df, da, hf, ha)
@ -17,7 +17,7 @@ Index: virt-manager-0.9.0/src/virtManager/details.py
if self.editted(EDIT_AUTOSTART):
auto = self.widget("config-autostart")
try:
@@ -2083,6 +2081,11 @@ class vmmDetails(vmmGObjectUI):
@@ -2116,6 +2114,11 @@ class vmmDetails(vmmGObjectUI):
(_("Error changing autostart value: %s") % str(e)))
return False
@ -29,7 +29,7 @@ Index: virt-manager-0.9.0/src/virtManager/details.py
if self.editted(EDIT_BOOTORDER):
bootdevs = self.get_config_boot_devs()
add_define(self.vm.set_boot_device, bootdevs)
@@ -2432,6 +2435,8 @@ class vmmDetails(vmmGObjectUI):
@@ -2465,6 +2468,8 @@ class vmmDetails(vmmGObjectUI):
buttons=gtk.BUTTONS_OK,
dialog_type=dtype)

8
virtman-cdrom.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.9.0/src/virtManager/addhardware.py
Index: virt-manager-0.9.1/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/addhardware.py
+++ virt-manager-0.9.0/src/virtManager/addhardware.py
@@ -519,6 +519,7 @@ class vmmAddHardware(vmmGObjectUI):
--- virt-manager-0.9.1.orig/src/virtManager/addhardware.py
+++ virt-manager-0.9.1/src/virtManager/addhardware.py
@@ -528,6 +528,7 @@ class vmmAddHardware(vmmGObjectUI):
add_dev("sata", virtinst.VirtualDisk.DEVICE_DISK, "SATA disk")
add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio disk")
if self.conn.is_xen():

24
virtman-desktop.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.9.0/src/Makefile.am
Index: virt-manager-0.9.1/src/Makefile.am
===================================================================
--- virt-manager-0.9.0.orig/src/Makefile.am
+++ virt-manager-0.9.0/src/Makefile.am
--- virt-manager-0.9.1.orig/src/Makefile.am
+++ virt-manager-0.9.1/src/Makefile.am
@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade)
@ -11,11 +11,11 @@ Index: virt-manager-0.9.0/src/Makefile.am
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
Index: virt-manager-0.9.0/src/Makefile.in
Index: virt-manager-0.9.1/src/Makefile.in
===================================================================
--- virt-manager-0.9.0.orig/src/Makefile.in
+++ virt-manager-0.9.0/src/Makefile.in
@@ -212,7 +212,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
--- virt-manager-0.9.1.orig/src/Makefile.in
+++ virt-manager-0.9.1/src/Makefile.in
@@ -255,7 +255,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade)
@ -24,11 +24,11 @@ Index: virt-manager-0.9.0/src/Makefile.in
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services
Index: virt-manager-0.9.0/src/virt-manager.desktop.in.in
Index: virt-manager-0.9.1/src/virt-manager.desktop.in.in
===================================================================
--- virt-manager-0.9.0.orig/src/virt-manager.desktop.in.in
+++ virt-manager-0.9.0/src/virt-manager.desktop.in.in
@@ -1,9 +1,19 @@
--- virt-manager-0.9.1.orig/src/virt-manager.desktop.in.in
+++ virt-manager-0.9.1/src/virt-manager.desktop.in.in
@@ -1,8 +1,19 @@
[Desktop Entry]
_Name=Virtual Machine Manager
-_Comment=Manage virtual machines
@ -40,8 +40,8 @@ Index: virt-manager-0.9.0/src/virt-manager.desktop.in.in
+Exec=/usr/bin/virt-manager
Type=Application
Terminal=false
Encoding=UTF-8
-Categories=System;
+Encoding=UTF-8
+Categories=Qt;X-SuSE-YaST;
+X-KDE-ModuleType=Library
+X-KDE-RootOnly=true

26
virtman-device-flags.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.9.0/src/virtManager/addhardware.py
Index: virt-manager-0.9.1/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/addhardware.py
+++ virt-manager-0.9.0/src/virtManager/addhardware.py
@@ -1070,6 +1070,18 @@ class vmmAddHardware(vmmGObjectUI):
--- virt-manager-0.9.1.orig/src/virtManager/addhardware.py
+++ virt-manager-0.9.1/src/virtManager/addhardware.py
@@ -1140,6 +1140,18 @@ class vmmAddHardware(vmmGObjectUI):
self._dev.get_xml_config()
logging.debug("Adding device:\n" + self._dev.get_xml_config())
@ -21,11 +21,11 @@ Index: virt-manager-0.9.0/src/virtManager/addhardware.py
# Hotplug device
attach_err = False
try:
Index: virt-manager-0.9.0/src/virtManager/details.py
Index: virt-manager-0.9.1/src/virtManager/details.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/details.py
+++ virt-manager-0.9.0/src/virtManager/details.py
@@ -2318,6 +2318,17 @@ class vmmDetails(vmmGObjectUI):
--- virt-manager-0.9.1.orig/src/virtManager/details.py
+++ virt-manager-0.9.1/src/virtManager/details.py
@@ -2351,6 +2351,17 @@ class vmmDetails(vmmGObjectUI):
text1=(_("Are you sure you want to remove this device?"))):
return
@ -43,11 +43,11 @@ Index: virt-manager-0.9.0/src/virtManager/details.py
# Define the change
try:
self.vm.remove_device(dev_id_info)
Index: virt-manager-0.9.0/src/virtManager/domain.py
Index: virt-manager-0.9.1/src/virtManager/domain.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/domain.py
+++ virt-manager-0.9.0/src/virtManager/domain.py
@@ -718,6 +718,10 @@ class vmmDomain(vmmLibvirtObject):
--- virt-manager-0.9.1.orig/src/virtManager/domain.py
+++ virt-manager-0.9.1/src/virtManager/domain.py
@@ -757,6 +757,10 @@ class vmmDomain(vmmLibvirtObject):
devxml = devobj.get_xml_config()
self._backend.attachDevice(devxml)
@ -58,7 +58,7 @@ Index: virt-manager-0.9.0/src/virtManager/domain.py
def detach_device(self, devobj):
"""
Hotunplug device from running guest
@@ -736,6 +740,10 @@ class vmmDomain(vmmLibvirtObject):
@@ -775,6 +779,10 @@ class vmmDomain(vmmLibvirtObject):
xml = devobj.get_xml_config()
self._backend.updateDeviceFlags(xml, flags)

6
virtman-eepro100.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.9.0/src/virtManager/uihelpers.py
Index: virt-manager-0.9.1/src/virtManager/uihelpers.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.0/src/virtManager/uihelpers.py
--- virt-manager-0.9.1.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.1/src/virtManager/uihelpers.py
@@ -309,6 +309,7 @@ def populate_netmodel_combo(vm, combo):
if vm.is_hvm():
mod_list = ["rtl8139", "ne2k_pci", "pcnet", "e1000"]

30
virtman-git-reconnect.diff
View File

@ -1,30 +0,0 @@
Subject: console: Fix hang when reconnecting to remote VNC console
From: Cole Robinson crobinso@redhat.com Thu Dec 22 12:55:40 2011 -0500
Date: Thu Dec 22 12:55:40 2011 -0500:
Git: becf776d6af3455f6c89396e3ccc330cd2c85434
VNC disconnect signals aren't being delivered, meaning we never cleanup
up SSH tunnels for remote VNC connections. This causes a reconnect
attempt to hang, trying to reuse the existing tunnels (which doesn't
work).
The problem is that we are cleaning up the VNC widget too early,
unregistering callbacks before they get a chance to be invoked.
Not cleaning up only causes a small memory leak for every console we
open, so only a minor problem compared to the original issue. A more
involved fix is required to clean up safely.
Index: virt-manager-0.9.0/src/virtManager/console.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/console.py
+++ virt-manager-0.9.0/src/virtManager/console.py
@@ -850,7 +850,6 @@ class vmmConsolePages(vmmGObjectUI):
viewport.remove(w)
v.close()
- v.cleanup()
self.viewer_connected = False
self.leave_fullscreen()

42
virtman-git-sata-support.diff
View File

@ -1,42 +0,0 @@
Subject: addhw: Add SATA disk bus option
From: Jim Fehlig jfehlig@suse.com Thu Dec 22 13:18:40 2011 -0500
Date: Thu Dec 22 13:18:40 2011 -0500:
Git: 42a871984f007daa8de148afc2763e9697356493
Index: virt-manager-0.9.0/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/addhardware.py
+++ virt-manager-0.9.0/src/virtManager/addhardware.py
@@ -516,7 +516,8 @@ class vmmAddHardware(vmmGObjectUI):
add_dev("scsi", virtinst.VirtualDisk.DEVICE_DISK, "SCSI disk")
add_dev("usb", virtinst.VirtualDisk.DEVICE_DISK, "USB disk")
if self.vm.get_hv_type() == "kvm":
- add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk")
+ add_dev("sata", virtinst.VirtualDisk.DEVICE_DISK, "SATA disk")
+ add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio disk")
if self.conn.is_xen():
add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, "Virtual disk")
Index: virt-manager-0.9.0/src/virtManager/details.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/details.py
+++ virt-manager-0.9.0/src/virtManager/details.py
@@ -134,7 +134,7 @@ PAGE_DETAILS = 1
PAGE_DYNAMIC_OFFSET = 2
def prettyify_disk_bus(bus):
- if bus in ["ide", "scsi", "usb"]:
+ if bus in ["ide", "sata", "scsi", "usb"]:
return bus.upper()
if bus in ["xen"]:
@@ -3202,6 +3202,7 @@ class vmmDetails(vmmGObjectUI):
buses.append(["scsi", "SCSI"])
buses.append(["usb", "USB"])
if self.vm.get_hv_type() == "kvm":
+ buses.append(["sata", "SATA"])
buses.append(["virtio", "Virtio"])
if self.vm.conn.is_xen():
buses.append(["xen", "Xen"])

6
virtman-keycombo.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.9.0/src/virtManager/uihelpers.py
Index: virt-manager-0.9.1/src/virtManager/uihelpers.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.0/src/virtManager/uihelpers.py
--- virt-manager-0.9.1.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.1/src/virtManager/uihelpers.py
@@ -953,6 +953,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"])

6
virtman-kvm.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.9.0/src/virtManager/engine.py
Index: virt-manager-0.9.1/src/virtManager/engine.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/engine.py
+++ virt-manager-0.9.0/src/virtManager/engine.py
--- virt-manager-0.9.1.orig/src/virtManager/engine.py
+++ virt-manager-0.9.1/src/virtManager/engine.py
@@ -59,6 +59,7 @@ def default_uri():
os.path.exists("/usr/bin/qemu") or
os.path.exists("/usr/bin/qemu-kvm") or

6
virtman-qed.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.9.0/src/virtManager/uihelpers.py
Index: virt-manager-0.9.1/src/virtManager/uihelpers.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.0/src/virtManager/uihelpers.py
--- virt-manager-0.9.1.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.1/src/virtManager/uihelpers.py
@@ -395,12 +395,12 @@ def build_storage_format_combo(vm, combo
combo.set_model(dev_model)
combo.set_text_column(0)

8
virtman-update-backend.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.9.0/src/virtManager/domain.py
Index: virt-manager-0.9.1/src/virtManager/domain.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/domain.py
+++ virt-manager-0.9.0/src/virtManager/domain.py
@@ -1562,7 +1562,14 @@ class vmmDomain(vmmLibvirtObject):
--- virt-manager-0.9.1.orig/src/virtManager/domain.py
+++ virt-manager-0.9.1/src/virtManager/domain.py
@@ -1603,7 +1603,14 @@ class vmmDomain(vmmLibvirtObject):
# Invalidate cached values
self._invalidate_xml()

18
virtman-vminstall.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.9.0/src/virtManager/engine.py
Index: virt-manager-0.9.1/src/virtManager/engine.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/engine.py
+++ virt-manager-0.9.0/src/virtManager/engine.py
--- virt-manager-0.9.1.orig/src/virtManager/engine.py
+++ virt-manager-0.9.1/src/virtManager/engine.py
@@ -41,7 +41,6 @@ from virtManager.manager import vmmManag
from virtManager.migrate import vmmMigrateDialog
from virtManager.details import vmmDetails
@ -62,19 +62,19 @@ Index: virt-manager-0.9.0/src/virtManager/engine.py
def _do_show_migrate(self, src, uri, uuid):
try:
Index: virt-manager-0.9.0/src/virtManager/create.py
Index: virt-manager-0.9.1/src/virtManager/create.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/create.py
+++ virt-manager-0.9.0/src/virtManager/create.py
@@ -154,6 +154,7 @@ class vmmCreate(vmmGObjectUI):
self.topwin.present()
--- virt-manager-0.9.1.orig/src/virtManager/create.py
+++ virt-manager-0.9.1/src/virtManager/create.py
@@ -156,6 +156,7 @@ class vmmCreate(vmmGObjectUI):
def close(self, ignore1=None, ignore2=None):
logging.debug("Closing new vm wizard")
+ self.emit('vmmcreate-closing', 0)
self.topwin.hide()
self.remove_timers()
@@ -2131,3 +2132,4 @@ class vmmCreate(vmmGObjectUI):
@@ -2134,3 +2135,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])