shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-23 17:34:21 +03:00
Code Issues Projects Releases Wiki Activity

addhw: Have all device creation go through the same code path.

Browse Source
This commit is contained in:
Cole Robinson 2010-02-06 15:59:52 -05:00
parent 74222abfb8
commit e6ea45aa8e
1 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/virtManager/addhardware.py
View File

@ -873,14 +873,10 @@ class vmmAddHardware(gobject.GObject):
self.topwin.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
try:
if hw == PAGE_DISK:
func = self.add_storage
else:
func = self.add_device
errinfo = func()
failure, errinfo = self.add_device()
error, details = errinfo or (None, None)
except Exception, e:
failure = True
error = _("Unable to add device: %s") % str(e)
details = "".join(traceback.format_exc())
@ -890,7 +886,7 @@ class vmmAddHardware(gobject.GObject):
self.topwin.set_sensitive(True)
self.topwin.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.TOP_LEFT_ARROW))
if not error:
if not failure:
self.close()
# Storage listeners
@ -1026,32 +1022,30 @@ class vmmAddHardware(gobject.GObject):
# Add device methods #
######################
def add_storage(self):
used = []
disks = (self.vm.get_disk_devices() +
self.vm.get_disk_devices(inactive=True))
for d in disks:
used.append(d[2])
self._dev.generate_target(used)
progWin = vmmAsyncJob(self.config, self.do_file_allocate, [self._dev],
def setup_device(self):
if (self._dev.virtual_device_type ==
virtinst.VirtualDevice.VIRTUAL_DEV_DISK):
progWin = vmmAsyncJob(self.config, self.do_file_allocate,
[self._dev],
title=_("Creating Storage File"),
text=_("Allocation of disk storage may take "
"a few minutes to complete."))
progWin.run()
error, details = progWin.get_error()
if error == None:
self.add_device(self._dev.get_xml_config())
else:
if error:
return (error, details)
def add_device(self, xml=None):
if not xml:
else:
self._dev.setup_dev(self.conn.vmm)
xml = self._dev.get_xml_config()
def add_device(self):
ret = self.setup_device()
if ret:
# Encountered an error
return (True, ret)
xml = self._dev.get_xml_config()
logging.debug("Adding device:\n" + xml)
# Hotplug device
@ -1069,7 +1063,7 @@ class vmmAddHardware(gobject.GObject):
"the running machine. Would you like to "
"make the device available after the "
"next VM shutdown?")):
return
return (False, None)
# Alter persistent config
try:
@ -1077,7 +1071,9 @@ class vmmAddHardware(gobject.GObject):
except Exception, e:
self.err.show_err(_("Error adding device: %s" % str(e)),
"".join(traceback.format_exc()))
return
return (True, None)
return (False, None)
def do_file_allocate(self, disk, asyncjob):
meter = vmmCreateMeter(asyncjob)
@ -1089,7 +1085,7 @@ class vmmAddHardware(gobject.GObject):
newconn = util.dup_lib_conn(self.config, disk.conn)
disk.conn = newconn
logging.debug("Starting background file allocate process")
disk.setup(meter)
disk.setup_dev(self.conn.vmm, meter=meter)
logging.debug("Allocation completed")
except Exception, e:
details = (_("Unable to complete install: '%s'") %
@ -1181,11 +1177,19 @@ class vmmAddHardware(gobject.GObject):
if not res:
return False
# Generate target
used = []
disks = (self.vm.get_disk_devices() +
self.vm.get_disk_devices(inactive=True))
for d in disks:
used.append(d[2])
self._dev.generate_target(used)
uihelpers.check_path_search_for_qemu(self.topwin, self.config,
self.conn, self._dev.path)
def validate_page_network(self):
nettype, devname = self.get_config_network()
mac = self.get_config_macaddr()