From 3909c10441a5f4eb92cc3181785f4176759a2f96 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 20 Mar 2018 12:27:37 -0400
Subject: [PATCH] virtinst: Move all devices to virtinst/devices/

---
 tests/xmlconfig.py                            |  4 +-
 virtinst/__init__.py                          | 22 +---------
 virtinst/cli.py                               | 22 ++--------
 virtinst/cloner.py                            |  6 +--
 virtinst/devices/__init__.py                  | 40 +++++++++++++++++++
 virtinst/{devicechar.py => devices/char.py}   |  2 +-
 .../controller.py}                            |  2 +-
 virtinst/{ => devices}/device.py              |  2 +-
 virtinst/{devicedisk.py => devices/disk.py}   | 10 ++---
 .../filesystem.py}                            |  2 +-
 .../graphics.py}                              |  6 +--
 .../{devicehostdev.py => devices/hostdev.py}  |  4 +-
 virtinst/{deviceinput.py => devices/input.py} |  2 +-
 .../interface.py}                             |  4 +-
 .../memballoon.py}                            |  2 +-
 .../{devicememory.py => devices/memory.py}    |  2 +-
 virtinst/{devicepanic.py => devices/panic.py} |  2 +-
 .../redirdev.py}                              |  2 +-
 virtinst/{devicerng.py => devices/rng.py}     |  2 +-
 .../smartcard.py}                             |  2 +-
 virtinst/{deviceaudio.py => devices/sound.py} |  2 +-
 virtinst/{devicetpm.py => devices/tpm.py}     |  2 +-
 virtinst/{devicevideo.py => devices/video.py} |  2 +-
 .../watchdog.py}                              |  2 +-
 virtinst/distroinstaller.py                   |  2 +-
 virtinst/guest.py                             | 14 ++-----
 virtinst/installer.py                         |  2 +-
 virtinst/kernelupload.py                      |  2 +-
 virtinst/nodedev.py                           |  2 +-
 29 files changed, 83 insertions(+), 87 deletions(-)
 create mode 100644 virtinst/devices/__init__.py
 rename virtinst/{devicechar.py => devices/char.py} (99%)
 rename virtinst/{devicecontroller.py => devices/controller.py} (99%)
 rename virtinst/{ => devices}/device.py (99%)
 rename virtinst/{devicedisk.py => devices/disk.py} (99%)
 rename virtinst/{devicefilesystem.py => devices/filesystem.py} (99%)
 rename virtinst/{devicegraphics.py => devices/graphics.py} (98%)
 rename virtinst/{devicehostdev.py => devices/hostdev.py} (98%)
 rename virtinst/{deviceinput.py => devices/input.py} (97%)
 rename virtinst/{deviceinterface.py => devices/interface.py} (99%)
 rename virtinst/{devicememballoon.py => devices/memballoon.py} (96%)
 rename virtinst/{devicememory.py => devices/memory.py} (96%)
 rename virtinst/{devicepanic.py => devices/panic.py} (98%)
 rename virtinst/{deviceredirdev.py => devices/redirdev.py} (98%)
 rename virtinst/{devicerng.py => devices/rng.py} (99%)
 rename virtinst/{devicesmartcard.py => devices/smartcard.py} (97%)
 rename virtinst/{deviceaudio.py => devices/sound.py} (96%)
 rename virtinst/{devicetpm.py => devices/tpm.py} (98%)
 rename virtinst/{devicevideo.py => devices/video.py} (97%)
 rename virtinst/{devicewatchdog.py => devices/watchdog.py} (98%)

diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py
index b21d34325..7889b8497 100644
--- a/tests/xmlconfig.py
+++ b/tests/xmlconfig.py
@@ -133,7 +133,7 @@ class TestXMLMisc(unittest.TestCase):
 
     def testDefaultBridge(self):
         # Test our handling of the default bridge routines
-        from virtinst import deviceinterface
+        from virtinst.devices import interface as deviceinterface
         origfunc = getattr(deviceinterface, "_default_bridge")
         try:
             def newbridge(ignore_conn):
@@ -334,7 +334,7 @@ class TestXMLMisc(unittest.TestCase):
     def test_dir_searchable(self):
         # Normally the dir searchable test is skipped in the unittest,
         # but let's contrive an example that should trigger all the code
-        from virtinst.devicedisk import _is_dir_searchable
+        from virtinst.devices.disk import _is_dir_searchable
         oldtest = os.environ.pop("VIRTINST_TEST_SUITE")
         try:
             uid = -1
diff --git a/virtinst/__init__.py b/virtinst/__init__.py
index bdd80614b..12e76fa71 100644
--- a/virtinst/__init__.py
+++ b/virtinst/__init__.py
@@ -62,27 +62,7 @@ from virtinst.network import Network
 from virtinst.nodedev import NodeDevice
 from virtinst.storage import StoragePool, StorageVolume
 
-from virtinst.device import Device
-from virtinst.deviceinterface import DeviceInterface
-from virtinst.devicegraphics import DeviceGraphics
-from virtinst.deviceaudio import DeviceSound
-from virtinst.deviceinput import DeviceInput
-from virtinst.devicedisk import DeviceDisk
-from virtinst.devicehostdev import DeviceHostdev
-from virtinst.devicechar import (DeviceChannel,
-                                 DeviceConsole,
-                                 DeviceParallel,
-                                 DeviceSerial)
-from virtinst.devicevideo import DeviceVideo
-from virtinst.devicecontroller import DeviceController
-from virtinst.devicewatchdog import DeviceWatchdog
-from virtinst.devicefilesystem import DeviceFilesystem
-from virtinst.devicesmartcard import DeviceSmartcard
-from virtinst.deviceredirdev import DeviceRedirdev
-from virtinst.devicememballoon import DeviceMemballoon
-from virtinst.devicetpm import DeviceTpm
-from virtinst.devicerng import DeviceRng
-from virtinst.devicepanic import DevicePanic
+from virtinst.devices import *  # pylint: disable=wildcard-import
 
 from virtinst.installer import (ContainerInstaller, ImportInstaller,
                                 PXEInstaller, Installer)
diff --git a/virtinst/cli.py b/virtinst/cli.py
index fb7234c29..c0ffbc2ba 100644
--- a/virtinst/cli.py
+++ b/virtinst/cli.py
@@ -38,25 +38,7 @@ from . import util
 from .clock import Clock
 from .cpu import CPU
 from .cputune import CPUTune
-from .deviceaudio import DeviceSound
-from .devicechar import (DeviceChannel, DeviceConsole,
-                         DeviceSerial, DeviceParallel)
-from .devicecontroller import DeviceController
-from .devicedisk import DeviceDisk
-from .devicefilesystem import DeviceFilesystem
-from .devicegraphics import DeviceGraphics
-from .devicehostdev import DeviceHostdev
-from .deviceinput import DeviceInput
-from .deviceinterface import DeviceInterface
-from .devicememballoon import DeviceMemballoon
-from .devicememory import DeviceMemory
-from .devicepanic import DevicePanic
-from .deviceredirdev import DeviceRedirdev
-from .devicerng import DeviceRng
-from .devicesmartcard import DeviceSmartcard
-from .devicetpm import DeviceTpm
-from .devicevideo import DeviceVideo
-from .devicewatchdog import DeviceWatchdog
+from .devices import *  # pylint: disable=wildcard-import
 from .domainblkiotune import DomainBlkiotune
 from .domainfeatures import DomainFeatures
 from .domainmemorybacking import DomainMemorybacking
@@ -72,6 +54,8 @@ from .storage import StoragePool, StorageVolume
 from .sysinfo import SYSInfo
 from .xmlnsqemu import XMLNSQemu
 
+_ignore = Device
+
 
 ##########################
 # Global option handling #
diff --git a/virtinst/cloner.py b/virtinst/cloner.py
index a97035621..0f3e0dbf1 100644
--- a/virtinst/cloner.py
+++ b/virtinst/cloner.py
@@ -27,10 +27,10 @@ import libvirt
 
 from . import util
 from .guest import Guest
-from .deviceinterface import DeviceInterface
-from .devicedisk import DeviceDisk
+from .devices import DeviceInterface
+from .devices import DeviceDisk
 from .storage import StorageVolume
-from .devicechar import DeviceChannel
+from .devices import DeviceChannel
 
 
 class Cloner(object):
diff --git a/virtinst/devices/__init__.py b/virtinst/devices/__init__.py
new file mode 100644
index 000000000..d7fac81c5
--- /dev/null
+++ b/virtinst/devices/__init__.py
@@ -0,0 +1,40 @@
+# Copyright (C) 2018 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA.
+
+
+from .char import DeviceChannel, DeviceConsole, DeviceParallel, DeviceSerial
+from .controller import DeviceController
+from .device import Device
+from .disk import DeviceDisk
+from .filesystem import DeviceFilesystem
+from .graphics import DeviceGraphics
+from .hostdev import DeviceHostdev
+from .input import DeviceInput
+from .interface import DeviceInterface
+from .memballoon import DeviceMemballoon
+from .memory import DeviceMemory
+from .panic import DevicePanic
+from .smartcard import DeviceSmartcard
+from .sound import DeviceSound
+from .redirdev import DeviceRedirdev
+from .rng import DeviceRng
+from .tpm import DeviceTpm
+from .video import DeviceVideo
+from .watchdog import DeviceWatchdog
+
+
+__all__ = [l for l in locals() if l.startswith("Device")]
diff --git a/virtinst/devicechar.py b/virtinst/devices/char.py
similarity index 99%
rename from virtinst/devicechar.py
rename to virtinst/devices/char.py
index f30df55e2..ae9c1b72e 100644
--- a/virtinst/devicechar.py
+++ b/virtinst/devices/char.py
@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class _DeviceChar(Device):
diff --git a/virtinst/devicecontroller.py b/virtinst/devices/controller.py
similarity index 99%
rename from virtinst/devicecontroller.py
rename to virtinst/devices/controller.py
index d8a716f17..1a20c4a31 100644
--- a/virtinst/devicecontroller.py
+++ b/virtinst/devices/controller.py
@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceController(Device):
diff --git a/virtinst/device.py b/virtinst/devices/device.py
similarity index 99%
rename from virtinst/device.py
rename to virtinst/devices/device.py
index 3995e30e3..fdc1d16c5 100644
--- a/virtinst/device.py
+++ b/virtinst/devices/device.py
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301 USA.
 
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 class DeviceAlias(XMLBuilder):
diff --git a/virtinst/devicedisk.py b/virtinst/devices/disk.py
similarity index 99%
rename from virtinst/devicedisk.py
rename to virtinst/devices/disk.py
index 50a203029..e08213349 100644
--- a/virtinst/devicedisk.py
+++ b/virtinst/devices/disk.py
@@ -26,10 +26,10 @@ import subprocess
 import logging
 import re
 
-from . import diskbackend
-from . import util
+from .. import diskbackend
+from .. import util
 from .device import Device
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 def _qemu_sanitize_drvtype(phystype, fmt, manual_format=False):
@@ -392,7 +392,7 @@ class DeviceDisk(Device):
         :param volname: name of the volume to be created
         :param size: size in bytes
         """
-        from .storage import StorageVolume
+        from ..storage import StorageVolume
 
         if size is None:
             raise ValueError(_("Size must be specified for non "
@@ -610,7 +610,7 @@ class DeviceDisk(Device):
     source_host_socket = XMLProperty("./source/host/@socket")
 
     def _set_source_network_from_url(self, uri):
-        from .uri import URI
+        from ..uri import URI
         uriobj = URI(uri)
 
         if uriobj.scheme:
diff --git a/virtinst/devicefilesystem.py b/virtinst/devices/filesystem.py
similarity index 99%
rename from virtinst/devicefilesystem.py
rename to virtinst/devices/filesystem.py
index 2a2f835fb..66d252531 100644
--- a/virtinst/devicefilesystem.py
+++ b/virtinst/devices/filesystem.py
@@ -20,7 +20,7 @@
 import os
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceFilesystem(Device):
diff --git a/virtinst/devicegraphics.py b/virtinst/devices/graphics.py
similarity index 98%
rename from virtinst/devicegraphics.py
rename to virtinst/devices/graphics.py
index 54b01fcea..09f41a5d3 100644
--- a/virtinst/devicegraphics.py
+++ b/virtinst/devices/graphics.py
@@ -20,7 +20,7 @@
 import os
 
 from .device import Device
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 def _get_mode_prop(channel_type):
@@ -82,7 +82,7 @@ class DeviceGraphics(Device):
         """
         Return a list of valid keymap values.
         """
-        from . import hostkeymap
+        from .. import hostkeymap
 
         orig_list = list(hostkeymap.keytable.values())
         sort_list = []
@@ -123,7 +123,7 @@ class DeviceGraphics(Device):
             return None
 
         if self._local_keymap == -1:
-            from . import hostkeymap
+            from .. import hostkeymap
             self._local_keymap = hostkeymap.default_keymap()
         return self._local_keymap
 
diff --git a/virtinst/devicehostdev.py b/virtinst/devices/hostdev.py
similarity index 98%
rename from virtinst/devicehostdev.py
rename to virtinst/devices/hostdev.py
index 6308eda18..29386e1c1 100644
--- a/virtinst/devicehostdev.py
+++ b/virtinst/devices/hostdev.py
@@ -18,8 +18,8 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .nodedev import NodeDevice
-from .xmlbuilder import XMLProperty
+from ..nodedev import NodeDevice
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceHostdev(Device):
diff --git a/virtinst/deviceinput.py b/virtinst/devices/input.py
similarity index 97%
rename from virtinst/deviceinput.py
rename to virtinst/devices/input.py
index a6627cbdf..873807d8d 100644
--- a/virtinst/deviceinput.py
+++ b/virtinst/devices/input.py
@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceInput(Device):
diff --git a/virtinst/deviceinterface.py b/virtinst/devices/interface.py
similarity index 99%
rename from virtinst/deviceinterface.py
rename to virtinst/devices/interface.py
index 32b594380..d2e9d85be 100644
--- a/virtinst/deviceinterface.py
+++ b/virtinst/devices/interface.py
@@ -21,9 +21,9 @@ import logging
 import os
 import random
 
-from . import util
+from .. import util
 from .device import Device
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 def _random_mac(conn):
diff --git a/virtinst/devicememballoon.py b/virtinst/devices/memballoon.py
similarity index 96%
rename from virtinst/devicememballoon.py
rename to virtinst/devices/memballoon.py
index fbffe56ae..3bfe9643c 100644
--- a/virtinst/devicememballoon.py
+++ b/virtinst/devices/memballoon.py
@@ -19,7 +19,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceMemballoon(Device):
diff --git a/virtinst/devicememory.py b/virtinst/devices/memory.py
similarity index 96%
rename from virtinst/devicememory.py
rename to virtinst/devices/memory.py
index a67d361d1..4ebac6921 100644
--- a/virtinst/devicememory.py
+++ b/virtinst/devices/memory.py
@@ -18,7 +18,7 @@
 
 
 from .device import Device
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 class _DeviceMemoryTarget(XMLBuilder):
diff --git a/virtinst/devicepanic.py b/virtinst/devices/panic.py
similarity index 98%
rename from virtinst/devicepanic.py
rename to virtinst/devices/panic.py
index 9cdad434c..dc3e781cf 100644
--- a/virtinst/devicepanic.py
+++ b/virtinst/devices/panic.py
@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DevicePanic(Device):
diff --git a/virtinst/deviceredirdev.py b/virtinst/devices/redirdev.py
similarity index 98%
rename from virtinst/deviceredirdev.py
rename to virtinst/devices/redirdev.py
index d31a83f13..33643ddaa 100644
--- a/virtinst/deviceredirdev.py
+++ b/virtinst/devices/redirdev.py
@@ -19,7 +19,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceRedirdev(Device):
diff --git a/virtinst/devicerng.py b/virtinst/devices/rng.py
similarity index 99%
rename from virtinst/devicerng.py
rename to virtinst/devices/rng.py
index 20a0fc568..5555a3173 100644
--- a/virtinst/devicerng.py
+++ b/virtinst/devices/rng.py
@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceRng(Device):
diff --git a/virtinst/devicesmartcard.py b/virtinst/devices/smartcard.py
similarity index 97%
rename from virtinst/devicesmartcard.py
rename to virtinst/devices/smartcard.py
index d00ae6a83..4ed45c53b 100644
--- a/virtinst/devicesmartcard.py
+++ b/virtinst/devices/smartcard.py
@@ -19,7 +19,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceSmartcard(Device):
diff --git a/virtinst/deviceaudio.py b/virtinst/devices/sound.py
similarity index 96%
rename from virtinst/deviceaudio.py
rename to virtinst/devices/sound.py
index 49c8d04ba..e60590bbd 100644
--- a/virtinst/deviceaudio.py
+++ b/virtinst/devices/sound.py
@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceSound(Device):
diff --git a/virtinst/devicetpm.py b/virtinst/devices/tpm.py
similarity index 98%
rename from virtinst/devicetpm.py
rename to virtinst/devices/tpm.py
index 2a65da00b..e6e8e8b50 100644
--- a/virtinst/devicetpm.py
+++ b/virtinst/devices/tpm.py
@@ -22,7 +22,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceTpm(Device):
diff --git a/virtinst/devicevideo.py b/virtinst/devices/video.py
similarity index 97%
rename from virtinst/devicevideo.py
rename to virtinst/devices/video.py
index 0dd953a3f..dc8237d4d 100644
--- a/virtinst/devicevideo.py
+++ b/virtinst/devices/video.py
@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceVideo(Device):
diff --git a/virtinst/devicewatchdog.py b/virtinst/devices/watchdog.py
similarity index 98%
rename from virtinst/devicewatchdog.py
rename to virtinst/devices/watchdog.py
index aab0e484a..8c19fad12 100644
--- a/virtinst/devicewatchdog.py
+++ b/virtinst/devices/watchdog.py
@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceWatchdog(Device):
diff --git a/virtinst/distroinstaller.py b/virtinst/distroinstaller.py
index d7964f211..d432372a1 100644
--- a/virtinst/distroinstaller.py
+++ b/virtinst/distroinstaller.py
@@ -22,7 +22,7 @@ import os
 
 from . import urlfetcher
 from . import util
-from .devicedisk import DeviceDisk
+from .devices import DeviceDisk
 from .initrdinject import perform_initrd_injections
 from .kernelupload import upload_kernel_initrd
 from .installer import Installer
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 9095c7e04..a454ae098 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -32,17 +32,9 @@ from .osdict import OSDB
 from .clock import Clock
 from .cpu import CPU
 from .cputune import CPUTune
-from .device import Device
-from .deviceaudio import DeviceSound
-from .devicechar import DeviceChannel, DeviceConsole
-from .devicecontroller import DeviceController
-from .devicedisk import DeviceDisk
-from .devicegraphics import DeviceGraphics
-from .deviceinput import DeviceInput
-from .devicepanic import DevicePanic
-from .deviceredirdev import DeviceRedirdev
-from .devicerng import DeviceRng
-from .devicevideo import DeviceVideo
+from .devices import (Device, DeviceChannel, DeviceConsole, DeviceController,
+        DeviceDisk, DeviceInput, DeviceGraphics, DevicePanic, DeviceRedirdev,
+        DeviceRng, DeviceSound, DeviceVideo)
 from .distroinstaller import DistroInstaller
 from .domainblkiotune import DomainBlkiotune
 from .domainfeatures import DomainFeatures
diff --git a/virtinst/installer.py b/virtinst/installer.py
index be7e99142..b078bd457 100644
--- a/virtinst/installer.py
+++ b/virtinst/installer.py
@@ -22,7 +22,7 @@
 import os
 import logging
 
-from .devicedisk import DeviceDisk
+from .devices import DeviceDisk
 from .osxml import OSXML
 
 
diff --git a/virtinst/kernelupload.py b/virtinst/kernelupload.py
index ab0847c56..4c067cb74 100644
--- a/virtinst/kernelupload.py
+++ b/virtinst/kernelupload.py
@@ -21,7 +21,7 @@ import logging
 import os
 
 from . import util
-from .devicedisk import DeviceDisk
+from .devices import DeviceDisk
 from .storage import StoragePool, StorageVolume
 
 
diff --git a/virtinst/nodedev.py b/virtinst/nodedev.py
index 6fdb3ee95..0ec4e524c 100644
--- a/virtinst/nodedev.py
+++ b/virtinst/nodedev.py
@@ -339,7 +339,7 @@ class DRMDevice(NodeDevice):
 
 
 def _AddressStringToHostdev(conn, addrstr):
-    from .devicehostdev import DeviceHostdev
+    from .devices import DeviceHostdev
     hostdev = DeviceHostdev(conn)
 
     try: