From nobody Wed May 14 02:31:17 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 1526460038662464.85792776914207; Wed, 16 May 2018 01:40:38 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 402EBB6D23; Wed, 16 May 2018 08:40:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F111430012CE; Wed, 16 May 2018 08:40:35 +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 5C4CC3D38F; Wed, 16 May 2018 08:40:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4G8dkjB018391 for ; Wed, 16 May 2018 04:39:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6BF5A2024CBC; 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 2E48C2024CBD for ; Wed, 16 May 2018 08:39:46 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id E7817102EF0; Wed, 16 May 2018 10:39:42 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Wed, 16 May 2018 10:39:38 +0200 Message-Id: <1116f33c50f64286ff45fc82581807f9a4b668ab.1526459534.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 19/22] cpu: Add optional list of allowed features to 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 16 May 2018 08:40:37 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When computing a baseline CPU for a specific hypervisor we have to make sure to include only CPU features supported by the hypervisor. Otherwise the computed CPU could not be used for starting a new domain. 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 | 8 +++++--- src/cpu/cpu.h | 2 ++ src/cpu/cpu_arm.c | 1 + src/cpu/cpu_ppc64.c | 1 + src/cpu/cpu_x86.c | 18 ++++++++++++++++++ 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 +- 11 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 26047d31e2..97e8d4eb37 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(VIR_ARCH_NONE, cpus, ncpus, NULL, + if (!(cpu =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, NULL, !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATA= BLE)))) goto cleanup; =20 diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index b6c1695f2a..cc93c49418 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -485,6 +485,7 @@ virCPUProbeHost(virArch arch) * @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 + * @features: optional NULL terminated list of allowed features * @migratable: requests non-migratable features to be removed from the re= sult * * Computes the most feature-rich CPU which is compatible with all given @@ -499,13 +500,14 @@ virCPUBaseline(virArch arch, virCPUDefPtr *cpus, unsigned int ncpus, virDomainCapsCPUModelsPtr models, + const char **features, bool migratable) { struct cpuArchDriver *driver; size_t i; =20 - VIR_DEBUG("arch=3D%s, ncpus=3D%u, models=3D%p, migratable=3D%d", - virArchToString(arch), ncpus, models, migratable); + VIR_DEBUG("arch=3D%s, ncpus=3D%u, models=3D%p, features=3D%p, migratab= le=3D%d", + virArchToString(arch), ncpus, models, features, migratable); if (cpus) { for (i =3D 0; i < ncpus; i++) VIR_DEBUG("cpus[%zu]=3D%p", i, cpus[i]); @@ -552,7 +554,7 @@ virCPUBaseline(virArch arch, return NULL; } =20 - return driver->baseline(cpus, ncpus, models, migratable); + return driver->baseline(cpus, ncpus, models, features, migratable); } =20 =20 diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 8c45bf8b31..81119b6aeb 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -76,6 +76,7 @@ typedef virCPUDefPtr (*virCPUArchBaseline)(virCPUDefPtr *cpus, unsigned int ncpus, virDomainCapsCPUModelsPtr models, + const char **features, bool migratable); =20 typedef int @@ -198,6 +199,7 @@ virCPUBaseline(virArch arch, virCPUDefPtr *cpus, unsigned int ncpus, virDomainCapsCPUModelsPtr models, + const char **features, bool migratable); =20 int diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index a9aa065f9f..cc7da44ac4 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -76,6 +76,7 @@ static virCPUDefPtr virCPUarmBaseline(virCPUDefPtr *cpus, unsigned int ncpus ATTRIBUTE_UNUSED, virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED, + const char **features ATTRIBUTE_UNUSED, bool migratable ATTRIBUTE_UNUSED) { virCPUDefPtr cpu =3D NULL; diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index c213245fc9..d562677fa3 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -770,6 +770,7 @@ static virCPUDefPtr virCPUppc64Baseline(virCPUDefPtr *cpus, unsigned int ncpus, virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED, + const char **features ATTRIBUTE_UNUSED, bool migratable ATTRIBUTE_UNUSED) { struct ppc64_map *map; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 6bef4089e9..809da94117 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2467,6 +2467,7 @@ static virCPUDefPtr virCPUx86Baseline(virCPUDefPtr *cpus, unsigned int ncpus, virDomainCapsCPUModelsPtr models, + const char **features, bool migratable) { virCPUx86MapPtr map =3D NULL; @@ -2478,6 +2479,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus, bool outputVendor =3D true; const char *modelName; bool matchingNames =3D true; + virCPUDataPtr featData =3D NULL; =20 if (!(map =3D virCPUx86GetMap())) goto error; @@ -2550,6 +2552,21 @@ virCPUx86Baseline(virCPUDefPtr *cpus, model =3D NULL; } =20 + if (features) { + virCPUx86FeaturePtr feat; + + if (!(featData =3D virCPUDataNew(archs[0]))) + goto cleanup; + + for (i =3D 0; features[i]; i++) { + if ((feat =3D x86FeatureFind(map, features[i])) && + x86DataAdd(&featData->data.x86, &feat->data) < 0) + goto cleanup; + } + + x86DataIntersect(&base_model->data, &featData->data.x86); + } + if (x86DataIsEmpty(&base_model->data)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("CPUs are incompatible")); @@ -2571,6 +2588,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus, =20 cleanup: x86ModelFree(base_model); + virCPUx86DataFree(featData); =20 return cpu; =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a85ce84404..8c40661e5a 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(VIR_ARCH_NONE, cpus, ncpus, NULL, + if (!(cpu =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, 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 b95e1f5296..e036764f92 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(VIR_ARCH_NONE, cpus, ncpus, NULL, + if (!(baseline =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, NU= LL, !!(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 3b4acaf7fe..09f17bc8f9 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(VIR_ARCH_NONE, cpus, ncpus, NULL, false))) + if (!(cpu =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, NULL, f= alse))) 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 50cd0acfdf..c9520d4a58 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(VIR_ARCH_NONE, cpus, ncpus, NULL, false))) + if (!(cpu =3D virCPUBaseline(VIR_ARCH_NONE, cpus, ncpus, NULL, NULL, f= alse))) goto cleanup; =20 if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) && diff --git a/tests/cputest.c b/tests/cputest.c index 9b84ffea86..baf2b3c648 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(data->arch, cpus, ncpus, NULL, + baseline =3D virCPUBaseline(data->arch, cpus, ncpus, NULL, 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