From nobody Wed May 14 20:52:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526460031272483.3985836743766; Wed, 16 May 2018 01:40:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50431315366A; Wed, 16 May 2018 08:40:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 029146017C; Wed, 16 May 2018 08:40:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8A02F180BAE4; Wed, 16 May 2018 08:40:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4G8dkLe018387 for ; Wed, 16 May 2018 04:39:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5CC0B2166BB1; Wed, 16 May 2018 08:39:46 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F2612166BAE for ; Wed, 16 May 2018 08:39:46 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id DEE3E102EEE; Wed, 16 May 2018 10:39:42 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Wed, 16 May 2018 10:39:36 +0200 Message-Id: <9485268543c29f756fb54a3a734675c1bcba7758.1526459534.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 17/22] cpu: Add explicit arch parameter for virCPUBaseline X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 16 May 2018 08:40:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is required for virCPUBaseline to accept a list of guest CPU definitions since they do not have arch set. Signed-off-by: Jiri Denemark Reviewed-by: Collin Walling Reviewed-by: J=EF=BF=BDn Tomko --- src/bhyve/bhyve_driver.c | 2 +- src/cpu/cpu.c | 16 +++++++++++----- src/cpu/cpu.h | 3 ++- src/libxl/libxl_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/test/test_driver.c | 2 +- src/vz/vz_driver.c | 2 +- tests/cputest.c | 2 +- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 72c51434c7..26047d31e2 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1398,7 +1398,7 @@ bhyveConnectBaselineCPU(virConnectPtr conn, if (!(cpus =3D virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; =20 - if (!(cpu =3D virCPUBaseline(cpus, ncpus, NULL, + if (!(cpu =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATA= BLE)))) goto cleanup; =20 diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 81b93a991b..2c60d27b17 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -481,20 +481,22 @@ virCPUProbeHost(virArch arch) /** * virCPUBaseline: * + * @arch: CPU architecture, use VIR_ARCH_NONE to autodetect from @cpus * @cpus: list of host CPU definitions * @ncpus: number of CPUs in @cpus * @models: list of CPU models that can be considered for the baseline CPU * @migratable: requests non-migratable features to be removed from the re= sult * * Computes the most feature-rich CPU which is compatible with all given - * host CPUs. If @models is NULL, all models supported by libvirt will + * CPUs. If @models is NULL, all models supported by libvirt will * be considered when computing the baseline CPU model, otherwise the base= line * CPU model will be one of the provided CPU @models. * * Returns baseline CPU definition or NULL on error. */ virCPUDefPtr -virCPUBaseline(virCPUDefPtr *cpus, +virCPUBaseline(virArch arch, + virCPUDefPtr *cpus, unsigned int ncpus, virDomainCapsCPUModelsPtr models, bool migratable) @@ -502,7 +504,8 @@ virCPUBaseline(virCPUDefPtr *cpus, struct cpuArchDriver *driver; size_t i; =20 - VIR_DEBUG("ncpus=3D%u, models=3D%p, migratable=3D%d", ncpus, models, m= igratable); + VIR_DEBUG("arch=3D%s, ncpus=3D%u, models=3D%p, migratable=3D%d", + virArchToString(arch), ncpus, models, migratable); if (cpus) { for (i =3D 0; i < ncpus; i++) VIR_DEBUG("cpus[%zu]=3D%p", i, cpus[i]); @@ -536,13 +539,16 @@ virCPUBaseline(virCPUDefPtr *cpus, } } =20 - if ((driver =3D cpuGetSubDriver(cpus[0]->arch)) =3D=3D NULL) + if (arch =3D=3D VIR_ARCH_NONE) + arch =3D cpus[0]->arch; + + if ((driver =3D cpuGetSubDriver(arch)) =3D=3D NULL) return NULL; =20 if (driver->baseline =3D=3D NULL) { virReportError(VIR_ERR_NO_SUPPORT, _("cannot compute baseline CPU of %s architecture"), - virArchToString(cpus[0]->arch)); + virArchToString(arch)); return NULL; } =20 diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 529068a618..8c45bf8b31 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -194,7 +194,8 @@ virCPUDefPtr virCPUProbeHost(virArch arch); =20 virCPUDefPtr -virCPUBaseline(virCPUDefPtr *cpus, +virCPUBaseline(virArch arch, + virCPUDefPtr *cpus, unsigned int ncpus, virDomainCapsCPUModelsPtr models, bool migratable); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e11969dca7..a85ce84404 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6349,7 +6349,7 @@ libxlConnectBaselineCPU(virConnectPtr conn, if (!(cpus =3D virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; =20 - if (!(cpu =3D virCPUBaseline(cpus, ncpus, NULL, + if (!(cpu =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATA= BLE)))) goto cleanup; =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 17167129da..b95e1f5296 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13179,7 +13179,7 @@ qemuConnectBaselineCPU(virConnectPtr conn ATTRIBUTE= _UNUSED, if (!(cpus =3D virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; =20 - if (!(baseline =3D virCPUBaseline(cpus, ncpus, NULL, + if (!(baseline =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, !!(flags & VIR_CONNECT_BASELINE_CPU_MI= GRATABLE)))) goto cleanup; =20 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index abb856a5b2..3b4acaf7fe 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1536,7 +1536,7 @@ testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_U= NUSED, if (!(cpus =3D virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; =20 - if (!(cpu =3D virCPUBaseline(cpus, ncpus, NULL, false))) + if (!(cpu =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, false))) goto cleanup; =20 if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) && diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d4cf2d5f62..50cd0acfdf 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -934,7 +934,7 @@ vzConnectBaselineCPU(virConnectPtr conn, if (!(cpus =3D virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; =20 - if (!(cpu =3D virCPUBaseline(cpus, ncpus, NULL, false))) + if (!(cpu =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, false))) goto cleanup; =20 if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) && diff --git a/tests/cputest.c b/tests/cputest.c index beb9afabdf..9b84ffea86 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -321,7 +321,7 @@ cpuTestBaseline(const void *arg) if (!(cpus =3D cpuTestLoadMultiXML(data->arch, data->name, &ncpus))) goto cleanup; =20 - baseline =3D virCPUBaseline(cpus, ncpus, NULL, + baseline =3D virCPUBaseline(data->arch, cpus, ncpus, NULL, !!(data->flags & VIR_CONNECT_BASELINE_CPU_MI= GRATABLE)); =20 if (baseline && --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list