virt-manager/virtman-device-flags.diff
Charles Arnold 4ad8024558 - Update to virt-manager 0.8.6
* SPICE support (requires spice-gtk) (Marc-André Lureau)
  * Option to configure CPU model
  * Option to configure CPU topology
  * Save and migration cancellation (Wen Congyang)
  * Save and migration progress reporting
  * Option to enable bios boot menu
  * Option to configure direct kernel/initrd boot
- Update to virtinst 0.500.5
  * New virt-install --cpu option for configuring CPU 
    model/features
  * virt-install --vcpus option can not specify topology and 
    maxvcpus
  * New virt-install --graphics option to unify --vnc, --sdl, 
    spice config
  * New virt-install --print-xml option to skip install and print 
    XML

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=48
2011-03-21 19:38:43 +00:00

72 lines
3.0 KiB
Diff

Index: virt-manager-0.8.6/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.8.6.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.6/src/virtManager/addhardware.py
@@ -906,6 +906,18 @@ class vmmAddHardware(vmmGObjectUI):
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.6/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.6.orig/src/virtManager/details.py
+++ virt-manager-0.8.6/src/virtManager/details.py
@@ -1770,6 +1770,17 @@ class vmmDetails(vmmGObjectUI):
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_id_info)
Index: virt-manager-0.8.6/src/virtManager/domain.py
===================================================================
--- virt-manager-0.8.6.orig/src/virtManager/domain.py
+++ virt-manager-0.8.6/src/virtManager/domain.py
@@ -1158,6 +1158,10 @@ class vmmDomain(vmmDomainBase):
devxml = devobj.get_xml_config()
self._backend.attachDevice(devxml)
+ def attach_device_flags(self, devobj, flags):
+ xml = devobj.get_xml_config()
+ self._backend.attachDeviceFlags(xml, flags)
+
def detach_device(self, devobj):
"""
Hotunplug device from running guest
@@ -1176,6 +1180,10 @@ class vmmDomain(vmmDomainBase):
xml = devobj.get_xml_config()
self._backend.updateDeviceFlags(xml, flags)
+ 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():