tests: Fix missing XML output from some virt-xml tests

Signed-off-by: Cole Robinson <crobinso@redhat.com>

tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml

@@ -1,2 +1,52 @@
+     <ioapic driver="qemu"/>
+   </features>
+   <cpu mode="custom" match="exact">
+-    <model fallback="allow">core2duo</model>
++    <model fallback="forbid">Skylake-Client-IBRS</model>
+     <vendor>Intel</vendor>
+     <topology sockets="9" dies="1" cores="1" threads="1"/>
+-    <feature policy="require" name="pbe"/>
+-    <feature policy="require" name="tm2"/>
+-    <feature policy="require" name="est"/>
+-    <feature policy="require" name="ss"/>
+-    <feature policy="require" name="ht"/>
+-    <feature policy="require" name="ds"/>
+-    <feature policy="require" name="lahf_lm"/>
+-    <feature policy="require" name="tm"/>
+-    <feature policy="require" name="cx16"/>
+-    <feature policy="require" name="vmx"/>
+-    <feature policy="require" name="ds_cpl"/>
+-    <feature policy="require" name="xtpr"/>
+-    <feature policy="require" name="acpi"/>
+     <numa>
+       <cell id="0" cpus="0-4" memory="219136" unit="KiB"/>
+       <cell id="1" cpus="5-8" memory="219136" unit="KiB"/>
+     </numa>
++    <feature policy="require" name="ss"/>
++    <feature policy="require" name="vmx"/>
++    <feature policy="require" name="pdcm"/>
++    <feature policy="require" name="hypervisor"/>
++    <feature policy="require" name="tsc_adjust"/>
++    <feature policy="require" name="clflushopt"/>
++    <feature policy="require" name="umip"/>
++    <feature policy="require" name="md-clear"/>
++    <feature policy="require" name="stibp"/>
++    <feature policy="require" name="arch-capabilities"/>
++    <feature policy="require" name="ssbd"/>
++    <feature policy="require" name="xsaves"/>
++    <feature policy="require" name="pdpe1gb"/>
++    <feature policy="require" name="invtsc"/>
++    <feature policy="require" name="ibpb"/>
++    <feature policy="require" name="ibrs"/>
++    <feature policy="require" name="amd-stibp"/>
++    <feature policy="require" name="amd-ssbd"/>
++    <feature policy="require" name="skip-l1dfl-vmentry"/>
++    <feature policy="require" name="pschange-mc-no"/>
++    <feature policy="disable" name="hle"/>
++    <feature policy="disable" name="rtm"/>
+   </cpu>
+   <clock offset="utc">
+     <timer name="rtc" tickpolicy="catchup"/>
+
 Domain 'test-many-devices' defined successfully.
 Changes will take effect after the domain is fully powered off.

tests/data/cli/compare/virt-xml-hyperv-uefi-collision.xml

@@ -1,2 +1,20 @@
+   <os>
+     <type arch="i686">hvm</type>
+     <boot dev="hd"/>
++    <loader readonly="yes" type="pflash">/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd</loader>
+   </os>
+   <features>
+     <acpi/>
+     <apic/>
+-    <hyperv mode="custom">
+-      <relaxed state="on"/>
+-      <vapic state="on"/>
+-      <spinlocks state="on" retries="8191"/>
+-    </hyperv>
++    <hyperv mode="custom"/>
+     <vmport state="off"/>
+   </features>
+   <clock offset="localtime">
+
 Domain 'test-hyperv-uefi' defined successfully.
 Changes will take effect after the domain is fully powered off.

tests/test_cli.py

@@ -1265,8 +1265,8 @@ c.add_compare("4a64cc71-19c4-2fd0-2323-3050941ea3c3 --edit --boot network,cdrom"
 c.add_compare("--confirm 1 --edit --cpu host-passthrough", "prompt-response", input_text="yes")  # prompt response, also using domid lookup
 c.add_compare("--edit --print-diff --qemu-commandline clearxml=yes", "edit-clearxml-qemu-commandline", input_file=(_VIRTXMLDIR + "virtxml-qemu-commandline-clear.xml"))
 c.add_compare("--print-diff --remove-device --serial 1", "remove-console-dup", input_file=(_VIRTXMLDIR + "virtxml-console-dup.xml"))
-c.add_compare("--connect %(URI-KVM-X86)s test-hyperv-uefi --edit --boot uefi", "hyperv-uefi-collision")
-c.add_compare("--connect %(URI-KVM-X86)s test-many-devices --edit --cpu host-copy", "edit-cpu-host-copy")
+c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test-hyperv-uefi --edit --boot uefi", "hyperv-uefi-collision")
+c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test-many-devices --edit --cpu host-copy", "edit-cpu-host-copy")
 c.add_compare("--connect %(URI-KVM-X86)s test-many-devices --build-xml --disk source.pool=pool-disk,source.volume=sdfg1", "build-disk-pool-disk")
 c.add_compare("test --add-device --network default --update --confirm", "update-succeed", env={"VIRTXML_TESTSUITE_UPDATE_IGNORE_FAIL": "1", "VIRTINST_TEST_SUITE_INCREMENT_MACADDR": "1"}, input_text="yes\nyes\n")  # test hotplug success
 c.add_compare("test --add-device --network default --update --confirm --no-define", "update-nodefine-succeed", env={"VIRTXML_TESTSUITE_UPDATE_IGNORE_FAIL": "1"}, input_text="yes\n")  # test hotplug success without define