|
 |
184e0d |
From 4fd1ebe845ab9b29ddb4bec5cfb6e0198d268ff7 Mon Sep 17 00:00:00 2001
|
|
|
184e0d |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
184e0d |
Date: Thu, 13 Apr 2017 14:56:03 -0400
|
|
|
184e0d |
Subject: guest: Don't repeatedly overwrite self.domain
|
|
|
184e0d |
|
|
|
184e0d |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
184e0d |
|
|
|
184e0d |
Since clearing it is important, just set it at the end when things
|
|
|
184e0d |
have succeeded
|
|
|
184e0d |
|
|
|
184e0d |
(cherry picked from commit 93085d2b9d4a3dd6cbb9edfeae9b6cefee9419c1)
|
|
|
184e0d |
|
|
|
184e0d |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1441902
|
|
|
184e0d |
|
|
|
184e0d |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
184e0d |
---
|
|
|
184e0d |
virtinst/guest.py | 12 ++++++------
|
|
|
184e0d |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
184e0d |
|
|
|
184e0d |
diff --git a/virtinst/guest.py b/virtinst/guest.py
|
|
|
184e0d |
index 19e21b5d..16934169 100644
|
|
|
184e0d |
--- a/virtinst/guest.py
|
|
|
184e0d |
+++ b/virtinst/guest.py
|
|
|
184e0d |
@@ -396,28 +396,28 @@ class Guest(XMLBuilder):
|
|
|
184e0d |
meter.start(size=None, text=meter_label)
|
|
|
184e0d |
|
|
|
184e0d |
if transient:
|
|
|
184e0d |
- self.domain = self.conn.createXML(install_xml or final_xml, 0)
|
|
|
184e0d |
+ domain = self.conn.createXML(install_xml or final_xml, 0)
|
|
|
184e0d |
else:
|
|
|
184e0d |
# Not all hypervisors (vz) support createXML, so avoid it here
|
|
|
184e0d |
- self.domain = self.conn.defineXML(install_xml or final_xml)
|
|
|
184e0d |
+ domain = self.conn.defineXML(install_xml or final_xml)
|
|
|
184e0d |
|
|
|
184e0d |
# Handle undefining the VM if the initial startup fails
|
|
|
184e0d |
if doboot or self.installer.has_install_phase():
|
|
|
184e0d |
try:
|
|
|
184e0d |
- self.domain.create()
|
|
|
184e0d |
+ domain.create()
|
|
|
184e0d |
except:
|
|
|
184e0d |
import sys
|
|
|
184e0d |
exc_info = sys.exc_info()
|
|
|
184e0d |
try:
|
|
|
184e0d |
- self.domain.undefine()
|
|
|
184e0d |
- self.domain = None
|
|
|
184e0d |
+ domain.undefine()
|
|
|
184e0d |
except:
|
|
|
184e0d |
pass
|
|
|
184e0d |
raise exc_info[0], exc_info[1], exc_info[2]
|
|
|
184e0d |
|
|
|
184e0d |
if install_xml and install_xml != final_xml:
|
|
|
184e0d |
- self.domain = self.conn.defineXML(final_xml)
|
|
|
184e0d |
+ domain = self.conn.defineXML(final_xml)
|
|
|
184e0d |
|
|
|
184e0d |
+ self.domain = domain
|
|
|
184e0d |
try:
|
|
|
184e0d |
logging.debug("XML fetched from libvirt object:\n%s",
|
|
|
184e0d |
self.domain.XMLDesc(0))
|
|
|
184e0d |
--
|
|
|
184e0d |
2.13.0
|
|
|
184e0d |
|