|
 |
e8e641 |
From 340bb04ed8b9a455880b0cbac7228bb17a9679d8 Mon Sep 17 00:00:00 2001
|
|
|
e8e641 |
Message-Id: <340bb04ed8b9a455880b0cbac7228bb17a9679d8@dist-git>
|
|
|
e8e641 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
e8e641 |
Date: Tue, 7 Mar 2023 16:06:03 +0100
|
|
|
e8e641 |
Subject: [PATCH] qemuxml2argvdata: Adjust maximum NUMA node used
|
|
|
e8e641 |
|
|
|
e8e641 |
We have couple of qemuxml2argvtest cases where up to 8 NUMA nodes
|
|
|
e8e641 |
are assumed. These are used to check whether disjoint ranges of
|
|
|
e8e641 |
host-nodes= is generated properly. Without prejudice to the
|
|
|
e8e641 |
generality, we can rewrite corresponding XML files to use up to 4
|
|
|
e8e641 |
NUMA nodes and still have disjoint ranges.
|
|
|
e8e641 |
|
|
|
e8e641 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
e8e641 |
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
|
|
|
e8e641 |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
e8e641 |
(cherry picked from commit d91ca262fba8c942449cb5f705f309fcf4baf05a)
|
|
|
e8e641 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2185039
|
|
|
e8e641 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
e8e641 |
---
|
|
|
e8e641 |
tests/qemuxml2argvdata/migrate-numa-unaligned.args | 4 ++--
|
|
|
e8e641 |
tests/qemuxml2argvdata/migrate-numa-unaligned.xml | 4 ++--
|
|
|
e8e641 |
tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml | 4 ++--
|
|
|
e8e641 |
tests/qemuxml2argvdata/numatune-memnode.args | 4 ++--
|
|
|
e8e641 |
tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args | 4 ++--
|
|
|
e8e641 |
tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args | 4 ++--
|
|
|
e8e641 |
tests/qemuxml2argvdata/numatune-memnode.xml | 4 ++--
|
|
|
e8e641 |
tests/qemuxml2xmloutdata/numatune-memnode.xml | 4 ++--
|
|
|
e8e641 |
8 files changed, 16 insertions(+), 16 deletions(-)
|
|
|
e8e641 |
|
|
|
e8e641 |
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
|
|
|
e8e641 |
index b50d93a12f..4786045358 100644
|
|
|
e8e641 |
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
|
|
|
e8e641 |
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
|
|
|
e8e641 |
@@ -17,9 +17,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
|
|
|
e8e641 |
-smp 32,sockets=32,cores=1,threads=1 \
|
|
|
e8e641 |
-object memory-backend-ram,id=ram-node0,size=20482048,host-nodes=3,policy=preferred \
|
|
|
e8e641 |
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
|
|
|
e8e641 |
--object memory-backend-ram,id=ram-node1,size=675907584,host-nodes=0-7,policy=bind \
|
|
|
e8e641 |
+-object memory-backend-ram,id=ram-node1,size=675907584,host-nodes=0-3,policy=bind \
|
|
|
e8e641 |
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
|
|
|
e8e641 |
--object memory-backend-ram,id=ram-node2,size=24578457600,host-nodes=1-2,host-nodes=5,host-nodes=7,policy=bind \
|
|
|
e8e641 |
+-object memory-backend-ram,id=ram-node2,size=24578457600,host-nodes=0,host-nodes=2,policy=bind \
|
|
|
e8e641 |
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
|
|
|
e8e641 |
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
|
|
|
e8e641 |
-display none \
|
|
|
e8e641 |
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.xml b/tests/qemuxml2argvdata/migrate-numa-unaligned.xml
|
|
|
e8e641 |
index e46b723acb..c060852297 100644
|
|
|
e8e641 |
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.xml
|
|
|
e8e641 |
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.xml
|
|
|
e8e641 |
@@ -6,8 +6,8 @@
|
|
|
e8e641 |
<vcpu placement='static'>32</vcpu>
|
|
|
e8e641 |
<numatune>
|
|
|
e8e641 |
<memnode cellid='0' mode='preferred' nodeset='3'/>
|
|
|
e8e641 |
- <memory mode='strict' nodeset='0-7'/>
|
|
|
e8e641 |
- <memnode cellid='2' mode='strict' nodeset='1-2,5-7,^6'/>
|
|
|
e8e641 |
+ <memory mode='strict' nodeset='0-3'/>
|
|
|
e8e641 |
+ <memnode cellid='2' mode='strict' nodeset='0-2,^1'/>
|
|
|
e8e641 |
</numatune>
|
|
|
e8e641 |
<os>
|
|
|
e8e641 |
<type arch='x86_64' machine='pc'>hvm</type>
|
|
|
e8e641 |
diff --git a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml b/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml
|
|
|
e8e641 |
index 012c526460..2a640f5501 100644
|
|
|
e8e641 |
--- a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml
|
|
|
e8e641 |
+++ b/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml
|
|
|
e8e641 |
@@ -5,9 +5,9 @@
|
|
|
e8e641 |
<currentMemory unit='KiB'>24682468</currentMemory>
|
|
|
e8e641 |
<vcpu placement='static'>32</vcpu>
|
|
|
e8e641 |
<numatune>
|
|
|
e8e641 |
- <memory mode='restrictive' nodeset='0-7'/>
|
|
|
e8e641 |
+ <memory mode='restrictive' nodeset='0-3'/>
|
|
|
e8e641 |
<memnode cellid='0' mode='restrictive' nodeset='3'/>
|
|
|
e8e641 |
- <memnode cellid='2' mode='restrictive' nodeset='1-2,5,7'/>
|
|
|
e8e641 |
+ <memnode cellid='2' mode='restrictive' nodeset='1-2'/>
|
|
|
e8e641 |
</numatune>
|
|
|
e8e641 |
<os>
|
|
|
e8e641 |
<type arch='x86_64' machine='pc'>hvm</type>
|
|
|
e8e641 |
diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args
|
|
|
e8e641 |
index 1564a0ddd6..dd0fea62e6 100644
|
|
|
e8e641 |
--- a/tests/qemuxml2argvdata/numatune-memnode.args
|
|
|
e8e641 |
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
|
|
|
e8e641 |
@@ -17,9 +17,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
|
|
|
e8e641 |
-smp 32,sockets=32,cores=1,threads=1 \
|
|
|
e8e641 |
-object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,policy=preferred \
|
|
|
e8e641 |
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
|
|
|
e8e641 |
--object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-7,policy=bind \
|
|
|
e8e641 |
+-object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-3,policy=bind \
|
|
|
e8e641 |
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
|
|
|
e8e641 |
--object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=1-2,host-nodes=5,host-nodes=7,policy=bind \
|
|
|
e8e641 |
+-object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=0,host-nodes=2,policy=bind \
|
|
|
e8e641 |
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
|
|
|
e8e641 |
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
|
|
|
e8e641 |
-display none \
|
|
|
e8e641 |
diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args b/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args
|
|
|
e8e641 |
index 81913e0e18..85f083efc9 100644
|
|
|
e8e641 |
--- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args
|
|
|
e8e641 |
+++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args
|
|
|
e8e641 |
@@ -18,9 +18,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
|
|
|
e8e641 |
-smp 32,sockets=32,cores=1,threads=1 \
|
|
|
e8e641 |
-object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,policy=preferred \
|
|
|
e8e641 |
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
|
|
|
e8e641 |
--object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-7,policy=bind \
|
|
|
e8e641 |
+-object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-3,policy=bind \
|
|
|
e8e641 |
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
|
|
|
e8e641 |
--object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=1-2,host-nodes=5,host-nodes=7,policy=bind \
|
|
|
e8e641 |
+-object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=0,host-nodes=2,policy=bind \
|
|
|
e8e641 |
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
|
|
|
e8e641 |
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
|
|
|
e8e641 |
-display none \
|
|
|
e8e641 |
diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args
|
|
|
e8e641 |
index 7cb7e659a4..6d4baebc83 100644
|
|
|
e8e641 |
--- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args
|
|
|
e8e641 |
+++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args
|
|
|
e8e641 |
@@ -18,9 +18,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
|
|
|
e8e641 |
-smp 32,sockets=32,cores=1,threads=1 \
|
|
|
e8e641 |
-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520,"host-nodes":[3],"policy":"preferred"}' \
|
|
|
e8e641 |
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
|
|
|
e8e641 |
--object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3,4,5,6,7],"policy":"bind"}' \
|
|
|
e8e641 |
+-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3],"policy":"bind"}' \
|
|
|
e8e641 |
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
|
|
|
e8e641 |
--object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[1,2,5,7],"policy":"bind"}' \
|
|
|
e8e641 |
+-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[0,2],"policy":"bind"}' \
|
|
|
e8e641 |
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
|
|
|
e8e641 |
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
|
|
|
e8e641 |
-display none \
|
|
|
e8e641 |
diff --git a/tests/qemuxml2argvdata/numatune-memnode.xml b/tests/qemuxml2argvdata/numatune-memnode.xml
|
|
|
e8e641 |
index dd653c5d3b..9640eeb945 100644
|
|
|
e8e641 |
--- a/tests/qemuxml2argvdata/numatune-memnode.xml
|
|
|
e8e641 |
+++ b/tests/qemuxml2argvdata/numatune-memnode.xml
|
|
|
e8e641 |
@@ -6,8 +6,8 @@
|
|
|
e8e641 |
<vcpu placement='static'>32</vcpu>
|
|
|
e8e641 |
<numatune>
|
|
|
e8e641 |
<memnode cellid='0' mode='preferred' nodeset='3'/>
|
|
|
e8e641 |
- <memory mode='strict' nodeset='0-7'/>
|
|
|
e8e641 |
- <memnode cellid='2' mode='strict' nodeset='1-2,5-7,^6'/>
|
|
|
e8e641 |
+ <memory mode='strict' nodeset='0-3'/>
|
|
|
e8e641 |
+ <memnode cellid='2' mode='strict' nodeset='0-2,^1'/>
|
|
|
e8e641 |
</numatune>
|
|
|
e8e641 |
<os>
|
|
|
e8e641 |
<type arch='x86_64' machine='pc'>hvm</type>
|
|
|
e8e641 |
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode.xml b/tests/qemuxml2xmloutdata/numatune-memnode.xml
|
|
|
e8e641 |
index 104d2e6d4c..a117745bfb 100644
|
|
|
e8e641 |
--- a/tests/qemuxml2xmloutdata/numatune-memnode.xml
|
|
|
e8e641 |
+++ b/tests/qemuxml2xmloutdata/numatune-memnode.xml
|
|
|
e8e641 |
@@ -5,9 +5,9 @@
|
|
|
e8e641 |
<currentMemory unit='KiB'>24682468</currentMemory>
|
|
|
e8e641 |
<vcpu placement='static'>32</vcpu>
|
|
|
e8e641 |
<numatune>
|
|
|
e8e641 |
- <memory mode='strict' nodeset='0-7'/>
|
|
|
e8e641 |
+ <memory mode='strict' nodeset='0-3'/>
|
|
|
e8e641 |
<memnode cellid='0' mode='preferred' nodeset='3'/>
|
|
|
e8e641 |
- <memnode cellid='2' mode='strict' nodeset='1-2,5,7'/>
|
|
|
e8e641 |
+ <memnode cellid='2' mode='strict' nodeset='0,2'/>
|
|
|
e8e641 |
</numatune>
|
|
|
e8e641 |
<os>
|
|
|
e8e641 |
<type arch='x86_64' machine='pc'>hvm</type>
|
|
|
e8e641 |
--
|
|
|
e8e641 |
2.40.0
|