From a142560df55a454f0fe6363aab4775a948c24965 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 21 Oct 2012 14:43:44 -0400 Subject: [PATCH] addhw: Only show progress dialog if creating storage --- src/virtManager/addhardware.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py index 975eac5d8..4d894ebc8 100644 --- a/src/virtManager/addhardware.py +++ b/src/virtManager/addhardware.py @@ -1114,12 +1114,7 @@ class vmmAddHardware(vmmGObjectUI): # Add device methods # ###################### - def setup_device(self): - if (self._dev.virtual_device_type != - virtinst.VirtualDevice.VIRTUAL_DEV_DISK): - self._dev.setup_dev(self.conn.vmm) - return - + def _storage_progress(self): def do_file_allocate(asyncjob, disk): meter = asyncjob.get_meter() @@ -1141,6 +1136,12 @@ class vmmAddHardware(vmmGObjectUI): return progWin.run() + def setup_device(self): + if (self._dev.virtual_device_type == self._dev.VIRTUAL_DEV_DISK and + self._dev.creating_storage()): + return self._storage_progress() + + return self._dev.setup_dev(self.conn.vmm) def add_device(self): ret = self.setup_device()