NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Guest: Drop add_device set_defaults option

Browse Source 
Was only used to fix one bug, but has too many side effects. Just
fix it at the caller.
This commit is contained in:
Cole Robinson 2013-07-25 14:11:09 -04:00
parent 695c4b7189
commit bf7773ce58
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
virtManager/addhardware.py
View File

@ -73,11 +73,12 @@ tpm_widget_mappings = {
class vmmAddHardware(vmmGObjectUI): class vmmAddHardware(vmmGObjectUI):
def __init__(self, vm): def __init__(self, vm, is_customize_dialog):
vmmGObjectUI.__init__(self, "vmm-add-hardware.ui", "vmm-add-hardware") vmmGObjectUI.__init__(self, "vmm-add-hardware.ui", "vmm-add-hardware")
self.vm = vm self.vm = vm
self.conn = vm.conn self.conn = vm.conn
self.is_customize_dialog = is_customize_dialog
self.storage_browser = None self.storage_browser = None
@ -1340,13 +1341,14 @@ class vmmAddHardware(vmmGObjectUI):
return self.err.val_err(_("Storage parameter error."), e) return self.err.val_err(_("Storage parameter error."), e)
# Generate target # Generate target
used = [] if not self.is_customize_dialog:
disks = (self.vm.get_disk_devices() + used = []
self.vm.get_disk_devices(inactive=True)) disks = (self.vm.get_disk_devices() +
for d in disks: self.vm.get_disk_devices(inactive=True))
used.append(d.target) for d in disks:
used.append(d.target)
disk.generate_target(used) disk.generate_target(used)
isfatal, errmsg = disk.is_size_conflict() isfatal, errmsg = disk.is_size_conflict()
if not isfatal and errmsg: if not isfatal and errmsg:

2
virtManager/create.py
View File

@ -1724,7 +1724,7 @@ class vmmCreate(vmmGObjectUI):
self.conn, disk.path) self.conn, disk.path)
self.disk = disk self.disk = disk
self.guest.add_device(self.disk, set_defaults=True) self.guest.add_device(self.disk)
return True return True

2
virtManager/details.py
View File

@ -1518,7 +1518,7 @@ class vmmDetails(vmmGObjectUI):
def add_hardware(self, src_ignore): def add_hardware(self, src_ignore):
try: try:
if self.addhw is None: if self.addhw is None:
self.addhw = vmmAddHardware(self.vm) self.addhw = vmmAddHardware(self.vm, self.is_customize_dialog)
self.addhw.show(self.topwin) self.addhw.show(self.topwin)
except Exception, e: except Exception, e:

11
virtinst/Guest.py
View File

@ -330,7 +330,7 @@ class Guest(XMLBuilder):
newlist.append(i) newlist.append(i)
return newlist return newlist
def add_device(self, dev, set_defaults=False): def add_device(self, dev):
""" """
Add the passed device to the guest's device list. Add the passed device to the guest's device list.
@ -341,15 +341,6 @@ class Guest(XMLBuilder):
self._add_child(dev) self._add_child(dev)
self._recalculate_device_xpaths() self._recalculate_device_xpaths()
if set_defaults:
origdev = self._devices
try:
self._devices = [dev]
self._set_device_defaults()
except:
self._devices = origdev
def _track_device(self, dev): def _track_device(self, dev):
self._devices.append(dev) self._devices.append(dev)