tests: clitest: Cover all --memdev options and aliases

tests/cli-test-xml/compare/virt-install-singleton-config-3.xml

@@ -6,8 +6,9 @@
       <libosinfo:os id="http://fedoraproject.org/fedora/unknown"/>
     </libosinfo:libosinfo>
   </metadata>
-  <memory>1048576</memory>
-  <currentMemory>1048576</currentMemory>
+  <maxMemory slots="2">2097152</maxMemory>
+  <memory>2097152</memory>
+  <currentMemory>2097152</currentMemory>
   <memoryBacking>
     <hugepages/>
     <access mode="shared"/>
@@ -48,6 +49,9 @@
   </features>
   <cpu>
     <topology sockets="1" cores="3" threads="2"/>
+    <numa>
+      <cell cpus="0" memory="1048576"/>
+    </numa>
   </cpu>
   <clock offset="utc">
     <timer name="pit" tickpolicy="catchup" present="yes"/>
@@ -97,6 +101,29 @@
     <panic model="isa">
       <address type="isa" iobase="0x500" irq="5"/>
     </panic>
+    <memory model="dimm" access="private">
+      <source>
+        <pagesize>4</pagesize>
+        <nodemask>1-2</nodemask>
+      </source>
+      <target>
+        <size>524288</size>
+        <node>0</node>
+      </target>
+    </memory>
+    <memory model="nvdimm">
+      <alias name="mymemdev3"/>
+      <source>
+        <path>/path/to/nvdimm</path>
+      </source>
+      <target>
+        <size>524288</size>
+        <node>0</node>
+        <label>
+          <size>131072</size>
+        </label>
+      </target>
+    </memory>
     <vsock model="virtio">
       <cid auto="yes"/>
     </vsock>

tests/clitest.py

@@ -483,7 +483,7 @@ cache.mode=emulate,cache.level=3
 
 # Test the implied defaults for gl=yes setting virgl=on
 c.add_compare("""
---memory 1024
+--memory hotplugmemorymax=2048,hotplugmemoryslots=2
 --disk none
 --features apic.eoi=off,hap=on,hyperv.synic.state=on,hyperv.reset.state=off,hyperv.spinlocks.state=on,hyperv.spinlocks.retries=5678,pae=on,pmu.state=on,pvspinlock.state=off,smm.state=off,viridian=on,vmcoreinfo.state=on,vmport.state=off,kvm.hidden.state=on,hyperv.vapic.state=off,hyperv.relaxed.state=off,gic.version=host
 --clock rtc_present=no,pit_present=yes,pit_tickpolicy=catchup,tsc_present=no,platform_present=no,hypervclock_present=no,platform_tickpolicy=foo,hpet_tickpolicy=bar,tsc_tickpolicy=wibble,kvmclock_tickpolicy=wobble,hypervclock_tickpolicy=woo
@@ -492,7 +492,9 @@ c.add_compare("""
 --graphics spice,gl=yes
 --rng egd,backend.type=nmdm,backend.source.master=/dev/foo1,backend.source.slave=/dev/foo2
 --panic default,,address.type=isa,address.iobase=0x500,address.irq=5
---cpu topology.sockets=1,topology.cores=3,topology.threads=2
+--cpu topology.sockets=1,topology.cores=3,topology.threads=2,cell0.cpus=0,cell0.memory=1048576
+ --memdev dimm,access=private,target.size=512,target.node=0,source.pagesize=4,source.nodemask=1-2
+ --memdev nvdimm,source.path=/path/to/nvdimm,target.size=512,target.node=0,target.label_size=128,alias.name=mymemdev3
 --vsock auto_cid=on
 """, "singleton-config-3")