Guest: Simplify init ordering

This commit is contained in:
Cole Robinson
2013-08-09 11:04:01 -04:00
parent 737d3e60f3
commit d403bcdcd4

View File

@@ -169,6 +169,10 @@ class Guest(XMLBuilder):
"seclabel"] "seclabel"]
def __init__(self, conn, parsexml=None, parsexmlnode=None): def __init__(self, conn, parsexml=None, parsexmlnode=None):
self._devices = []
self._install_devices = []
XMLBuilder.__init__(self, conn, parsexml, parsexmlnode)
self.autostart = False self.autostart = False
self.replace = False self.replace = False
self.os_autodetect = False self.os_autodetect = False
@@ -177,25 +181,11 @@ class Guest(XMLBuilder):
self._os_variant = None self._os_variant = None
self._random_uuid = None self._random_uuid = None
self.installer = None
# General device list. Only access through API calls (even internally)
self._devices = []
# Device list to use/alter during install process. Don't access
# directly, use internal APIs
self._install_devices = []
# The libvirt virDomain object we 'Create' # The libvirt virDomain object we 'Create'
self.domain = None self.domain = None
self._consolechild = None self._consolechild = None
# Since we overwrite _parsexml handling, need to set up some
# internal state before calling __init__
XMLBuilder.__init__(self, conn, parsexml)
self.installer = virtinst.DistroInstaller(conn) self.installer = virtinst.DistroInstaller(conn)
self.os = OSXML(self.conn, None, self._xml_node) self.os = OSXML(self.conn, None, self._xml_node)
self.features = DomainFeatures(self.conn, None, self._xml_node) self.features = DomainFeatures(self.conn, None, self._xml_node)
self.clock = Clock(self.conn, None, self._xml_node) self.clock = Clock(self.conn, None, self._xml_node)