NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

virt-xml: Remove redundant XML roundtripping

Browse Source 
Based on how we do diff reporting it doesn't accomplish anything anyways
This commit is contained in:
Cole Robinson 2018-02-22 18:47:49 -05:00
parent 8371a681b1
commit 8c3388697c
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
virt-xml
View File

@ -68,13 +68,6 @@ def get_diff(origxml, newxml):
return ret return ret
def _make_guest(conn, xml):
# We do this to minimize the diff, sanitizing XML quotes to what libxml
# generates
return virtinst.Guest(conn,
parsexml=virtinst.Guest(conn, parsexml=xml).get_xml_config())
def get_domain_and_guest(conn, domstr): def get_domain_and_guest(conn, domstr):
try: try:
int(domstr) int(domstr)
@ -97,11 +90,11 @@ def get_domain_and_guest(conn, domstr):
state = domain.info()[0] state = domain.info()[0]
active_xmlobj = None active_xmlobj = None
inactive_xmlobj = _make_guest(conn, domain.XMLDesc(0)) inactive_xmlobj = virtinst.Guest(conn, parsexml=domain.XMLDesc(0))
if state != libvirt.VIR_DOMAIN_SHUTOFF: if state != libvirt.VIR_DOMAIN_SHUTOFF:
active_xmlobj = inactive_xmlobj active_xmlobj = inactive_xmlobj
inactive_xmlobj = _make_guest(conn, inactive_xmlobj = virtinst.Guest(conn,
domain.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)) parsexml=domain.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE))
return (domain, inactive_xmlobj, active_xmlobj) return (domain, inactive_xmlobj, active_xmlobj)
@ -440,7 +433,7 @@ def main(conn=None):
domain, inactive_xmlobj, active_xmlobj = get_domain_and_guest( domain, inactive_xmlobj, active_xmlobj = get_domain_and_guest(
conn, options.domain) conn, options.domain)
elif not options.build_xml: elif not options.build_xml:
inactive_xmlobj = _make_guest(conn, options.stdinxml) inactive_xmlobj = virtinst.Guest(conn, options.stdinxml)
check_action_collision(options) check_action_collision(options)
parserclass = check_xmlopt_collision(options) parserclass = check_xmlopt_collision(options)