[virt-tools-list] [virt-manager PATCH] addhardware: generate target only if not customizing

Martin Kletzander mkletzan at redhat.com
Tue Feb 18 12:27:34 UTC 2014


Commit 078e1a4d0503d98884b5b61df83021941bf32e8d changed the fact that
disk target was generated only when adding new disk, not when current
disk is being customized, so fix that back.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 virtManager/addhardware.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py
index ecb5fc8..b1f6251 100644
--- a/virtManager/addhardware.py
+++ b/virtManager/addhardware.py
@@ -1471,20 +1471,22 @@ class vmmAddHardware(vmmGObjectUI):
             return disk

         try:
+            used = []
             disk.bus = bus
             if cache:
                 disk.driver_cache = cache

             # Generate target
             if not self.is_customize_dialog:
-                used = []
                 disks = (self.vm.get_disk_devices() +
                          self.vm.get_disk_devices(inactive=True))
                 for d in disks:
                     used.append(d.target)

             prefer_ctrl = self._set_disk_controller(disk, controller_model, disks)
-            disk.generate_target(used, prefer_ctrl)
+
+            if not self.is_customize_dialog:
+                disk.generate_target(used, prefer_ctrl)

         except Exception, e:
             return self.err.val_err(_("Storage parameter error."), e)
-- 
1.9.0




More information about the virt-tools-list mailing list