From nobody Wed Jan 15 14:03:19 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 1704985902307382.1276674343942; Thu, 11 Jan 2024 07:11:42 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id DA6561D49; Thu, 11 Jan 2024 10:11:40 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6A4B01CD0; Thu, 11 Jan 2024 09:28:37 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5A38C1CCE; Thu, 11 Jan 2024 09:27:11 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 86DD11C73 for ; Thu, 11 Jan 2024 09:26:51 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-166-izyF1URaPhC_i9Y3JiPbzQ-1; Thu, 11 Jan 2024 09:26:49 -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 86EFC3C0F37C for ; Thu, 11 Jan 2024 14:26:49 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0EAAD3C4F for ; Thu, 11 Jan 2024 14:26:48 +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_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: izyF1URaPhC_i9Y3JiPbzQ-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH v2 03/11] conf: Allow specifying CPU clusters Date: Thu, 11 Jan 2024 15:26:35 +0100 Message-ID: <20240111142644.658765-4-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: 4PUTWUARGE2DQTR4KKPOUIGV53HZL6YN X-Message-ID-Hash: 4PUTWUARGE2DQTR4KKPOUIGV53HZL6YN 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: 1704985904276100001 The default number of CPU clusters is 1, and values other than that one are currently rejected by all hypervisor drivers. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/bhyve/bhyve_command.c | 5 +++++ src/conf/cpu_conf.c | 16 +++++++++++++++- src/conf/cpu_conf.h | 1 + src/conf/domain_conf.c | 1 + src/conf/schemas/cputypes.rng | 5 +++++ src/cpu/cpu.c | 1 + src/libxl/libxl_capabilities.c | 1 + src/qemu/qemu_command.c | 5 +++++ src/vmx/vmx.c | 7 +++++++ .../x86_64-host+guest,model486-result.xml | 2 +- .../x86_64-host+guest,models-result.xml | 2 +- tests/cputestdata/x86_64-host+guest-result.xml | 2 +- tests/cputestdata/x86_64-host+guest.xml | 2 +- .../x86_64-host+host-model-nofallback.xml | 2 +- ...host-Haswell-noTSX+Haswell,haswell-result.xml | 2 +- ...aswell-noTSX+Haswell-noTSX,haswell-result.xml | 2 +- ...4-host-Haswell-noTSX+Haswell-noTSX-result.xml | 2 +- .../x86_64-host-worse+guest-result.xml | 2 +- .../ppc64-modern-bulk-result-conf.xml | 2 +- .../ppc64-modern-bulk-result-live.xml | 2 +- .../ppc64-modern-individual-result-conf.xml | 2 +- .../ppc64-modern-individual-result-live.xml | 2 +- .../x86-modern-bulk-result-conf.xml | 2 +- .../x86-modern-bulk-result-live.xml | 2 +- .../x86-modern-individual-add-result-conf.xml | 2 +- .../x86-modern-individual-add-result-live.xml | 2 +- ...e-timeout+graphics-spice-timeout-password.xml | 2 +- .../qemuhotplug-graphics-spice-timeout.xml | 2 +- .../fd-memory-no-numa-topology.xml | 2 +- .../qemuxml2argvdata/fd-memory-numa-topology.xml | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.xml | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.xml | 2 +- .../memfd-memory-default-hugepage.xml | 2 +- tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +- .../memory-hotplug-nvdimm-access.xml | 2 +- .../memory-hotplug-nvdimm-align.xml | 2 +- .../memory-hotplug-nvdimm-label.xml | 2 +- .../memory-hotplug-nvdimm-pmem.xml | 2 +- .../memory-hotplug-nvdimm-readonly.xml | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml | 2 +- .../memory-hotplug-virtio-mem.xml | 2 +- .../memory-hotplug-virtio-pmem.xml | 2 +- .../cpu-numa-disjoint.x86_64-latest.xml | 2 +- .../cpu-numa-disordered.x86_64-latest.xml | 2 +- .../cpu-numa-memshared.x86_64-latest.xml | 2 +- .../cpu-numa-no-memory-element.x86_64-latest.xml | 2 +- .../cpu-numa1.x86_64-latest.xml | 2 +- .../cpu-numa2.x86_64-latest.xml | 2 +- .../memory-hotplug-dimm-addr.x86_64-latest.xml | 2 +- .../memory-hotplug-dimm.x86_64-latest.xml | 2 +- .../memory-hotplug-multiple.x86_64-latest.xml | 2 +- ...plug-nvdimm-ppc64-abi-update.ppc64-latest.xml | 2 +- .../memory-hotplug-nvdimm-ppc64.ppc64-latest.xml | 2 +- .../memory-hotplug.x86_64-latest.xml | 2 +- ...mad-auto-memory-vcpu-cpuset.x86_64-latest.xml | 2 +- ...cpu-no-cpuset-and-placement.x86_64-latest.xml | 2 +- ...numad-auto-vcpu-no-numatune.x86_64-latest.xml | 2 +- ...mad-static-vcpu-no-numatune.x86_64-latest.xml | 2 +- .../pci-expander-bus.x86_64-latest.xml | 2 +- .../pcie-expander-bus.x86_64-latest.xml | 2 +- .../pseries-phb-numa-node.ppc64-latest.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-10.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-8.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-9.xml | 2 +- 65 files changed, 97 insertions(+), 57 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 5b388c7a8f..d05b01ae5d 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -672,6 +672,11 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver= , virDomainDef *def, _("Only 1 die per socket is supported")); return NULL; } + if (def->cpu->clusters !=3D 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 1 cluster per die is supported")); + return NULL; + } if (nvcpus !=3D def->cpu->sockets * def->cpu->cores * def->cpu->th= reads) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid CPU topology: total number of vCPUs = must equal the product of sockets, cores, and threads")); diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 7abe489733..6e6e1b9a89 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -241,6 +241,7 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu) copy->fallback =3D cpu->fallback; copy->sockets =3D cpu->sockets; copy->dies =3D cpu->dies; + copy->clusters =3D cpu->clusters; copy->cores =3D cpu->cores; copy->threads =3D cpu->threads; copy->arch =3D cpu->arch; @@ -572,6 +573,12 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, return -1; } =20 + if (virXMLPropUIntDefault(topology, "clusters", 10, + VIR_XML_PROP_NONZERO, + &def->clusters, 1) < 0) { + return -1; + } + if (virXMLPropUInt(topology, "cores", 10, VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, &def->cores) < 0) { @@ -827,10 +834,11 @@ virCPUDefFormatBuf(virBuffer *buf, virBufferAddLit(buf, "/>\n"); } =20 - if (def->sockets && def->dies && def->cores && def->threads) { + if (def->sockets && def->dies && def->clusters && def->cores && def->t= hreads) { virBufferAddLit(buf, "sockets); virBufferAsprintf(buf, " dies=3D'%u'", def->dies); + virBufferAsprintf(buf, " clusters=3D'%u'", def->clusters); virBufferAsprintf(buf, " cores=3D'%u'", def->cores); virBufferAsprintf(buf, " threads=3D'%u'", def->threads); virBufferAddLit(buf, "/>\n"); @@ -1106,6 +1114,12 @@ virCPUDefIsEqual(virCPUDef *src, return false; } =20 + if (src->clusters !=3D dst->clusters) { + MISMATCH(_("Target CPU clusters %1$d does not match source %2$d"), + dst->clusters, src->clusters); + return false; + } + if (src->cores !=3D dst->cores) { MISMATCH(_("Target CPU cores %1$d does not match source %2$d"), dst->cores, src->cores); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 3e4c53675c..2694022fed 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -148,6 +148,7 @@ struct _virCPUDef { unsigned int microcodeVersion; unsigned int sockets; unsigned int dies; + unsigned int clusters; unsigned int cores; unsigned int threads; unsigned int sigFamily; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index be57a1981e..f9d643fc12 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2316,6 +2316,7 @@ virDomainDefGetVcpusTopology(const virDomainDef *def, =20 /* multiplication of 32bit numbers fits into a 64bit variable */ if ((tmp *=3D def->cpu->dies) > UINT_MAX || + (tmp *=3D def->cpu->clusters) > UINT_MAX || (tmp *=3D def->cpu->cores) > UINT_MAX || (tmp *=3D def->cpu->threads) > UINT_MAX) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng index db1aa57158..3a8910e09f 100644 --- a/src/conf/schemas/cputypes.rng +++ b/src/conf/schemas/cputypes.rng @@ -92,6 +92,11 @@ + + + + + diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index bc43aa4e93..4f048d0dad 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -435,6 +435,7 @@ virCPUGetHost(virArch arch, if (nodeInfo) { cpu->sockets =3D nodeInfo->sockets; cpu->dies =3D 1; + cpu->clusters =3D 1; cpu->cores =3D nodeInfo->cores; cpu->threads =3D nodeInfo->threads; } diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index dfb602ca2f..522256777d 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -152,6 +152,7 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_inf= o) cpu->cores =3D phy_info->cores_per_socket; cpu->threads =3D phy_info->threads_per_core; cpu->dies =3D 1; + cpu->clusters =3D 1; cpu->sockets =3D phy_info->nr_cpus / (cpu->cores * cpu->threads); =20 if (!(data =3D libxlCapsNodeData(cpu, phy_info->hw_cap)) || diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 653817173b..71daa85e55 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7226,6 +7226,11 @@ qemuBuildSmpCommandLine(virCommand *cmd, _("Only 1 die per socket is supported")); return -1; } + if (def->cpu->clusters !=3D 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 1 cluster per die is supported")); + return -1; + } virBufferAsprintf(&buf, ",sockets=3D%u", def->cpu->sockets); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES)) virBufferAsprintf(&buf, ",dies=3D%u", def->cpu->dies); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 26b89776e1..4ac2320251 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1583,6 +1583,7 @@ virVMXParseConfig(virVMXContext *ctx, goto cleanup; } cpu->dies =3D 1; + cpu->clusters =3D 1; cpu->cores =3D coresPerSocket; cpu->threads =3D 1; =20 @@ -3377,6 +3378,12 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLO= ption *xmlopt, virDomainDef goto cleanup; } =20 + if (def->cpu->clusters !=3D 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 1 cluster per die is supported")); + goto cleanup; + } + calculated_vcpus =3D def->cpu->sockets * def->cpu->cores; if (calculated_vcpus !=3D maxvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml b/test= s/cputestdata/x86_64-host+guest,model486-result.xml index ea8e2d3a48..b533f22b88 100644 --- a/tests/cputestdata/x86_64-host+guest,model486-result.xml +++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml @@ -1,6 +1,6 @@ 486 - + diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/= cputestdata/x86_64-host+guest,models-result.xml index 42664a48b4..e975d9bc18 100644 --- a/tests/cputestdata/x86_64-host+guest,models-result.xml +++ b/tests/cputestdata/x86_64-host+guest,models-result.xml @@ -1,6 +1,6 @@ qemu64 - + diff --git a/tests/cputestdata/x86_64-host+guest-result.xml b/tests/cputest= data/x86_64-host+guest-result.xml index 28e3152cbf..cf41b3f872 100644 --- a/tests/cputestdata/x86_64-host+guest-result.xml +++ b/tests/cputestdata/x86_64-host+guest-result.xml @@ -1,6 +1,6 @@ Penryn - + diff --git a/tests/cputestdata/x86_64-host+guest.xml b/tests/cputestdata/x8= 6_64-host+guest.xml index 28e3152cbf..cf41b3f872 100644 --- a/tests/cputestdata/x86_64-host+guest.xml +++ b/tests/cputestdata/x86_64-host+guest.xml @@ -1,6 +1,6 @@ Penryn - + diff --git a/tests/cputestdata/x86_64-host+host-model-nofallback.xml b/test= s/cputestdata/x86_64-host+host-model-nofallback.xml index 16d6e1daf2..881eea7bd0 100644 --- a/tests/cputestdata/x86_64-host+host-model-nofallback.xml +++ b/tests/cputestdata/x86_64-host+host-model-nofallback.xml @@ -1,7 +1,7 @@ Penryn Intel - + diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-re= sult.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-resu= lt.xml index 8eda6684a0..67994c62cc 100644 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml @@ -1,6 +1,6 @@ Haswell - + diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,hasw= ell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,= haswell-result.xml index cb02449d60..4804c0b818 100644 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-res= ult.xml +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-res= ult.xml @@ -1,6 +1,6 @@ Haswell - + diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-resu= lt.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.x= ml index 7ee926aba8..c21b331248 100644 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml @@ -1,4 +1,4 @@ Haswell-noTSX - + diff --git a/tests/cputestdata/x86_64-host-worse+guest-result.xml b/tests/c= putestdata/x86_64-host-worse+guest-result.xml index 9d54c66a8f..712c3ad341 100644 --- a/tests/cputestdata/x86_64-host-worse+guest-result.xml +++ b/tests/cputestdata/x86_64-host-worse+guest-result.xml @@ -1,6 +1,6 @@ Penryn - + diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/= tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml index ad11b2f8a6..1a0d28257e 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml @@ -44,7 +44,7 @@ POWER9 - + destroy diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml b/= tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml index 2a3b4a495f..b127883b36 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml @@ -44,7 +44,7 @@ POWER9 - + destroy diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.= xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml index 34aec9b965..29f1a5ac45 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml @@ -44,7 +44,7 @@ POWER9 - + destroy diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.= xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml index 5ce2cfd0b0..76a85ac9f0 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml @@ -44,7 +44,7 @@ POWER9 - + destroy diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml b/te= sts/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml index 8d52ffedb4..bec46987ff 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml @@ -20,7 +20,7 @@ qemu64 - + destroy diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml b/te= sts/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml index f416397e33..be9769c686 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml @@ -20,7 +20,7 @@ qemu64 - + destroy diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-con= f.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml index 0bd2af8e43..539f607818 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml @@ -20,7 +20,7 @@ qemu64 - + destroy diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-liv= e.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml index b31e6ebe55..acbdd3cfd5 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml @@ -20,7 +20,7 @@ qemu64 - + destroy diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeou= t+graphics-spice-timeout-password.xml b/tests/qemuhotplugtestdomains/qemuho= tplug-graphics-spice-timeout+graphics-spice-timeout-password.xml index 03964ad01c..ee53339338 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graph= ics-spice-timeout-password.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graph= ics-spice-timeout-password.xml @@ -18,7 +18,7 @@ core2duo Intel - + diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeou= t.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml index e6b0cc833a..eb9b902fc5 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml @@ -18,7 +18,7 @@ core2duo Intel - + diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/= qemuxml2argvdata/fd-memory-no-numa-topology.xml index 2090bb8288..92f418fb88 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml @@ -15,7 +15,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qem= uxml2argvdata/fd-memory-numa-topology.xml index 2f94690656..543509d832 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qe= muxml2argvdata/fd-memory-numa-topology2.xml index 3a4e9b478e..d3b98da3c6 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qe= muxml2argvdata/fd-memory-numa-topology3.xml index 0f7f74283b..459d1b9d1d 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2ar= gvdata/hugepages-nvdimm.xml index 1a1500895b..b786b0d3dd 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml @@ -17,7 +17,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tes= ts/qemuxml2argvdata/memfd-memory-default-hugepage.xml index 238d4c6b52..a70bd53134 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml @@ -19,7 +19,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2a= rgvdata/memfd-memory-numa.xml index 1ac87e3aef..0c5d7ba4ef 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.xml +++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml @@ -22,7 +22,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/test= s/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml index bee0346aca..84baf82bf5 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests= /qemuxml2argvdata/memory-hotplug-nvdimm-align.xml index decf87db63..664418e805 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests= /qemuxml2argvdata/memory-hotplug-nvdimm-label.xml index 8a0dab3908..f998f7f276 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/= qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml index a712adfe1e..d66481fd35 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/te= sts/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml index 57629ccb8c..56d6b7b712 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemux= ml2argvdata/memory-hotplug-nvdimm.xml index 865ddcf0ea..ff6e3b7b0f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/q= emuxml2argvdata/memory-hotplug-virtio-mem.xml index c578209d8a..52fa6b14e9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml b/tests/= qemuxml2argvdata/memory-hotplug-virtio-pmem.xml index a8b22dd3c5..2786a739ad 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml b= /tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml index fa2ec31463..4f33094949 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml= b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml index 1b4d0bfa67..75dcb8c9e2 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml = b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml index 47ed9efd69..c45e295921 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-lat= est.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest= .xml index 57bbacdff0..663d137ff5 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml b/tests/q= emuxml2xmloutdata/cpu-numa1.x86_64-latest.xml index 57bbacdff0..663d137ff5 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml b/tests/q= emuxml2xmloutdata/cpu-numa2.x86_64-latest.xml index 57bbacdff0..663d137ff5 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-lates= t.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml index 0a32d5491a..38b41e6719 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml= b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml index 7c1b7b2c5d..7f0dc85c0e 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest= .xml b/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml index 42b0f7b880..b3306fb569 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-updat= e.ppc64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-a= bi-update.ppc64-latest.xml index ae157c4849..4cc0c674df 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64= -latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64= -latest.xml @@ -11,7 +11,7 @@ POWER9 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-lat= est.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest= .xml index 3c1cbc731d..a5c26e3c5b 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml @@ -11,7 +11,7 @@ POWER9 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml b/te= sts/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml index 083102e8d6..697819387f 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-= latest.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-= latest.xml index 2d04bc23c2..6068a76464 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.= xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.= xml @@ -13,7 +13,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-= placement.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vc= pu-no-cpuset-and-placement.x86_64-latest.xml index 80f7284126..6c558526e9 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placeme= nt.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placeme= nt.x86_64-latest.xml @@ -13,7 +13,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-la= test.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-late= st.xml index 724209f6e3..6e1fecb488 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml @@ -13,7 +13,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-= latest.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-= latest.xml index 2a4ee0d496..c42d7066f9 100644 --- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.= xml +++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.= xml @@ -10,7 +10,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml b/= tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml index b63c8c145a..2a6c329a40 100644 --- a/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml b= /tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml index a441be8ebe..99612740b2 100644 --- a/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xm= l b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml index 59015846fb..0a044f50b0 100644 --- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml @@ -14,7 +14,7 @@ POWER9 - + diff --git a/tests/vmx2xmldata/esx-in-the-wild-10.xml b/tests/vmx2xmldata/e= sx-in-the-wild-10.xml index 47ed637920..78129682bd 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-10.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-10.xml @@ -12,7 +12,7 @@ hvm - + destroy diff --git a/tests/vmx2xmldata/esx-in-the-wild-8.xml b/tests/vmx2xmldata/es= x-in-the-wild-8.xml index 0eea610709..47d22ced2a 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-8.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-8.xml @@ -11,7 +11,7 @@ hvm - + destroy diff --git a/tests/vmx2xmldata/esx-in-the-wild-9.xml b/tests/vmx2xmldata/es= x-in-the-wild-9.xml index 66eca400dd..ee6be2527f 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-9.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-9.xml @@ -12,7 +12,7 @@ hvm - + destroy --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org