devices: disk: Rename setup() to build_storage()

It's more explicit. Plus drop the supposedly generic setup()
entry point, storage is handled specially everywhere so it's
not a generic interface

5 files changed, 6 insertions, 18 deletions

diff --git a/virtinst/cloner.py b/virtinst/cloner.py
index c8c85db6..ba89a26f 100644
--- a/virtinst/cloner.py
+++ b/virtinst/cloner.py
@@ -454,9 +454,9 @@ class Cloner(object):
 
             if self.preserve:
                 for dst_dev in self.clone_disks:
-                    dst_dev.setup(meter=meter)
+                    dst_dev.build_storage(meter)
                 if self._nvram_disk:
-                    self._nvram_disk.setup(meter=meter)
+                    self._nvram_disk.build_storage(meter)
         except Exception as e:
             logging.debug("Duplicate failed: %s", str(e))
             if dom:
diff --git a/virtinst/devices/device.py b/virtinst/devices/device.py
index 32fab455..7763feee 100644
--- a/virtinst/devices/device.py
+++ b/virtinst/devices/device.py
@@ -119,14 +119,3 @@ class Device(XMLBuilder):
     @property
     def DEVICE_TYPE(self):
         return self.XML_NAME
-
-    def setup(self, meter=None):
-        """
-        Perform potentially hazardous device initialization, like
-        storage creation or host device reset
-
-        :param meter: Optional progress meter to use
-        """
-        # Will be overwritten by subclasses if necessary.
-        ignore = meter
-        return
diff --git a/virtinst/devices/disk.py b/virtinst/devices/disk.py
index 3591bea0..186cf083 100644
--- a/virtinst/devices/disk.py
+++ b/virtinst/devices/disk.py
@@ -910,7 +910,7 @@ class DeviceDisk(Device):
 
         self._storage_backend.validate(self)
 
-    def setup(self, meter=None):
+    def build_storage(self, meter):
         """
         Build storage (if required)
 
diff --git a/virtinst/installer.py b/virtinst/installer.py
index 402ccf8d..d9588ba7 100644
--- a/virtinst/installer.py
+++ b/virtinst/installer.py
@@ -393,10 +393,9 @@ class Installer(object):
             self._cleanup(guest)
             self._prepare(guest, meter)
 
-            # Create devices if required (disk images, etc.)
             if not dry:
-                for dev in guest.devices.get_all():
-                    dev.setup(meter)
+                for dev in guest.devices.disk:
+                    dev.build_storage(meter)
 
             install_xml, final_xml = self._build_xml(guest)
             if return_xml:
diff --git a/virtinst/kernelupload.py b/virtinst/kernelupload.py
index e6e500be..3524282b 100644
--- a/virtinst/kernelupload.py
+++ b/virtinst/kernelupload.py
@@ -68,7 +68,7 @@ def _upload_file(conn, meter, destpool, src):
     disk.set_vol_install(vol_install)
     disk.validate()
 
-    disk.setup(meter=meter)
+    disk.build_storage(meter)
     vol = disk.get_vol_object()
     if not vol:
         raise RuntimeError(_("Failed to lookup scratch media volume"))