9dab6bfcb9
530f80f5-handle-missing-storage-volumes.patch 5310bd89-console-fix-unsetting-resize-guest.patch 5310e3ac-set-show_arrow-to-true.patch 5310e3ac-vmmConsolePages-toggle-visibilities-on-page-change.patch 5310e3ac-vmmDetails-toggle-visibilities-on-page-change.patch 5310e52d-fix-setting-default-window-size.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=147
72 lines
2.9 KiB
Diff
72 lines
2.9 KiB
Diff
Index: virt-manager-1.0.0/virtManager/addhardware.py
|
|
===================================================================
|
|
--- virt-manager-1.0.0.orig/virtManager/addhardware.py
|
|
+++ virt-manager-1.0.0/virtManager/addhardware.py
|
|
@@ -1287,6 +1287,18 @@ class vmmAddHardware(vmmGObjectUI):
|
|
if controller is not None:
|
|
logging.debug("Adding controller:\n%s",
|
|
controller.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 ...")
|
|
+
|
|
# Hotplug device
|
|
attach_err = False
|
|
try:
|
|
Index: virt-manager-1.0.0/virtManager/details.py
|
|
===================================================================
|
|
--- virt-manager-1.0.0.orig/virtManager/details.py
|
|
+++ virt-manager-1.0.0/virtManager/details.py
|
|
@@ -2278,6 +2278,17 @@ class vmmDetails(vmmGObjectUI):
|
|
text1=(_("Are you sure you want to remove this device?"))):
|
|
return
|
|
|
|
+ # 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-1.0.0/virtManager/domain.py
|
|
===================================================================
|
|
--- virt-manager-1.0.0.orig/virtManager/domain.py
|
|
+++ virt-manager-1.0.0/virtManager/domain.py
|
|
@@ -898,6 +898,10 @@ class vmmDomain(vmmLibvirtObject):
|
|
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
|
|
@@ -916,6 +920,10 @@ class vmmDomain(vmmLibvirtObject):
|
|
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():
|