diff options
| author | Cole Robinson <crobinso@redhat.com> | 2016-06-17 08:17:03 -0400 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2016-06-17 12:13:21 -0400 |
| commit | b5d0b381bad61ae72813e38638ca43e38273c23a (patch) | |
| tree | e086b87e354bd3194882de1342c6e9fa1996c221 | |
| parent | 837a9710a3008c5af5514e9e66182a7ba9ce956f (diff) | |
| download | virt-manager-b5d0b381bad61ae72813e38638ca43e38273c23a.tar.gz | |
guest: Rename start_xml -> install_xml
Make it more clear what the case is
| -rw-r--r-- | virtinst/guest.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/virtinst/guest.py b/virtinst/guest.py index fecc9a25..66b7dae2 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -380,16 +380,16 @@ class Guest(XMLBuilder): return meter def _build_xml(self): - start_xml = self._get_install_xml(install=True) + install_xml = self._get_install_xml(install=True) final_xml = self._get_install_xml(install=False) logging.debug("Generated install XML: %s", - (start_xml and ("\n" + start_xml) or "None required")) + (install_xml and ("\n" + install_xml) or "None required")) logging.debug("Generated boot XML: \n%s", final_xml) - return start_xml, final_xml + return install_xml, final_xml - def _create_guest(self, meter, start_xml, final_xml, noboot): + def _create_guest(self, meter, install_xml, final_xml, noboot): """ Actually do the XML logging, guest defining/creating @@ -399,9 +399,9 @@ class Guest(XMLBuilder): doboot = not noboot or self.installer.has_install_phase() if doboot: - dom = self.conn.createXML(start_xml or final_xml, 0) + dom = self.conn.createXML(install_xml or final_xml, 0) else: - dom = self.conn.defineXML(start_xml or final_xml) + dom = self.conn.defineXML(install_xml or final_xml) self.domain = dom meter.end(0) @@ -456,9 +456,9 @@ class Guest(XMLBuilder): for dev in self.get_all_devices(): dev.setup(meter) - start_xml, final_xml = self._build_xml() + install_xml, final_xml = self._build_xml() if return_xml: - return (start_xml, final_xml) + return (install_xml, final_xml) if dry: return @@ -466,7 +466,7 @@ class Guest(XMLBuilder): self.check_vm_collision(self.conn, self.name, do_remove=self.replace) - self.domain = self._create_guest(meter, start_xml, final_xml, + self.domain = self._create_guest(meter, install_xml, final_xml, noboot) # Set domain autostart flag if requested self._flag_autostart() |