From nobody Wed Jan 15 14:53:20 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1704986334573413.6503012456245; Thu, 11 Jan 2024 07:18:54 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 444C61CBC; Thu, 11 Jan 2024 10:18:53 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 35CE91D63; Thu, 11 Jan 2024 09:28:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 969091C79; Thu, 11 Jan 2024 09:27:19 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5C6E11C74 for ; Thu, 11 Jan 2024 09:26:53 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-465-b__bZIzzPXqvJLEYcghkSA-1; Thu, 11 Jan 2024 09:26:51 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 23038108C062 for ; Thu, 11 Jan 2024 14:26:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A01C33C39 for ; Thu, 11 Jan 2024 14:26:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: b__bZIzzPXqvJLEYcghkSA-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH v2 05/11] qemu: Use CPU clusters for guests Date: Thu, 11 Jan 2024 15:26:37 +0100 Message-ID: <20240111142644.658765-6-abologna@redhat.com> In-Reply-To: <20240111142644.658765-1-abologna@redhat.com> References: <20240111142644.658765-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: BJI6ZENS34U6ZDP4F3ZKNEEC6KBLGJCC X-Message-ID-Hash: BJI6ZENS34U6ZDP4F3ZKNEEC6KBLGJCC X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1704986336170100005 https://issues.redhat.com/browse/RHEL-7043 Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 5 ++++- .../qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args | 2 +- .../qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args | 2 +- .../cpu-numa-no-memory-element.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args | 2 +- .../fd-memory-no-numa-topology.x86_64-latest.args | 2 +- .../fd-memory-numa-topology.x86_64-latest.args | 2 +- .../fd-memory-numa-topology2.x86_64-latest.args | 2 +- .../fd-memory-numa-topology3.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args | 2 +- .../memfd-memory-default-hugepage.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args | 2 +- .../memory-hotplug-dimm-addr.x86_64-latest.args | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args | 2 +- .../memory-hotplug-multiple.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-access.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-align.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-label.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args | 2 +- .../memory-hotplug-nvdimm-ppc64.ppc64-latest.args | 2 +- .../memory-hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-mem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args | 2 +- .../numad-auto-memory-vcpu-cpuset.x86_64-latest.args | 2 +- ...to-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args | 2 +- .../numad-auto-vcpu-no-numatune.x86_64-latest.args | 2 +- .../numad-auto-vcpu-static-numatune.x86_64-latest.args | 2 +- .../numad-static-memory-auto-vcpu.x86_64-latest.args | 2 +- .../numad-static-vcpu-no-numatune.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/numad.x86_64-latest.args | 2 +- .../numatune-auto-nodeset-invalid.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args | 2 +- .../qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args | 2 +- 44 files changed, 47 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 71daa85e55..712feb7b81 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7226,7 +7226,8 @@ qemuBuildSmpCommandLine(virCommand *cmd, _("Only 1 die per socket is supported")); return -1; } - if (def->cpu->clusters !=3D 1) { + if (def->cpu->clusters !=3D 1 && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_CLUSTERS)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only 1 cluster per die is supported")); return -1; @@ -7234,6 +7235,8 @@ qemuBuildSmpCommandLine(virCommand *cmd, virBufferAsprintf(&buf, ",sockets=3D%u", def->cpu->sockets); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES)) virBufferAsprintf(&buf, ",dies=3D%u", def->cpu->dies); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_CLUSTERS)) + virBufferAsprintf(&buf, ",clusters=3D%u", def->cpu->clusters); virBufferAsprintf(&buf, ",cores=3D%u", def->cpu->cores); virBufferAsprintf(&buf, ",threads=3D%u", def->cpu->threads); } else { diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args = b/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args index 009c08d71a..af1b464104 100644 --- a/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --smp 1,maxcpus=3D6,sockets=3D3,dies=3D1,cores=3D2,threads=3D1 \ +-smp 1,maxcpus=3D6,sockets=3D3,dies=3D1,clusters=3D1,cores=3D2,threads=3D1= \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args b/= tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args index 3b12934425..22fca082a8 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ -numa node,nodeid=3D0,cpus=3D0-3,cpus=3D8-11,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args = b/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args index ee6974326d..bc4a6ad5f3 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D328704k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ -numa node,nodeid=3D0,cpus=3D0-5,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args b= /tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args index 0c9ec88b8b..1e486b1bbc 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":112197= 632}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1","share":false,"size":11219= 7632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-lates= t.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.ar= gs index 31a61f023e..59372c4ab9 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args b/tests/qe= muxml2argvdata/cpu-numa1.x86_64-latest.args index 31a61f023e..59372c4ab9 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args b/tests/qe= muxml2argvdata/cpu-numa2.x86_64-latest.args index 31a61f023e..59372c4ab9 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args b/test= s/qemuxml2argvdata/cpu-topology1.x86_64-latest.args index 009c08d71a..af1b464104 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --smp 1,maxcpus=3D6,sockets=3D3,dies=3D1,cores=3D2,threads=3D1 \ +-smp 1,maxcpus=3D6,sockets=3D3,dies=3D1,clusters=3D1,cores=3D2,threads=3D1= \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args b/test= s/qemuxml2argvdata/cpu-topology2.x86_64-latest.args index 7ba175fa80..8560eb6126 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --smp 6,sockets=3D1,dies=3D1,cores=3D2,threads=3D3 \ +-smp 6,sockets=3D1,dies=3D1,clusters=3D1,cores=3D2,threads=3D3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args b/test= s/qemuxml2argvdata/cpu-topology3.x86_64-latest.args index c11b4cd307..3878c558b8 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --smp 6,sockets=3D3,dies=3D1,cores=3D2,threads=3D1 \ +-smp 6,sockets=3D3,dies=3D1,clusters=3D1,cores=3D2,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args b/test= s/qemuxml2argvdata/cpu-topology4.x86_64-latest.args index d0e31ba2b5..8720038c0d 100644 --- a/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --smp 1,maxcpus=3D6,sockets=3D1,dies=3D3,cores=3D2,threads=3D1 \ +-smp 1,maxcpus=3D6,sockets=3D1,dies=3D3,clusters=3D1,cores=3D2,threads=3D1= \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-lates= t.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.ar= gs index 58b3c7b544..1bd75a85a6 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -m size=3D14680064k \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/var/= lib/libvirt/qemu/ram/-1-instance-00000092/pc.ram","share":true,"x-use-canon= ical-path-for-ramblock-id":false,"prealloc":true,"size":15032385536}' \ -overcommit mem-lock=3Doff \ --smp 8,sockets=3D8,dies=3D1,cores=3D1,threads=3D1 \ +-smp 8,sockets=3D8,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args index 21f9a16540..17ef506431 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -cpu qemu64 \ -m size=3D14680064k \ -overcommit mem-lock=3Doff \ --smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ +-smp 8,sockets=3D1,dies=3D1,clusters=3D1,cores=3D8,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"preal= loc":true,"size":15032385536}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.= args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args index 3bf16f9caf..b247231b85 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -cpu qemu64 \ -m size=3D29360128k \ -overcommit mem-lock=3Doff \ --smp 20,sockets=3D1,dies=3D1,cores=3D20,threads=3D1 \ +-smp 20,sockets=3D1,dies=3D1,clusters=3D1,cores=3D20,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":false,"prea= lloc":true,"size":15032385536}' \ -numa node,nodeid=3D0,cpus=3D0-7,cpus=3D16-19,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"preal= loc":true,"size":15032385536}' \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.= args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args index 3153e22d56..9e94209499 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -cpu qemu64 \ -m size=3D44040192k \ -overcommit mem-lock=3Doff \ --smp 32,sockets=3D1,dies=3D1,cores=3D32,threads=3D1 \ +-smp 32,sockets=3D1,dies=3D1,clusters=3D1,cores=3D32,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"preal= loc":true,"size":15032385536}' \ -numa node,nodeid=3D0,cpus=3D0-1,cpus=3D6-31,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"preal= loc":true,"size":15032385536}' \ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/t= ests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index fa376accb5..f30db0ad09 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"si= ze":1073741824}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-la= test.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-lat= est.args index 55969eb2fd..f850d7be60 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -cpu qemu64 \ -m size=3D14680064k \ -overcommit mem-lock=3Doff \ --smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ +-smp 8,sockets=3D1,dies=3D1,clusters=3D1,cores=3D8,threads=3D1 \ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":= [3]}' \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":tru= e,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"ho= st-nodes":[3],"policy":"preferred","prealloc-context":"tc-ram-node0"}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/= tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 1ef2d69fcb..dbe2b82a56 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -cpu qemu64 \ -m size=3D14680064k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ +-smp 8,sockets=3D1,dies=3D1,clusters=3D1,cores=3D8,threads=3D1 \ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":= [3]}' \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":tru= e,"hugetlbsize":2097152,"share":true,"prealloc":true,"prealloc-threads":8,"= size":15032385536,"host-nodes":[3],"policy":"preferred","prealloc-context":= "tc-ram-node0"}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.= args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args index 6ae1fd1b98..c15fe191de 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args = b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args index 71817da309..a729930db2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args index ad1dad01ac..f1f2f93a11 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D2095104k,slots=3D2,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lat= est.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lates= t.args index f09ae22927..d53732b39e 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.= args index 6cfe4b8263..cba467d9d3 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.= args index 4041c15b2b..2ad23a0224 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.ar= gs index 3547e96c00..ac5ca187b1 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.= ppc64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-= update.ppc64-latest.args index 9b57518fca..c2c1623d9f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-l= atest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-l= atest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu POWER9 \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.ar= gs index 9b57518fca..c2c1623d9f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu POWER9 \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args index 17bacfb2f6..8af4673841 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.arg= s b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 1321e5556e..6531caa908 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 607ce9b0e8..dbe96ae21d 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D2095104k,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.ar= gs index 9bbde420a9..df7b7f80a9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D2095104k,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args b/tes= ts/qemuxml2argvdata/memory-hotplug.x86_64-latest.args index 53f0fbc68f..d04d9d73e9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-la= test.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-lat= est.args index d4238f3d9e..138c8255f7 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.ar= gs @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-pl= acement.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-= no-cpuset-and-placement.x86_64-latest.args index d4238f3d9e..138c8255f7 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-late= st.args b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.= args index 7022d2cc00..f13f04c9d4 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"bind"}' \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-= latest.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64= -latest.args index 9ddfb286b5..f1c49619db 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.= args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-la= test.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-lat= est.args index d4238f3d9e..138c8255f7 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.ar= gs @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-la= test.args b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-lat= est.args index ffbccb8408..76ca5c4bea 100644 --- a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.ar= gs @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad.x86_64-latest.args b/tests/qemuxm= l2argvdata/numad.x86_64-latest.args index d4238f3d9e..138c8255f7 100644 --- a/tests/qemuxml2argvdata/numad.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-la= test.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-lat= est.args index 57a2b893f1..e35471d91b 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.ar= gs @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"preferred"}' \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args b/t= ests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args index bf553a8e32..d3960731be 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-expande= r-test/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args b/= tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args index 3fb86c29c2..b179fadc27 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-ex= pander-bus-te/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args= b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args index 7ffcb1d8c5..942540a296 100644 --- a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu POWER9 \ -m size=3D2097152k \ -overcommit mem-lock=3Doff \ --smp 8,sockets=3D2,dies=3D1,cores=3D1,threads=3D4 \ +-smp 8,sockets=3D2,dies=3D1,clusters=3D1,cores=3D1,threads=3D4 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24,"host-nodes":[1],"policy":"bind"}' \ -numa node,nodeid=3D0,cpus=3D0-3,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":10737418= 24,"host-nodes":[2],"policy":"bind"}' \ --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org