From f018551b9dbf9afc56b44be1af59f29781b6b548 Mon Sep 17 00:00:00 2001 Message-Id: From: Pavel Hrdina Date: Tue, 3 Dec 2019 13:02:21 +0100 Subject: [PATCH] virt-xml: fix defined_xml_is_unchanged Commit <53f075ab76e1c372474ae0d88f202e487d9f213f> added a warning if the VM XML is not changed after removing default devices but the code was incorrect. We have to compare strings instead of string vs Guest object and also the condition was inverted. Signed-off-by: Pavel Hrdina (cherry picked from commit 29f9f5f2d7f47fe6cc3333f2a9e6c6209db5a8f3) Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1857504 Signed-off-by: Pavel Hrdina --- virt-xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-xml b/virt-xml index 71445c9f..7b0174c9 100755 --- a/virt-xml +++ b/virt-xml @@ -105,8 +105,8 @@ def get_domain_and_guest(conn, domstr): def defined_xml_is_unchanged(conn, domain, original_xml): rawxml = get_xmldesc(domain, inactive=True) - new_xml = virtinst.Guest(conn, parsexml=rawxml) - return new_xml != original_xml + new_xml = virtinst.Guest(conn, parsexml=rawxml).get_xml() + return new_xml == original_xml ################ -- 2.26.2