- Update to virt-manager 0.8.5

* Improved save/restore support
  * Option to view and change disk cache mode
  * Configurable VNC keygrab sequence (Michal Novotny)
- Update to virtinst 0.500.4
  * New virt-install --console option for specifying virtio console 
    device
  * New virt-install --channel option for specifying guest 
    communication channel
  * New virt-install --boot option. Allows setting post-install boot
    order, direct kernel/initrd boot, and enabling boot device menu.
  * New virt-install --initrd-inject option, which enables 
    installation using a _local_ kickstart file (Colin Walters)

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=37
This commit is contained in:
Charles Arnold 2010-09-27 20:47:12 +00:00 committed by Git OBS Bridge
parent 31292f0042
commit 39bfc34504
18 changed files with 106 additions and 142 deletions

View File

@ -1,49 +0,0 @@
# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1270757920 14400
# Node ID 5e11e6b33fec05dc5cd155ee9931464c2e10ef2b
# Parent 4c80ef09e3f03acdc7e6ec10e70812a263ef8d45
Fix custom icon installation.
Index: virt-manager-0.8.4/pixmaps/hicolor/16x16/actions/Makefile.am
===================================================================
--- virt-manager-0.8.4.orig/pixmaps/hicolor/16x16/actions/Makefile.am
+++ virt-manager-0.8.4/pixmaps/hicolor/16x16/actions/Makefile.am
@@ -1,5 +1,5 @@
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/16x16/action
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/16x16/actions
pixmap_DATA = $(wildcard *.png)
EXTRA_DIST = $(pixmap_DATA)
Index: virt-manager-0.8.4/pixmaps/hicolor/22x22/actions/Makefile.am
===================================================================
--- virt-manager-0.8.4.orig/pixmaps/hicolor/22x22/actions/Makefile.am
+++ virt-manager-0.8.4/pixmaps/hicolor/22x22/actions/Makefile.am
@@ -1,5 +1,5 @@
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/22x22/action
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/22x22/actions
pixmap_DATA = $(wildcard *.png)
EXTRA_DIST = $(pixmap_DATA)
Index: virt-manager-0.8.4/pixmaps/hicolor/24x24/actions/Makefile.am
===================================================================
--- virt-manager-0.8.4.orig/pixmaps/hicolor/24x24/actions/Makefile.am
+++ virt-manager-0.8.4/pixmaps/hicolor/24x24/actions/Makefile.am
@@ -1,4 +1,4 @@
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/24x24/action
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/24x24/actions
pixmap_DATA = $(wildcard *.png)
EXTRA_DIST = $(pixmap_DATA)
Index: virt-manager-0.8.4/pixmaps/hicolor/32x32/actions/Makefile.am
===================================================================
--- virt-manager-0.8.4.orig/pixmaps/hicolor/32x32/actions/Makefile.am
+++ virt-manager-0.8.4/pixmaps/hicolor/32x32/actions/Makefile.am
@@ -1,4 +1,4 @@
-pixmapdir = $(pkgdatadir)/pixmaps/hicolor/32x32/action
+pixmapdir = $(pkgdatadir)/pixmaps/hicolor/32x32/actions
pixmap_DATA = $(wildcard *.png)
EXTRA_DIST = $(pixmap_DATA)

View File

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

View File

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

View File

@ -9,6 +9,23 @@ Tue Sep 14 08:26:13 UTC 2010 - seife@opensuse.org
- fix build on FACTORY after gconf2 and python changes
-------------------------------------------------------------------
Tue Aug 31 14:13:14 MDT 2010 - carnold@novell.com
- Update to virt-manager 0.8.5
* Improved save/restore support
* Option to view and change disk cache mode
* Configurable VNC keygrab sequence (Michal Novotny)
- Update to virtinst 0.500.4
* New virt-install --console option for specifying virtio console
device
* New virt-install --channel option for specifying guest
communication channel
* New virt-install --boot option. Allows setting post-install boot
order, direct kernel/initrd boot, and enabling boot device menu.
* New virt-install --initrd-inject option, which enables
installation using a _local_ kickstart file (Colin Walters)
-------------------------------------------------------------------
Wed Jul 28 16:06:55 MDT 2010 - carnold@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package virt-manager (Version 0.8.4)
# spec file for package virt-manager (Version 0.8.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -22,24 +22,23 @@
%define gconftool /usr/bin/gconftool-2
%define virtinst_maj 0
%define virtinst_min 500
%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()")
Name: virt-manager
Summary: Virtual Machine Manager
Version: 0.8.4
Version: 0.8.5
Release: 4
Group: System/Monitoring
License: LGPLv2.1+
Url: http://virt-manager.et.redhat.com
Source0: virt-manager-%{version}.tar.bz2
Source1: %{virtinst_name}.tar.bz2
Patch1: 1660-custom-icon-fix.patch
# see https://bugzilla.redhat.com/show_bug.cgi?id=620216,
# https://bugzilla.novell.com/show_bug.cgi?id=641981
Patch2: virt-manager-fix-python27.diff
Patch1: virt-manager-fix-python27.diff
Patch50: virtman-desktop.diff
Patch51: virtman-vminstall.diff
Patch52: virtman-pointer.diff
@ -131,7 +130,6 @@ Authors:
%setup -q
%setup -b 1
%patch1 -p1
%patch2 -p1
%patch50 -p1
%patch51 -p1
#%patch52 -p1
@ -139,7 +137,7 @@ Authors:
%patch54 -p1
#%patch55 -p1
#%patch56 -p1
%patch57 -p1
#%patch57 -p1
%patch58 -p1
%patch59 -p1
%patch60 -p1
@ -223,9 +221,9 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
# %dir %attr(775,root,root) %{_datadir}/locale/or
# %dir %attr(775,root,root) %{_datadir}/locale/or/LC_MESSAGES
# %{_datadir}/locale/or/LC_MESSAGES/*
%{_datadir}/omf/%{name}
%dir %attr(775,root,root) %{_datadir}/gnome
%{_datadir}/gnome/help
#%{_datadir}/omf/%{name}
#%dir %attr(775,root,root) %{_datadir}/gnome
#%{_datadir}/gnome/help
%{_datadir}/applications/YaST2/%{name}.desktop
%{_datadir}/dbus-1/services/%{name}.service
%{_mandir}/man1/%{name}.1*
@ -242,8 +240,8 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
%{pysite}/virtconv/parsers/*.py
%{pysite}/virtconv/parsers/*.pyc
%{pysite}/%{virtinst_name}-py2.?.egg-info
%doc %{_datadir}/gnome/help/%{name}/C/figures/*.png
%doc %{_datadir}/gnome/help/%{name}/C/*.xml
#%doc %{_datadir}/gnome/help/%{name}/C/figures/*.png
#%doc %{_datadir}/gnome/help/%{name}/C/*.xml
# FIXME: autobuild complains that these are unowned (not true...)
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/services

View File

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

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

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

View File

@ -1,8 +1,8 @@
Index: virtinst-0.500.3/virtinst/VirtualDisk.py
Index: virtinst-0.500.4/virtinst/VirtualDisk.py
===================================================================
--- virtinst-0.500.3.orig/virtinst/VirtualDisk.py
+++ virtinst-0.500.3/virtinst/VirtualDisk.py
@@ -1441,14 +1441,18 @@ class VirtualDisk(VirtualDevice):
--- virtinst-0.500.4.orig/virtinst/VirtualDisk.py
+++ virtinst-0.500.4/virtinst/VirtualDisk.py
@@ -1444,14 +1444,18 @@ class VirtualDisk(VirtualDevice):
self.target = "hdc"
return self.target

View File

@ -1,8 +1,8 @@
Index: virtinst-0.500.3/virtinst/Storage.py
Index: virtinst-0.500.4/virtinst/Storage.py
===================================================================
--- virtinst-0.500.3.orig/virtinst/Storage.py
+++ virtinst-0.500.3/virtinst/Storage.py
@@ -522,7 +522,7 @@ class FilesystemPool(StoragePool):
--- virtinst-0.500.4.orig/virtinst/Storage.py
+++ virtinst-0.500.4/virtinst/Storage.py
@@ -523,7 +523,7 @@ class FilesystemPool(StoragePool):
get_volume_class = staticmethod(get_volume_class)
formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf",

View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.4/src/virtManager/engine.py
Index: virt-manager-0.8.5/src/virtManager/engine.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/engine.py
+++ virt-manager-0.8.4/src/virtManager/engine.py
@@ -689,7 +689,7 @@ class vmmEngine(gobject.GObject):
--- virt-manager-0.8.5.orig/src/virtManager/engine.py
+++ virt-manager-0.8.5/src/virtManager/engine.py
@@ -704,7 +704,7 @@ class vmmEngine(gobject.GObject):
self.emit("connection-added", conn)
self.config.add_connection(conn.get_uri())
if autoconnect:

View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.4/src/virtManager/details.py
Index: virt-manager-0.8.5/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/details.py
+++ virt-manager-0.8.4/src/virtManager/details.py
@@ -1335,8 +1335,15 @@ class vmmDetails(gobject.GObject):
--- virt-manager-0.8.5.orig/src/virtManager/details.py
+++ virt-manager-0.8.5/src/virtManager/details.py
@@ -1397,8 +1397,15 @@ class vmmDetails(gobject.GObject):
self.vm.hotplug_both_mem,
(curmem, maxmem))
@ -19,7 +19,7 @@ Index: virt-manager-0.8.4/src/virtManager/details.py
auto = self.window.get_widget("config-autostart")
if auto.get_property("sensitive"):
@@ -1345,11 +1352,6 @@ class vmmDetails(gobject.GObject):
@@ -1407,11 +1414,6 @@ class vmmDetails(gobject.GObject):
except Exception, e:
self.err.show_err((_("Error changing autostart value: %s") %
str(e)), "".join(traceback.format_exc()))
@ -31,7 +31,7 @@ Index: virt-manager-0.8.4/src/virtManager/details.py
# CDROM
def change_storage_media(self, dev_id_info, newpath, _type=None):
@@ -1505,6 +1507,9 @@ class vmmDetails(gobject.GObject):
@@ -1570,6 +1572,9 @@ class vmmDetails(gobject.GObject):
else:
self.err.show_info(_("These changes will take effect after "
"the next guest reboot."))

View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.4/src/virtManager/addhardware.py
Index: virt-manager-0.8.5/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.4/src/virtManager/addhardware.py
@@ -464,6 +464,7 @@ class vmmAddHardware(gobject.GObject):
--- virt-manager-0.8.5.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.5/src/virtManager/addhardware.py
@@ -468,6 +468,7 @@ class vmmAddHardware(gobject.GObject):
if self.vm.get_hv_type() == "kvm":
add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk")
if self.vm.get_connection().is_xen():

View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.4/src/Makefile.am
Index: virt-manager-0.8.5/src/Makefile.am
===================================================================
--- virt-manager-0.8.4.orig/src/Makefile.am
+++ virt-manager-0.8.4/src/Makefile.am
--- virt-manager-0.8.5.orig/src/Makefile.am
+++ virt-manager-0.8.5/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.8.4/src/Makefile.am
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
Index: virt-manager-0.8.4/src/Makefile.in
Index: virt-manager-0.8.5/src/Makefile.in
===================================================================
--- virt-manager-0.8.4.orig/src/Makefile.in
+++ virt-manager-0.8.4/src/Makefile.in
@@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
--- virt-manager-0.8.5.orig/src/Makefile.in
+++ virt-manager-0.8.5/src/Makefile.in
@@ -239,7 +239,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade)
@ -24,10 +24,10 @@ Index: virt-manager-0.8.4/src/Makefile.in
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services
Index: virt-manager-0.8.4/src/virt-manager.desktop.in.in
Index: virt-manager-0.8.5/src/virt-manager.desktop.in.in
===================================================================
--- virt-manager-0.8.4.orig/src/virt-manager.desktop.in.in
+++ virt-manager-0.8.4/src/virt-manager.desktop.in.in
--- virt-manager-0.8.5.orig/src/virt-manager.desktop.in.in
+++ virt-manager-0.8.5/src/virt-manager.desktop.in.in
@@ -1,9 +1,20 @@
[Desktop Entry]
_Name=Virtual Machine Manager

View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.4/src/virtManager/addhardware.py
Index: virt-manager-0.8.5/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.4/src/virtManager/addhardware.py
@@ -1010,6 +1010,18 @@ class vmmAddHardware(gobject.GObject):
--- virt-manager-0.8.5.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.5/src/virtManager/addhardware.py
@@ -1022,6 +1022,18 @@ class vmmAddHardware(gobject.GObject):
self._dev.get_xml_config()
logging.debug("Adding device:\n" + self._dev.get_xml_config())
@ -21,11 +21,11 @@ Index: virt-manager-0.8.4/src/virtManager/addhardware.py
# Hotplug device
attach_err = False
try:
Index: virt-manager-0.8.4/src/virtManager/details.py
Index: virt-manager-0.8.5/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/details.py
+++ virt-manager-0.8.4/src/virtManager/details.py
@@ -1414,6 +1414,17 @@ class vmmDetails(gobject.GObject):
--- virt-manager-0.8.5.orig/src/virtManager/details.py
+++ virt-manager-0.8.5/src/virtManager/details.py
@@ -1479,6 +1479,17 @@ class vmmDetails(gobject.GObject):
return
self.config.set_confirm_removedev(not skip_prompt)
@ -43,11 +43,11 @@ Index: virt-manager-0.8.4/src/virtManager/details.py
# Define the change
try:
self.vm.remove_device(dev_type, dev_id_info)
Index: virt-manager-0.8.4/src/virtManager/domain.py
Index: virt-manager-0.8.5/src/virtManager/domain.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/domain.py
+++ virt-manager-0.8.4/src/virtManager/domain.py
@@ -1370,6 +1370,10 @@ class vmmDomain(vmmDomainBase):
--- virt-manager-0.8.5.orig/src/virtManager/domain.py
+++ virt-manager-0.8.5/src/virtManager/domain.py
@@ -1413,6 +1413,10 @@ class vmmDomain(vmmDomainBase):
self._backend.attachDevice(devxml)
@ -58,7 +58,7 @@ Index: virt-manager-0.8.4/src/virtManager/domain.py
def detach_device(self, devtype, dev_id_info):
"""
Hotunplug device from running guest
@@ -1378,6 +1382,10 @@ class vmmDomain(vmmDomainBase):
@@ -1421,6 +1425,10 @@ class vmmDomain(vmmDomainBase):
if self.is_active():
self._backend.detachDevice(xml)

View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml
Index: virt-manager-0.8.5/help/virt-manager/C/virt-manager.xml
===================================================================
--- virt-manager-0.8.4.orig/help/virt-manager/C/virt-manager.xml
+++ virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml
--- virt-manager-0.8.5.orig/help/virt-manager/C/virt-manager.xml
+++ virt-manager-0.8.5/help/virt-manager/C/virt-manager.xml
@@ -821,218 +821,9 @@
<title>The Create Wizard</title>
<para>The Create Wizard helps you gather the information necessary to create

View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.4/src/vmm-details.glade
Index: virt-manager-0.8.5/src/vmm-details.glade
===================================================================
--- virt-manager-0.8.4.orig/src/vmm-details.glade
+++ virt-manager-0.8.4/src/vmm-details.glade
@@ -339,11 +339,93 @@
--- virt-manager-0.8.5.orig/src/vmm-details.glade
+++ virt-manager-0.8.5/src/vmm-details.glade
@@ -351,11 +351,93 @@
</widget>
</child>
<child>
@ -96,7 +96,7 @@ Index: virt-manager-0.8.4/src/vmm-details.glade
<widget class="GtkMenuItem" id="details-menu-send-caf1">
<property name="visible">True</property>
<property name="label">Ctrl+Alt+F_1</property>
@@ -440,7 +522,7 @@
@@ -452,7 +534,7 @@
</widget>
</child>
<child>
@ -105,11 +105,11 @@ Index: virt-manager-0.8.4/src/vmm-details.glade
<property name="visible">True</property>
</widget>
</child>
Index: virt-manager-0.8.4/src/virtManager/details.py
Index: virt-manager-0.8.5/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/details.py
+++ virt-manager-0.8.4/src/virtManager/details.py
@@ -288,6 +288,15 @@ class vmmDetails(gobject.GObject):
--- virt-manager-0.8.5.orig/src/virtManager/details.py
+++ virt-manager-0.8.5/src/virtManager/details.py
@@ -291,6 +291,15 @@ class vmmDetails(gobject.GObject):
"on_details_menu_send_cad_activate": self.console.send_key,
"on_details_menu_send_cab_activate": self.console.send_key,
@ -125,11 +125,11 @@ Index: virt-manager-0.8.4/src/virtManager/details.py
"on_details_menu_send_caf1_activate": self.console.send_key,
"on_details_menu_send_caf2_activate": self.console.send_key,
"on_details_menu_send_caf3_activate": self.console.send_key,
Index: virt-manager-0.8.4/src/virtManager/console.py
Index: virt-manager-0.8.5/src/virtManager/console.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/console.py
+++ virt-manager-0.8.4/src/virtManager/console.py
@@ -325,6 +325,24 @@ class vmmConsolePages(gobject.GObject):
--- virt-manager-0.8.5.orig/src/virtManager/console.py
+++ virt-manager-0.8.5/src/virtManager/console.py
@@ -359,6 +359,24 @@ class vmmConsolePages(gobject.GObject):
keys = ["Control_L", "Alt_L", "Delete"]
elif src.get_name() == "details-menu-send-cab":
keys = ["Control_L", "Alt_L", "BackSpace"]

View File

@ -1,14 +1,12 @@
Index: virt-manager-0.8.4/src/virtManager/engine.py
Index: virt-manager-0.8.5/src/virtManager/engine.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/engine.py
+++ virt-manager-0.8.4/src/virtManager/engine.py
@@ -69,7 +69,8 @@ def default_uri():
tryuri = "xen:///"
elif (os.path.exists("/usr/bin/qemu") or
--- virt-manager-0.8.5.orig/src/virtManager/engine.py
+++ virt-manager-0.8.5/src/virtManager/engine.py
@@ -71,6 +71,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")):
+ os.path.exists("/usr/bin/kvm") or
+ os.path.exists("/dev/kvm") ):
os.path.exists("/usr/bin/kvm") or
+ os.path.exists("/dev/kvm") or
os.path.exists("/usr/libexec/qemu-kvm")):
tryuri = "qemu:///system"
return tryuri

View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.4/src/virtManager/engine.py
Index: virt-manager-0.8.5/src/virtManager/engine.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/engine.py
+++ virt-manager-0.8.4/src/virtManager/engine.py
--- virt-manager-0.8.5.orig/src/virtManager/engine.py
+++ virt-manager-0.8.5/src/virtManager/engine.py
@@ -40,7 +40,8 @@ from virtManager.manager import vmmManag
from virtManager.migrate import vmmMigrateDialog
from virtManager.details import vmmDetails
@ -12,7 +12,7 @@ Index: virt-manager-0.8.4/src/virtManager/engine.py
from virtManager.host import vmmHost
from virtManager.error import vmmErrorDialog
from virtManager.systray import vmmSystray
@@ -650,13 +651,27 @@ class vmmEngine(gobject.GObject):
@@ -665,13 +666,27 @@ class vmmEngine(gobject.GObject):
return False
return True