From 59edd87e9ffcfba96d33f2824d48e6f00d622441 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 17 Jun 2016 08:27:26 -0400
Subject: [PATCH] guest: Rename noboot -> doboot

It's a bit easier to follow the logic IMO
---
 virt-install      |  2 +-
 virtinst/guest.py | 33 ++++++++++++---------------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/virt-install b/virt-install
index 6d81fc53e..892c9980a 100755
--- a/virt-install
+++ b/virt-install
@@ -727,7 +727,7 @@ def start_install(guest, options):
         start_time = time.time()
 
         # Do first install phase
-        dom = guest.start_install(meter=meter, noboot=options.noreboot)
+        dom = guest.start_install(meter=meter, doboot=not options.noreboot)
         cli.connect_console(guest, conscb, wait_on_console)
         dom = check_domain(guest, dom, conscb,
                            wait_on_install, wait_time, start_time)
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 66b7dae26..7a85dbd28 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -372,13 +372,6 @@ class Guest(XMLBuilder):
     # Private install helpers #
     ###########################
 
-    def _build_meter(self, meter):
-        meter_label = _("Creating domain...")
-        meter = util.ensure_meter(meter)
-        meter.start(size=None, text=meter_label)
-
-        return meter
-
     def _build_xml(self):
         install_xml = self._get_install_xml(install=True)
         final_xml = self._get_install_xml(install=False)
@@ -389,27 +382,25 @@ class Guest(XMLBuilder):
 
         return install_xml, final_xml
 
-    def _create_guest(self, meter, install_xml, final_xml, noboot):
+    def _create_guest(self, meter, install_xml, final_xml, doboot):
         """
         Actually do the XML logging, guest defining/creating
 
-        @param noboot: Don't boot guest if no install phase
+        @param doboot: Boot guest even if it has no install phase
         """
-        meter = self._build_meter(meter)
-        doboot = not noboot or self.installer.has_install_phase()
+        meter_label = _("Creating domain...")
+        meter = util.ensure_meter(meter)
+        meter.start(size=None, text=meter_label)
 
-        if doboot:
-            dom = self.conn.createXML(install_xml or final_xml, 0)
-        else:
-            dom = self.conn.defineXML(install_xml or final_xml)
-
-        self.domain = dom
-        meter.end(0)
+        if doboot or self.installer.has_install_phase():
+            self.domain = self.conn.createXML(install_xml or final_xml, 0)
 
         self.domain = self.conn.defineXML(final_xml)
+        meter.end(0)
+
         try:
             logging.debug("XML fetched from libvirt object:\n%s",
-                          dom.XMLDesc(0))
+                          self.domain.XMLDesc(0))
         except Exception, e:
             logging.debug("Error fetching XML from libvirt object: %s", e)
 
@@ -439,7 +430,7 @@ class Guest(XMLBuilder):
     ##############
 
     def start_install(self, meter=None,
-                      dry=False, return_xml=False, noboot=False):
+                      dry=False, return_xml=False, doboot=True):
         """
         Begin the guest install (stage1).
         @param return_xml: Don't create the guest, just return generated XML
@@ -467,7 +458,7 @@ class Guest(XMLBuilder):
                                     do_remove=self.replace)
 
             self.domain = self._create_guest(meter, install_xml, final_xml,
-                                             noboot)
+                                             doboot)
             # Set domain autostart flag if requested
             self._flag_autostart()