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

Accepting request 35386 from Virtualization

Browse Source 
checked in (request 35386)

OBS-URL: https://build.opensuse.org/request/show/35386
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=19
This commit is contained in:
OBS User autobuild 2010-03-21 10:56:53 +00:00 committed by Git OBS Bridge
parent f059e04d7b
commit 4f9fe666dd
6 changed files with 21 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
virt-manager.changes
View File

@ -1,26 +1,3 @@
-------------------------------------------------------------------
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
@ -30,19 +7,9 @@ Tue Feb 23 14:20:52 CST 2010 - jsong@novell.com
-------------------------------------------------------------------
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.
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
@ -52,7 +19,12 @@ Wed Feb 10 10:52:23 MST 2010 - carnold@novell.com
lspci format (0x1234:0x5678 for USB, etc)
* virtinst: New 'Interface' module for building libvirt
interface XML
- cleanup spec
* norootforbuild
* sort TAGS
- some rpmlint stuff
* configfile
-------------------------------------------------------------------
Thu Jan 7 12:04:09 MST 2010 - carnold@novell.com

4
virt-manager.spec
View File

@ -28,7 +28,7 @@
Name: virt-manager
Summary: Virtual Machine Manager
Version: 0.8.3
Release: 4
Release: 1
Group: System/Monitoring
License: LGPLv2.1+
Url: http://virt-manager.et.redhat.com
@ -45,7 +45,6 @@ Patch57: virtman-manager.diff
Patch58: virtman-help.diff
Patch59: virtman-keycombo.diff
Patch60: virtman-autoconnect.diff
Patch61: virtman-device-flags.diff
Patch81: virtinst-cdrom.diff
Patch82: virtinst-storage-ocfs2.diff
ExclusiveArch: %{ix86} x86_64
@ -135,7 +134,6 @@ Authors:
%patch58 -p1
%patch59 -p1
%patch60 -p1
%patch61 -p1
pushd $RPM_BUILD_DIR/%{virtinst_name}
%patch81 -p1
%patch82 -p1

4
virtman-desktop.diff
View File

@ -36,7 +36,7 @@ Index: virt-manager-0.8.3/src/virt-manager.desktop.in.in
-Exec=::PACKAGE::
+Version=1.0
+Icon=yast-vm-management
+Exec=/usr/bin/virt-manager
+Exec=/usr/bin/virt-manager -c xen:///
Type=Application
Terminal=false
Encoding=UTF-8
@ -46,7 +46,7 @@ Index: virt-manager-0.8.3/src/virt-manager.desktop.in.in
+X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=false
+X-KDE-Library=yast2
+X-SuSE-YaST-Call=/usr/bin/virt-manager
+X-SuSE-YaST-Call=/usr/bin/virt-manager -- -c xen:///
+X-SuSE-YaST-Group=Virtualization
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true

71
virtman-device-flags.diff
View File

@ -1,71 +0,0 @@
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():

18
virtman-keycombo.diff
View File

@ -10,7 +10,7 @@ Index: virt-manager-0.8.3/src/vmm-details.glade
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Alt+Shift+Shift+Esc</property>
+ <property name="use_underline">False</property>
+ <signal name="activate" handler="on_details_menu_send_assesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ <signal name="activate" handler="on_menu_send_assesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
@ -23,7 +23,7 @@ Index: virt-manager-0.8.3/src/vmm-details.glade
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">A_lt+F10</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_af10_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ <signal name="activate" handler="on_menu_send_af10_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
@ -31,15 +31,15 @@ Index: virt-manager-0.8.3/src/vmm-details.glade
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Alt+_Tab</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_atab_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ <signal name="activate" handler="on_menu_send_atab_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-aesc">
+ <widget class="GtkMenuItem" id="details-menu-send-astab">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Alt+Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_aesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ <signal name="activate" handler="on_menu_send_aesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
@ -47,7 +47,7 @@ Index: virt-manager-0.8.3/src/vmm-details.glade
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Ctrl+Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_cesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ <signal name="activate" handler="on_menu_send_cesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
@ -55,7 +55,7 @@ Index: virt-manager-0.8.3/src/vmm-details.glade
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Ctrl+Alt+_Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_caesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ <signal name="activate" handler="on_menu_send_caesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
@ -68,7 +68,7 @@ Index: virt-manager-0.8.3/src/vmm-details.glade
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_F8</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_f8_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/>
+ <signal name="activate" handler="on_menu_send_f8_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/>
+ </widget>
+ </child>
+ <child>
@ -76,7 +76,7 @@ Index: virt-manager-0.8.3/src/vmm-details.glade
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">F1_0</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_f10_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/>
+ <signal name="activate" handler="on_menu_send_f10_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/>
+ </widget>
+ </child>
+ <child>

7
virtman-vminstall.diff
View File

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