From nobody Wed May 14 20:49:16 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 1526460035017136.5948381240405; Wed, 16 May 2018 01:40:35 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 47338347DD2; Wed, 16 May 2018 08:40:33 +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 11DF898F78; Wed, 16 May 2018 08:40:33 +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 AAA533D389; Wed, 16 May 2018 08:40:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4G8dmIj018446 for ; Wed, 16 May 2018 04:39:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2AC1110AF9D9; Wed, 16 May 2018 08:39:48 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E13E71142372 for ; Wed, 16 May 2018 08:39:46 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id D66DE102EEC; Wed, 16 May 2018 10:39:42 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Wed, 16 May 2018 10:39:34 +0200 Message-Id: <1d691dec189c4219750b8e46649a1066d664a9b9.1526459534.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/22] cpu: Rename cpuBaseline as 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 16 May 2018 08:40:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: J=EF=BF=BDn Tomko --- src/bhyve/bhyve_driver.c | 4 ++-- src/cpu/cpu.c | 10 +++++----- src/cpu/cpu.h | 18 +++++++++--------- src/cpu/cpu_arm.c | 10 +++++----- src/cpu/cpu_ppc64.c | 4 ++-- src/cpu/cpu_x86.c | 10 +++++----- src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 4 ++-- src/qemu/qemu_driver.c | 4 ++-- src/test/test_driver.c | 2 +- src/vz/vz_driver.c | 2 +- tests/cputest.c | 6 +++--- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index d2a538337f..72c51434c7 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1398,8 +1398,8 @@ bhyveConnectBaselineCPU(virConnectPtr conn, if (!(cpus =3D virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; =20 - if (!(cpu =3D cpuBaseline(cpus, ncpus, NULL, - !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE= )))) + if (!(cpu =3D virCPUBaseline(cpus, ncpus, NULL, + !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATA= BLE)))) goto cleanup; =20 if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) && diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 047e3b1112..81b93a991b 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -479,7 +479,7 @@ virCPUProbeHost(virArch arch) =20 =20 /** - * cpuBaseline: + * virCPUBaseline: * * @cpus: list of host CPU definitions * @ncpus: number of CPUs in @cpus @@ -494,10 +494,10 @@ virCPUProbeHost(virArch arch) * Returns baseline CPU definition or NULL on error. */ virCPUDefPtr -cpuBaseline(virCPUDefPtr *cpus, - unsigned int ncpus, - virDomainCapsCPUModelsPtr models, - bool migratable) +virCPUBaseline(virCPUDefPtr *cpus, + unsigned int ncpus, + virDomainCapsCPUModelsPtr models, + bool migratable) { struct cpuArchDriver *driver; size_t i; diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 83d5bcb63f..529068a618 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -73,10 +73,10 @@ typedef int virDomainCapsCPUModelsPtr models); =20 typedef virCPUDefPtr -(*cpuArchBaseline) (virCPUDefPtr *cpus, - unsigned int ncpus, - virDomainCapsCPUModelsPtr models, - bool migratable); +(*virCPUArchBaseline)(virCPUDefPtr *cpus, + unsigned int ncpus, + virDomainCapsCPUModelsPtr models, + bool migratable); =20 typedef int (*virCPUArchUpdate)(virCPUDefPtr guest, @@ -129,7 +129,7 @@ struct cpuArchDriver { cpuArchEncode encode; cpuArchDataFree dataFree; virCPUArchGetHost getHost; - cpuArchBaseline baseline; + virCPUArchBaseline baseline; virCPUArchUpdate update; virCPUArchUpdateLive updateLive; virCPUArchCheckFeature checkFeature; @@ -194,10 +194,10 @@ virCPUDefPtr virCPUProbeHost(virArch arch); =20 virCPUDefPtr -cpuBaseline (virCPUDefPtr *cpus, - unsigned int ncpus, - virDomainCapsCPUModelsPtr models, - bool migratable); +virCPUBaseline(virCPUDefPtr *cpus, + unsigned int ncpus, + virDomainCapsCPUModelsPtr models, + bool migratable); =20 int virCPUUpdate(virArch arch, diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 44cb4fea68..a9aa065f9f 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -73,10 +73,10 @@ virCPUarmUpdate(virCPUDefPtr guest, =20 =20 static virCPUDefPtr -armBaseline(virCPUDefPtr *cpus, - unsigned int ncpus ATTRIBUTE_UNUSED, - virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED, - bool migratable ATTRIBUTE_UNUSED) +virCPUarmBaseline(virCPUDefPtr *cpus, + unsigned int ncpus ATTRIBUTE_UNUSED, + virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED, + bool migratable ATTRIBUTE_UNUSED) { virCPUDefPtr cpu =3D NULL; =20 @@ -107,6 +107,6 @@ struct cpuArchDriver cpuDriverArm =3D { .compare =3D virCPUarmCompare, .decode =3D NULL, .encode =3D NULL, - .baseline =3D armBaseline, + .baseline =3D virCPUarmBaseline, .update =3D virCPUarmUpdate, }; diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 76582d4083..c213245fc9 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -767,7 +767,7 @@ virCPUppc64Update(virCPUDefPtr guest, } =20 static virCPUDefPtr -ppc64DriverBaseline(virCPUDefPtr *cpus, +virCPUppc64Baseline(virCPUDefPtr *cpus, unsigned int ncpus, virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED, bool migratable ATTRIBUTE_UNUSED) @@ -901,7 +901,7 @@ struct cpuArchDriver cpuDriverPPC64 =3D { .encode =3D NULL, .dataFree =3D virCPUppc64DataFree, .getHost =3D virCPUppc64GetHost, - .baseline =3D ppc64DriverBaseline, + .baseline =3D virCPUppc64Baseline, .update =3D virCPUppc64Update, .getModels =3D virCPUppc64DriverGetModels, .convertLegacy =3D virCPUppc64ConvertLegacy, diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index b2398c5ad2..188d1eba75 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2464,10 +2464,10 @@ virCPUx86GetHost(virCPUDefPtr cpu, =20 =20 static virCPUDefPtr -x86Baseline(virCPUDefPtr *cpus, - unsigned int ncpus, - virDomainCapsCPUModelsPtr models, - bool migratable) +virCPUx86Baseline(virCPUDefPtr *cpus, + unsigned int ncpus, + virDomainCapsCPUModelsPtr models, + bool migratable) { virCPUx86MapPtr map =3D NULL; virCPUx86ModelPtr base_model =3D NULL; @@ -3050,7 +3050,7 @@ struct cpuArchDriver cpuDriverX86 =3D { #if defined(__i386__) || defined(__x86_64__) .getHost =3D virCPUx86GetHost, #endif - .baseline =3D x86Baseline, + .baseline =3D virCPUx86Baseline, .update =3D virCPUx86Update, .updateLive =3D virCPUx86UpdateLive, .checkFeature =3D virCPUx86CheckFeature, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3dece252df..912676ec7a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1139,9 +1139,9 @@ virStoragePoolObjVolumeListExport; =20 =20 # cpu/cpu.h -cpuBaseline; cpuDecode; cpuEncode; +virCPUBaseline; virCPUCheckFeature; virCPUCompare; virCPUCompareXML; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index df53dead0a..e11969dca7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6349,8 +6349,8 @@ libxlConnectBaselineCPU(virConnectPtr conn, if (!(cpus =3D virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; =20 - if (!(cpu =3D cpuBaseline(cpus, ncpus, NULL, - !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE= )))) + if (!(cpu =3D virCPUBaseline(cpus, ncpus, NULL, + !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATA= BLE)))) goto cleanup; =20 if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) && diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4b48afdad1..17167129da 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13179,8 +13179,8 @@ qemuConnectBaselineCPU(virConnectPtr conn ATTRIBUTE= _UNUSED, if (!(cpus =3D virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; =20 - if (!(baseline =3D cpuBaseline(cpus, ncpus, NULL, - !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRA= TABLE)))) + if (!(baseline =3D virCPUBaseline(cpus, ncpus, NULL, + !!(flags & VIR_CONNECT_BASELINE_CPU_MI= GRATABLE)))) goto cleanup; =20 if (!(cpu =3D virCPUDefCopyWithoutModel(baseline))) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 467587b19f..abb856a5b2 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 cpuBaseline(cpus, ncpus, NULL, false))) + if (!(cpu =3D virCPUBaseline(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 48a9a866d9..d4cf2d5f62 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 cpuBaseline(cpus, ncpus, NULL, false))) + if (!(cpu =3D virCPUBaseline(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 e86cd0b9bc..beb9afabdf 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -321,8 +321,8 @@ cpuTestBaseline(const void *arg) if (!(cpus =3D cpuTestLoadMultiXML(data->arch, data->name, &ncpus))) goto cleanup; =20 - baseline =3D cpuBaseline(cpus, ncpus, NULL, - !!(data->flags & VIR_CONNECT_BASELINE_CPU_MIGRA= TABLE)); + baseline =3D virCPUBaseline(cpus, ncpus, NULL, + !!(data->flags & VIR_CONNECT_BASELINE_CPU_MI= GRATABLE)); =20 if (baseline && (data->flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) && @@ -337,7 +337,7 @@ cpuTestBaseline(const void *arg) ret =3D 0; } else { VIR_TEST_VERBOSE("\n%-70s... ", - "cpuBaseline was expected to fail but it succeeded"); + "virCPUBaseline was expected to fail but it succeeded"= ); } goto cleanup; } --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list