[PATCH 7/8] qemuxmlconftest: Update memory-hotplug-virtio-mem-s390x.xml

Drop explicit request to place virtio-mem on PCI bus from the input memory-hotplug-virtio-mem-s390x.xml and demonstrate how the device is automatically placed onto CCW. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- ...ory-hotplug-virtio-mem-s390x.s390x-latest.args | 6 ++---- ...mory-hotplug-virtio-mem-s390x.s390x-latest.xml | 15 ++------------- .../memory-hotplug-virtio-mem-s390x.xml | 2 -- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.s390x-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.s390x-latest.args index 9704d7d5e9..a6bbef5ce7 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.s390x-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.s390x-latest.args @@ -27,12 +27,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device '{"driver":"zpci","uid":1,"fid":0,"target":"pci.1","id":"zpci1"}' \ --device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x1"}' \ -object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-mem-ccw","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","devno":"fe.0.0002"}' \ -object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"memaddr":5637144576,"dynamic-memslots":true,"id":"virtiomem1","bus":"pci.1","addr":"0x1"}' \ +-device '{"driver":"virtio-mem-ccw","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"memaddr":5637144576,"dynamic-memslots":true,"id":"virtiomem1","devno":"fe.0.0003"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.s390x-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.s390x-latest.xml index 336c6e5aac..fe18b1ec7b 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.s390x-latest.xml +++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.s390x-latest.xml @@ -28,13 +28,6 @@ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> <controller type='pci' index='0' model='pci-root'/> - <controller type='pci' index='1' model='pci-bridge'> - <model name='pci-bridge'/> - <target chassisNr='1'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'> - <zpci uid='0x0001' fid='0x00000000'/> - </address> - </controller> <audio id='1' type='none'/> <memballoon model='virtio'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> @@ -47,9 +40,7 @@ <block unit='KiB'>2048</block> <requested unit='KiB'>524288</requested> </target> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'> - <zpci uid='0x0002' fid='0x00000001'/> - </address> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/> </memory> <memory model='virtio-mem'> <source> @@ -63,9 +54,7 @@ <requested unit='KiB'>1048576</requested> <address base='0x150000000'/> </target> - <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'> - <zpci uid='0x0003' fid='0x00000002'/> - </address> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/> </memory> </devices> </domain> diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.xml index 747877042a..4f9f90d1e2 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.xml +++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-s390x.xml @@ -39,7 +39,6 @@ <block unit='KiB'>2048</block> <requested unit='KiB'>524288</requested> </target> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </memory> <memory model='virtio-mem'> <source> @@ -53,7 +52,6 @@ <requested unit='KiB'>1048576</requested> <address base='0x150000000'/> </target> - <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> </memory> </devices> </domain> -- 2.45.2