tests: Fix with recent libvirt <topology> validation change

Author: crobinso

tests/xmlparse-xml/change-guest-out.xml

@@ -19,15 +19,15 @@
   <cpu match="strict">
     <model>qemu64</model>
     <vendor>qemuvendor</vendor>
-    <topology sockets="1" cores="3" threads="1"/>
+    <topology sockets="4" cores="3" threads="1"/>
     <feature policy="disable" name="foofeat"/>
     <feature policy="require" name="addfeature"/>
   </cpu>
   <clock offset="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
-  <vcpu cpuset="1-5,15" current="22">30</vcpu>
+  <vcpu cpuset="1-5,15" current="10">12</vcpu>
   <devices>
     <emulator>/usr/binnnn/fooemu</emulator>
     <disk type="file" device="floppy">

tests/xmlparse-xml/change-minimal-guest-in.xml

@@ -7,7 +7,7 @@
     <type arch="i686">hvm</type>
     <boot dev="hd"/>
   </os>
-  <vcpu cpuset="1-3">5</vcpu>
+  <vcpu cpuset="1-3">4</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type="block" device="cdrom">

tests/xmlparse-xml/change-minimal-guest-out.xml

@@ -7,7 +7,7 @@
     <type arch="i686">hvm</type>
     <boot dev="hd"/>
   </os>
-  <vcpu cpuset="1-3">5</vcpu>
+  <vcpu cpuset="1-3">4</vcpu>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type="block" device="cdrom">

tests/xmlparse.py

@@ -93,8 +93,8 @@ def testAlterGuest(self):
 
         check("name", "TestGuest", "change_name")
         check("description", None, "Hey desc changed")
-        check("maxvcpus", 5, 30)
-        check("vcpus", 30, 22)
+        check("maxvcpus", 5, 12)
+        check("vcpus", 12, 10)
         check("cpuset", "1-3", "1-8,^6", "1-5,15")
         check("maxmemory", 400, 500)
         check("memory", 200, 1000)
@@ -148,7 +148,7 @@ def feature_checker(prop, origval, newval):
         check("vendor", "Intel", "qemuvendor")
         check("threads", 2, 1)
         check("cores", 5, 3)
-        check("sockets", 4, 1)
+        check("sockets", 4, 4)
 
         check = self._make_checker(guest.cpu.features[0])
         check("name", "x2apic", "foofeat")