mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-09 01:18:00 +03:00
qemuxml2argvdata: Adjust maximum NUMA node used
We have couple of qemuxml2argvtest cases where up to 8 NUMA nodes are assumed. These are used to check whether disjoint ranges of host-nodes= is generated properly. Without prejudice to the generality, we can rewrite corresponding XML files to use up to 4 NUMA nodes and still have disjoint ranges. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Kristina Hanicova <khanicov@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
parent
28ec9d86b3
commit
d91ca262fb
@ -17,9 +17,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
|
||||
-smp 32,sockets=32,cores=1,threads=1 \
|
||||
-object memory-backend-ram,id=ram-node0,size=20482048,host-nodes=3,policy=preferred \
|
||||
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
|
||||
-object memory-backend-ram,id=ram-node1,size=675907584,host-nodes=0-7,policy=bind \
|
||||
-object memory-backend-ram,id=ram-node1,size=675907584,host-nodes=0-3,policy=bind \
|
||||
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
|
||||
-object memory-backend-ram,id=ram-node2,size=24578457600,host-nodes=1-2,host-nodes=5,host-nodes=7,policy=bind \
|
||||
-object memory-backend-ram,id=ram-node2,size=24578457600,host-nodes=0,host-nodes=2,policy=bind \
|
||||
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
|
||||
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
|
||||
-display none \
|
||||
|
@ -6,8 +6,8 @@
|
||||
<vcpu placement='static'>32</vcpu>
|
||||
<numatune>
|
||||
<memnode cellid='0' mode='preferred' nodeset='3'/>
|
||||
<memory mode='strict' nodeset='0-7'/>
|
||||
<memnode cellid='2' mode='strict' nodeset='1-2,5-7,^6'/>
|
||||
<memory mode='strict' nodeset='0-3'/>
|
||||
<memnode cellid='2' mode='strict' nodeset='0-2,^1'/>
|
||||
</numatune>
|
||||
<os>
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
|
@ -5,9 +5,9 @@
|
||||
<currentMemory unit='KiB'>24682468</currentMemory>
|
||||
<vcpu placement='static'>32</vcpu>
|
||||
<numatune>
|
||||
<memory mode='restrictive' nodeset='0-7'/>
|
||||
<memory mode='restrictive' nodeset='0-3'/>
|
||||
<memnode cellid='0' mode='restrictive' nodeset='3'/>
|
||||
<memnode cellid='2' mode='restrictive' nodeset='1-2,5,7'/>
|
||||
<memnode cellid='2' mode='restrictive' nodeset='1-2'/>
|
||||
</numatune>
|
||||
<os>
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
|
@ -17,9 +17,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
|
||||
-smp 32,sockets=32,cores=1,threads=1 \
|
||||
-object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,policy=preferred \
|
||||
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
|
||||
-object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-7,policy=bind \
|
||||
-object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-3,policy=bind \
|
||||
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
|
||||
-object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=1-2,host-nodes=5,host-nodes=7,policy=bind \
|
||||
-object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=0,host-nodes=2,policy=bind \
|
||||
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
|
||||
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
|
||||
-display none \
|
||||
|
@ -18,9 +18,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
|
||||
-smp 32,sockets=32,cores=1,threads=1 \
|
||||
-object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,policy=preferred \
|
||||
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
|
||||
-object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-7,policy=bind \
|
||||
-object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-3,policy=bind \
|
||||
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
|
||||
-object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=1-2,host-nodes=5,host-nodes=7,policy=bind \
|
||||
-object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=0,host-nodes=2,policy=bind \
|
||||
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
|
||||
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
|
||||
-display none \
|
||||
|
@ -18,9 +18,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
|
||||
-smp 32,sockets=32,cores=1,threads=1 \
|
||||
-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520,"host-nodes":[3],"policy":"preferred"}' \
|
||||
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
|
||||
-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3,4,5,6,7],"policy":"bind"}' \
|
||||
-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3],"policy":"bind"}' \
|
||||
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
|
||||
-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[1,2,5,7],"policy":"bind"}' \
|
||||
-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[0,2],"policy":"bind"}' \
|
||||
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
|
||||
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
|
||||
-display none \
|
||||
|
@ -6,8 +6,8 @@
|
||||
<vcpu placement='static'>32</vcpu>
|
||||
<numatune>
|
||||
<memnode cellid='0' mode='preferred' nodeset='3'/>
|
||||
<memory mode='strict' nodeset='0-7'/>
|
||||
<memnode cellid='2' mode='strict' nodeset='1-2,5-7,^6'/>
|
||||
<memory mode='strict' nodeset='0-3'/>
|
||||
<memnode cellid='2' mode='strict' nodeset='0-2,^1'/>
|
||||
</numatune>
|
||||
<os>
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
|
@ -5,9 +5,9 @@
|
||||
<currentMemory unit='KiB'>24682468</currentMemory>
|
||||
<vcpu placement='static'>32</vcpu>
|
||||
<numatune>
|
||||
<memory mode='strict' nodeset='0-7'/>
|
||||
<memory mode='strict' nodeset='0-3'/>
|
||||
<memnode cellid='0' mode='preferred' nodeset='3'/>
|
||||
<memnode cellid='2' mode='strict' nodeset='1-2,5,7'/>
|
||||
<memnode cellid='2' mode='strict' nodeset='0,2'/>
|
||||
</numatune>
|
||||
<os>
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
|
Loading…
Reference in New Issue
Block a user