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

- bnc#588391 - Send Key in virt-viewer does not work with Netware

Browse Source 
VM's 

- Don't automatically connect to xen in the virt-manager.desktop
  file.  This results in an error dialog when only KVM is installed 

- bnc#588215 - virt-manager/vminstall can't install new KVM Guests 

- bnc#585990 - Fix add/remove device for active Xen guests.
  virtman-device-flags.diff
- cleanup spec
  * norootforbuild
  * sort TAGS
- some rpmlint stuff
  * configfile

    existing interfaces. Provision new bridge, bond, and vlan
    devices.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=18
This commit is contained in:
Charles Arnold 2010-03-19 17:23:36 +00:00 committed by Git OBS Bridge
parent 3a3978d854
commit f059e04d7b
18 changed files with 239 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ready
View File

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

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

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

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

55
virt-manager.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Thu Mar 18 11:19:11 MDT 2010 - carnold@novell.com
- bnc#588391 - Send Key in virt-viewer does not work with Netware
VM's
-------------------------------------------------------------------
Wed Mar 17 16:11:50 MDT 2010 - carnold@novell.com
- Don't automatically connect to xen in the virt-manager.desktop
file. This results in an error dialog when only KVM is installed
-------------------------------------------------------------------
Mon Mar 15 11:20:25 MDT 2010 - carnold@novell.com
- bnc#588215 - virt-manager/vminstall can't install new KVM Guests
-------------------------------------------------------------------
Fri Mar 5 16:07:05 MST 2010 - jfehlig@novell.com
- bnc#585990 - Fix add/remove device for active Xen guests.
virtman-device-flags.diff
-------------------------------------------------------------------
Tue Feb 23 14:20:52 CST 2010 - jsong@novell.com
- virtinst-storage-ocfs2.diff (Xin Wei Hu)
* add ocfs2 to pool of dir (Filesystem Directory) type in libvirt
-------------------------------------------------------------------
Mon Feb 15 23:24:12 UTC 2010 - chris@computersalat.de
- cleanup spec
* norootforbuild
* sort TAGS
- some rpmlint stuff
* configfile
-------------------------------------------------------------------
Wed Feb 10 10:52:23 MST 2010 - carnold@novell.com
- Update to virt-manager version 0.8.3
* New ability to manage network interfaces: start, stop, and view
existing interfaces. Provision new bridge, bond, and vlan
devices.
* New option to 'customize VM before install', which allows
adjusting most VM options from the install wizard.
- Update to virtinst version 0.500.2
* virt-install: New option --autostart for setting domain
autostart flag
* virt-install: Allow specifying --host-device with lsusb and
lspci format (0x1234:0x5678 for USB, etc)
* virtinst: New 'Interface' module for building libvirt
interface XML
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 7 12:04:09 MST 2010 - carnold@novell.com Thu Jan 7 12:04:09 MST 2010 - carnold@novell.com

63
virt-manager.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package virt-manager (Version 0.8.2) # spec file for package virt-manager (Version 0.8.3)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -15,24 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: virt-manager
%define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
%define gsysconfdir /etc %define gsysconfdir /etc
%define gconftool /usr/bin/gconftool-2 %define gconftool /usr/bin/gconftool-2
%define virtinst_maj 0 %define virtinst_maj 0
%define virtinst_min 500 %define virtinst_min 500
%define virtinst_rel 1 %define virtinst_rel 2
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
Version: 0.8.2
Release: 1 Name: virt-manager
Summary: Virtual Machine Manager Summary: Virtual Machine Manager
Version: 0.8.3
Release: 4
Group: System/Monitoring Group: System/Monitoring
License: LGPLv2.1+ License: LGPLv2.1+
Url: http://virt-manager.et.redhat.com Url: http://virt-manager.et.redhat.com
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64
Source0: virt-manager-%{version}.tar.bz2 Source0: virt-manager-%{version}.tar.bz2
Source1: %{virtinst_name}.tar.bz2 Source1: %{virtinst_name}.tar.bz2
Patch50: virtman-desktop.diff Patch50: virtman-desktop.diff
@ -46,7 +45,30 @@ Patch57: virtman-manager.diff
Patch58: virtman-help.diff Patch58: virtman-help.diff
Patch59: virtman-keycombo.diff Patch59: virtman-keycombo.diff
Patch60: virtman-autoconnect.diff Patch60: virtman-autoconnect.diff
Patch61: virtman-device-flags.diff
Patch81: virtinst-cdrom.diff Patch81: virtinst-cdrom.diff
Patch82: virtinst-storage-ocfs2.diff
ExclusiveArch: %{ix86} x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
#
#rpmlint BuildRequires: python
BuildRequires: gtk2-devel
BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: scrollkeeper
BuildRequires: intltool
#rpmlint BuildRequires: python-gtk
BuildRequires: python-gtk-devel
BuildRequires: python-gobject2-devel
BuildRequires: gconf2-devel
BuildRequires: desktop-file-utils
BuildRequires: update-desktop-files
# virtinst BuildRequires
BuildRequires: libxml2-python
BuildRequires: python-urlgrabber
BuildRequires: libvirt-python
#
# Requires: pygtk2 >= 1.99.12-6 # Requires: pygtk2 >= 1.99.12-6
Requires: python-gtk Requires: python-gtk
# Requires: gnome-python2-gconf >= 1.99.11-7 # Requires: gnome-python2-gconf >= 1.99.11-7
@ -86,23 +108,6 @@ Requires: netcat
# Add requires for non Xen installations # Add requires for non Xen installations
Requires: python-urlgrabber Requires: python-urlgrabber
Requires: vm-install Requires: vm-install
#rpmlint BuildRequires: python
BuildRequires: gtk2-devel
BuildRequires: python-devel
BuildRequires: gettext
BuildRequires: scrollkeeper
BuildRequires: intltool
#rpmlint BuildRequires: python-gtk
BuildRequires: python-gtk-devel
BuildRequires: python-gobject2-devel
BuildRequires: gconf2-devel
BuildRequires: desktop-file-utils
BuildRequires: update-desktop-files
# virtinst BuildRequires
BuildRequires: libxml2-python
BuildRequires: python-urlgrabber
BuildRequires: libvirt-python
%gconf_schemas_prereq
%description %description
Virtual Machine Manager provides a graphical tool for administering Virtual Machine Manager provides a graphical tool for administering
@ -130,8 +135,10 @@ Authors:
%patch58 -p1 %patch58 -p1
%patch59 -p1 %patch59 -p1
%patch60 -p1 %patch60 -p1
%patch61 -p1
pushd $RPM_BUILD_DIR/%{virtinst_name} pushd $RPM_BUILD_DIR/%{virtinst_name}
%patch81 -p1 %patch81 -p1
%patch82 -p1
popd popd
# sed -i -e "s@sr\@Latn@sr\@latin@" configure # sed -i -e "s@sr\@Latn@sr\@latin@" configure
# mv po/sr@Latn.po po/sr@latin.po # mv po/sr@Latn.po po/sr@latin.po
@ -157,6 +164,7 @@ rm -f $RPM_BUILD_ROOT/usr/share/locale/pl/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/fr/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/fr/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/it/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/it/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/sr/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/sr/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/ru/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/pt_BR/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/pt_BR/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/sr@latin/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/sr@latin/LC_MESSAGES/virtinst.mo
rm -f $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/virtinst.mo
@ -166,7 +174,6 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-image.1
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-install.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-install.1
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-convert.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-convert.1
rm -f $RPM_BUILD_ROOT/usr/share/man/man5/virt-image.5 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/virt-image.5
# rm -f $RPM_BUILD_ROOT/usr/share/virt-manager/virtinst-0.500.3-py2.?.egg-info
popd popd
#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a
#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la
@ -202,7 +209,7 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
%dir %{_datadir}/gconf/schemas %dir %{_datadir}/gconf/schemas
%config %{_datadir}/gconf/schemas/%{name}.schemas %config %{_datadir}/gconf/schemas/%{name}.schemas
%else %else
%{gsysconfdir}/gconf/schemas/%{name}.schemas %config %{gsysconfdir}/gconf/schemas/%{name}.schemas
%endif %endif
%{_bindir}/%{name} %{_bindir}/%{name}
%{_libexecdir}/%{name}-launch %{_libexecdir}/%{name}-launch
@ -233,7 +240,7 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
%dir %{_datadir}/%{name}/virtconv/parsers %dir %{_datadir}/%{name}/virtconv/parsers
%{_datadir}/%{name}/virtconv/parsers/*.py %{_datadir}/%{name}/virtconv/parsers/*.py
%{_datadir}/%{name}/virtconv/parsers/*.pyc %{_datadir}/%{name}/virtconv/parsers/*.pyc
%{_datadir}/%{name}/virtinst-0.500.1-py2.6.egg-info %{_datadir}/%{name}/%{virtinst_name}-py2.6.egg-info
%doc %{_datadir}/gnome/help/%{name}/C/figures/*.png %doc %{_datadir}/gnome/help/%{name}/C/figures/*.png
%doc %{_datadir}/gnome/help/%{name}/C/*.xml %doc %{_datadir}/gnome/help/%{name}/C/*.xml
# FIXME: autobuild complains that these are unowned (not true...) # FIXME: autobuild complains that these are unowned (not true...)

3
virtinst-0.500.1.tar.bz2
View File

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

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

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

10
virtinst-cdrom.diff
View File

@ -1,10 +1,10 @@
Index: virtinst-0.500.1/virtinst/VirtualDisk.py Index: virtinst-0.500.2/virtinst/VirtualDisk.py
=================================================================== ===================================================================
--- virtinst-0.500.1.orig/virtinst/VirtualDisk.py --- virtinst-0.500.2.orig/virtinst/VirtualDisk.py
+++ virtinst-0.500.1/virtinst/VirtualDisk.py +++ virtinst-0.500.2/virtinst/VirtualDisk.py
@@ -1354,14 +1354,18 @@ class VirtualDisk(VirtualDevice): @@ -1370,14 +1370,18 @@ class VirtualDisk(VirtualDevice):
self.target = "hdc"
return self.target return self.target
raise ValueError(_("IDE CDROM must use 'hdc', but target in use."))
- # Regular scanning - # Regular scanning
+ # Start cdrom at 'c' and skip 'c' for non-cdrom + # Start cdrom at 'c' and skip 'c' for non-cdrom

11
virtinst-storage-ocfs2.diff Normal file
View File

@ -0,0 +1,11 @@
--- virtinst-0.500.2.orig/virtinst/Storage.py Tue Feb 23 13:54:26 2010 +0800
+++ virtinst-0.500.2/virtinst/Storage.py Tue Feb 23 13:58:59 2010 +0800
@@ -519,7 +519,7 @@
get_volume_class = staticmethod(get_volume_class)
formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf",
- "gfs", "gfs2", "vfat", "hfs+", "xfs" ]
+ "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2" ]
# Register applicable property methods from parent class
perms = property(StorageObject.get_perms, StorageObject.set_perms)

8
virtman-autoconnect.diff
View File

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

6
virtman-cdrom.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.2/src/virtManager/addhardware.py Index: virt-manager-0.8.3/src/virtManager/addhardware.py
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/virtManager/addhardware.py --- virt-manager-0.8.3.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.2/src/virtManager/addhardware.py +++ virt-manager-0.8.3/src/virtManager/addhardware.py
@@ -465,6 +465,7 @@ class vmmAddHardware(gobject.GObject): @@ -465,6 +465,7 @@ class vmmAddHardware(gobject.GObject):
if self.vm.get_hv_type() == "kvm": if self.vm.get_hv_type() == "kvm":
add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk") add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk")

22
virtman-desktop.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.2/src/Makefile.am Index: virt-manager-0.8.3/src/Makefile.am
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/Makefile.am --- virt-manager-0.8.3.orig/src/Makefile.am
+++ virt-manager-0.8.2/src/Makefile.am +++ virt-manager-0.8.3/src/Makefile.am
@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch @@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir) gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade) glade_DATA = $(wildcard $(srcdir)/*.glade)
@ -11,10 +11,10 @@ Index: virt-manager-0.8.2/src/Makefile.am
desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop desktop_DATA = $(PACKAGE).desktop
Index: virt-manager-0.8.2/src/Makefile.in Index: virt-manager-0.8.3/src/Makefile.in
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/Makefile.in --- virt-manager-0.8.3.orig/src/Makefile.in
+++ virt-manager-0.8.2/src/Makefile.in +++ virt-manager-0.8.3/src/Makefile.in
@@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in @@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
libexec_SCRIPTS = $(PACKAGE)-launch libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir) gladedir = $(pkgdatadir)
@ -24,10 +24,10 @@ Index: virt-manager-0.8.2/src/Makefile.in
desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services dbusdir = $(datadir)/dbus-1/services
Index: virt-manager-0.8.2/src/virt-manager.desktop.in.in Index: virt-manager-0.8.3/src/virt-manager.desktop.in.in
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/virt-manager.desktop.in.in --- virt-manager-0.8.3.orig/src/virt-manager.desktop.in.in
+++ virt-manager-0.8.2/src/virt-manager.desktop.in.in +++ virt-manager-0.8.3/src/virt-manager.desktop.in.in
@@ -1,9 +1,20 @@ @@ -1,9 +1,20 @@
[Desktop Entry] [Desktop Entry]
_Name=Virtual Machine Manager _Name=Virtual Machine Manager
@ -36,7 +36,7 @@ Index: virt-manager-0.8.2/src/virt-manager.desktop.in.in
-Exec=::PACKAGE:: -Exec=::PACKAGE::
+Version=1.0 +Version=1.0
+Icon=yast-vm-management +Icon=yast-vm-management
+Exec=/usr/bin/virt-manager -c xen:/// +Exec=/usr/bin/virt-manager
Type=Application Type=Application
Terminal=false Terminal=false
Encoding=UTF-8 Encoding=UTF-8
@ -46,7 +46,7 @@ Index: virt-manager-0.8.2/src/virt-manager.desktop.in.in
+X-KDE-RootOnly=true +X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=false +X-KDE-HasReadOnlyMode=false
+X-KDE-Library=yast2 +X-KDE-Library=yast2
+X-SuSE-YaST-Call=/usr/bin/virt-manager -- -c xen:/// +X-SuSE-YaST-Call=/usr/bin/virt-manager
+X-SuSE-YaST-Group=Virtualization +X-SuSE-YaST-Group=Virtualization
+X-SuSE-YaST-Argument= +X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-RootOnly=true

71
virtman-device-flags.diff Normal file
View File

@ -0,0 +1,71 @@
Index: virt-manager-0.8.3/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.3/src/virtManager/addhardware.py
@@ -1047,6 +1047,18 @@ class vmmAddHardware(gobject.GObject):
self._dev.get_xml_config()
logging.debug("Adding device:\n" + self._dev.get_xml_config())
+ # If vm is active, Try to hotplug the device and modify persistent
+ # config in one go
+ if self.vm.is_active():
+ try:
+ self.vm.attach_device_flags(self._dev, 3)
+ return (False, None)
+ except Exception, e:
+ logging.debug("Could not hotplug device and modify persistent "
+ "config at the same time: %s" % str(e))
+ logging.debug("Trying the operations seperately ...")
+
+ # Try hotplug then modify persistent config
# Hotplug device
attach_err = False
try:
Index: virt-manager-0.8.3/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/details.py
+++ virt-manager-0.8.3/src/virtManager/details.py
@@ -1194,6 +1194,17 @@ class vmmDetails(gobject.GObject):
return
self.config.set_confirm_removedev(not skip_prompt)
+ # If vm is running, try to hot remove the device and modify
+ # persistent config in one go
+ if self.vm.is_active():
+ try:
+ self.vm.detach_device_flags(dev_type, dev_id_info, 3)
+ return
+ except Exception, e:
+ logging.debug("Could not hot remove device and modify "
+ "persistent config at the same time: %s" % str(e))
+ logging.debug("Trying the operations seperately ...")
+
# Define the change
try:
self.vm.remove_device(dev_type, dev_id_info)
Index: virt-manager-0.8.3/src/virtManager/domain.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/domain.py
+++ virt-manager-0.8.3/src/virtManager/domain.py
@@ -1286,6 +1286,10 @@ class vmmDomain(vmmDomainBase):
xml = devobj.get_xml_config()
self._backend.attachDevice(xml)
+ def attach_device_flags(self, devobj, flags):
+ xml = devobj.get_xml_config()
+ self._backend.attachDeviceFlags(xml, flags)
+
def detach_device(self, devtype, dev_id_info):
"""
Hotunplug device from running guest
@@ -1294,6 +1298,10 @@ class vmmDomain(vmmDomainBase):
if self.is_active():
self._backend.detachDevice(xml)
+ def detach_device_flags(self, devtype, dev_id_info, flags):
+ xml = self._get_device_xml(devtype, dev_id_info)
+ self._backend.detachDeviceFlags(xml, flags)
+
def hotplug_vcpus(self, vcpus):
vcpus = int(vcpus)
if vcpus != self.vcpu_count():

6
virtman-help.diff
View File

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

38
virtman-keycombo.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.2/src/vmm-details.glade Index: virt-manager-0.8.3/src/vmm-details.glade
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/vmm-details.glade --- virt-manager-0.8.3.orig/src/vmm-details.glade
+++ virt-manager-0.8.2/src/vmm-details.glade +++ virt-manager-0.8.3/src/vmm-details.glade
@@ -339,11 +339,85 @@ @@ -339,11 +339,85 @@
</widget> </widget>
</child> </child>
@ -10,7 +10,7 @@ Index: virt-manager-0.8.2/src/vmm-details.glade
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="label" translatable="yes">Alt+Shift+Shift+Esc</property> + <property name="label" translatable="yes">Alt+Shift+Shift+Esc</property>
+ <property name="use_underline">False</property> + <property name="use_underline">False</property>
+ <signal name="activate" handler="on_menu_send_assesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/> + <signal name="activate" handler="on_details_menu_send_assesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget> + </widget>
+ </child> + </child>
+ <child> + <child>
@ -23,7 +23,7 @@ Index: virt-manager-0.8.2/src/vmm-details.glade
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="label" translatable="yes">A_lt+F10</property> + <property name="label" translatable="yes">A_lt+F10</property>
+ <property name="use_underline">True</property> + <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menu_send_af10_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/> + <signal name="activate" handler="on_details_menu_send_af10_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget> + </widget>
+ </child> + </child>
+ <child> + <child>
@ -31,15 +31,15 @@ Index: virt-manager-0.8.2/src/vmm-details.glade
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="label" translatable="yes">Alt+_Tab</property> + <property name="label" translatable="yes">Alt+_Tab</property>
+ <property name="use_underline">True</property> + <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menu_send_atab_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/> + <signal name="activate" handler="on_details_menu_send_atab_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget> + </widget>
+ </child> + </child>
+ <child> + <child>
+ <widget class="GtkMenuItem" id="details-menu-send-astab"> + <widget class="GtkMenuItem" id="details-menu-send-aesc">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="label" translatable="yes">_Alt+Esc</property> + <property name="label" translatable="yes">_Alt+Esc</property>
+ <property name="use_underline">True</property> + <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menu_send_aesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/> + <signal name="activate" handler="on_details_menu_send_aesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget> + </widget>
+ </child> + </child>
+ <child> + <child>
@ -47,7 +47,7 @@ Index: virt-manager-0.8.2/src/vmm-details.glade
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="label" translatable="yes">_Ctrl+Esc</property> + <property name="label" translatable="yes">_Ctrl+Esc</property>
+ <property name="use_underline">True</property> + <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menu_send_cesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/> + <signal name="activate" handler="on_details_menu_send_cesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget> + </widget>
+ </child> + </child>
+ <child> + <child>
@ -55,7 +55,7 @@ Index: virt-manager-0.8.2/src/vmm-details.glade
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="label" translatable="yes">Ctrl+Alt+_Esc</property> + <property name="label" translatable="yes">Ctrl+Alt+_Esc</property>
+ <property name="use_underline">True</property> + <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menu_send_caesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/> + <signal name="activate" handler="on_details_menu_send_caesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget> + </widget>
+ </child> + </child>
+ <child> + <child>
@ -68,7 +68,7 @@ Index: virt-manager-0.8.2/src/vmm-details.glade
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="label" translatable="yes">_F8</property> + <property name="label" translatable="yes">_F8</property>
+ <property name="use_underline">True</property> + <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menu_send_f8_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/> + <signal name="activate" handler="on_details_menu_send_f8_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/>
+ </widget> + </widget>
+ </child> + </child>
+ <child> + <child>
@ -76,7 +76,7 @@ Index: virt-manager-0.8.2/src/vmm-details.glade
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="label" translatable="yes">F1_0</property> + <property name="label" translatable="yes">F1_0</property>
+ <property name="use_underline">True</property> + <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menu_send_f10_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/> + <signal name="activate" handler="on_details_menu_send_f10_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/>
+ </widget> + </widget>
+ </child> + </child>
+ <child> + <child>
@ -97,11 +97,11 @@ Index: virt-manager-0.8.2/src/vmm-details.glade
<property name="visible">True</property> <property name="visible">True</property>
</widget> </widget>
</child> </child>
Index: virt-manager-0.8.2/src/virtManager/details.py Index: virt-manager-0.8.3/src/virtManager/details.py
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/virtManager/details.py --- virt-manager-0.8.3.orig/src/virtManager/details.py
+++ virt-manager-0.8.2/src/virtManager/details.py +++ virt-manager-0.8.3/src/virtManager/details.py
@@ -240,6 +240,14 @@ class vmmDetails(gobject.GObject): @@ -259,6 +259,14 @@ class vmmDetails(gobject.GObject):
"on_details_menu_send_cad_activate": self.console.send_key, "on_details_menu_send_cad_activate": self.console.send_key,
"on_details_menu_send_cab_activate": self.console.send_key, "on_details_menu_send_cab_activate": self.console.send_key,
@ -116,10 +116,10 @@ Index: virt-manager-0.8.2/src/virtManager/details.py
"on_details_menu_send_caf1_activate": self.console.send_key, "on_details_menu_send_caf1_activate": self.console.send_key,
"on_details_menu_send_caf2_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, "on_details_menu_send_caf3_activate": self.console.send_key,
Index: virt-manager-0.8.2/src/virtManager/console.py Index: virt-manager-0.8.3/src/virtManager/console.py
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/virtManager/console.py --- virt-manager-0.8.3.orig/src/virtManager/console.py
+++ virt-manager-0.8.2/src/virtManager/console.py +++ virt-manager-0.8.3/src/virtManager/console.py
@@ -321,6 +321,22 @@ class vmmConsolePages(gobject.GObject): @@ -321,6 +321,22 @@ class vmmConsolePages(gobject.GObject):
keys = ["Control_L", "Alt_L", "Delete"] keys = ["Control_L", "Alt_L", "Delete"]
elif src.get_name() == "details-menu-send-cab": elif src.get_name() == "details-menu-send-cab":

8
virtman-kvm.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.2/src/virt-manager.py.in Index: virt-manager-0.8.3/src/virt-manager.py.in
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/virt-manager.py.in --- virt-manager-0.8.3.orig/src/virt-manager.py.in
+++ virt-manager-0.8.2/src/virt-manager.py.in +++ virt-manager-0.8.3/src/virt-manager.py.in
@@ -198,7 +198,8 @@ def default_uri(): @@ -209,7 +209,8 @@ def default_uri():
tryuri = "xen:///" tryuri = "xen:///"
elif (os.path.exists("/usr/bin/qemu") or elif (os.path.exists("/usr/bin/qemu") or
os.path.exists("/usr/bin/qemu-kvm") or os.path.exists("/usr/bin/qemu-kvm") or

8
virtman-netcat.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.2/src/virtManager/console.py Index: virt-manager-0.8.3/src/virtManager/console.py
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/virtManager/console.py --- virt-manager-0.8.3.orig/src/virtManager/console.py
+++ virt-manager-0.8.2/src/virtManager/console.py +++ virt-manager-0.8.3/src/virtManager/console.py
@@ -506,7 +506,7 @@ class vmmConsolePages(gobject.GObject): @@ -505,7 +505,7 @@ class vmmConsolePages(gobject.GObject):
if username: if username:
argv += ['-l', username] argv += ['-l', username]

11
virtman-vminstall.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.2/src/virtManager/engine.py Index: virt-manager-0.8.3/src/virtManager/engine.py
=================================================================== ===================================================================
--- virt-manager-0.8.2.orig/src/virtManager/engine.py --- virt-manager-0.8.3.orig/src/virtManager/engine.py
+++ virt-manager-0.8.2/src/virtManager/engine.py +++ virt-manager-0.8.3/src/virtManager/engine.py
@@ -38,7 +38,8 @@ from virtManager.manager import vmmManag @@ -38,7 +38,8 @@ from virtManager.manager import vmmManag
from virtManager.migrate import vmmMigrateDialog from virtManager.migrate import vmmMigrateDialog
from virtManager.details import vmmDetails from virtManager.details import vmmDetails
@ -12,7 +12,7 @@ Index: virt-manager-0.8.2/src/virtManager/engine.py
from virtManager.host import vmmHost from virtManager.host import vmmHost
from virtManager.error import vmmErrorDialog from virtManager.error import vmmErrorDialog
from virtManager.systray import vmmSystray from virtManager.systray import vmmSystray
@@ -435,13 +436,24 @@ class vmmEngine(gobject.GObject): @@ -436,13 +437,27 @@ class vmmEngine(gobject.GObject):
return False return False
return True return True
@ -22,7 +22,10 @@ Index: virt-manager-0.8.2/src/virtManager/engine.py
def show_create(self, uri): def show_create(self, uri):
if self.windowCreate == None: if self.windowCreate == None:
- create = vmmCreate(self.get_config(), self) - create = vmmCreate(self.get_config(), self)
+ try:
+ create = vmmCreate(virtman=True,key=0) + create = vmmCreate(virtman=True,key=0)
+ except Exception, e:
+ self.err.show_err("%s" % str(e),"".join(traceback.format_exc()))
create.connect("action-show-console", self._do_show_console) create.connect("action-show-console", self._do_show_console)
- create.connect("action-show-help", self._do_show_help) - create.connect("action-show-help", self._do_show_help)
+ create.connect("vmmcreate-closing", self._vmmcreate_closing) + create.connect("vmmcreate-closing", self._vmmcreate_closing)