From nobody Mon Feb 9 12:11:29 2026 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 1554713002507650.4386143568562; Mon, 8 Apr 2019 01:43:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA7F2308CF8A; Mon, 8 Apr 2019 08:43:20 +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 87F5C1A267; Mon, 8 Apr 2019 08:43:20 +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 47E2B181BA04; Mon, 8 Apr 2019 08:43:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x388gvD5009131 for ; Mon, 8 Apr 2019 04:42:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id E7F66189FA; Mon, 8 Apr 2019 08:42:57 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB3D8600D4 for ; Mon, 8 Apr 2019 08:42:55 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id ACC0810363F; Mon, 8 Apr 2019 10:42:50 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Mon, 8 Apr 2019 10:42:11 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/36] cpu_x86: Rename virCPUx86Vendor.cpuid 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: , 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 08 Apr 2019 08:43:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Although vendor string is always reported by CPUID, the container struct is used for consistency and thus "cpuid" name is not a good fit anymore. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/cpu/cpu_x86.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index c7937d55fd..8a10c237e9 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -45,7 +45,7 @@ typedef struct _virCPUx86Vendor virCPUx86Vendor; typedef virCPUx86Vendor *virCPUx86VendorPtr; struct _virCPUx86Vendor { char *name; - virCPUx86DataItem cpuid; + virCPUx86DataItem data; }; =20 typedef struct _virCPUx86Feature virCPUx86Feature; @@ -515,9 +515,9 @@ x86DataToVendor(const virCPUx86Data *data, =20 for (i =3D 0; i < map->nvendors; i++) { virCPUx86VendorPtr vendor =3D map->vendors[i]; - if ((cpuid =3D x86DataCpuid(data, &vendor->cpuid)) && - x86cpuidMatchMasked(&cpuid->cpuid, &vendor->cpuid.cpuid)) { - x86cpuidClearBits(&cpuid->cpuid, &vendor->cpuid.cpuid); + if ((cpuid =3D x86DataCpuid(data, &vendor->data)) && + x86cpuidMatchMasked(&cpuid->cpuid, &vendor->data.cpuid)) { + x86cpuidClearBits(&cpuid->cpuid, &vendor->data.cpuid); return vendor; } } @@ -760,7 +760,7 @@ x86VendorParse(xmlXPathContextPtr ctxt, goto cleanup; } =20 - if (virCPUx86VendorToCPUID(string, &vendor->cpuid) < 0) + if (virCPUx86VendorToCPUID(string, &vendor->data) < 0) goto cleanup; =20 if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0) @@ -1666,7 +1666,7 @@ x86Compute(virCPUDefPtr host, =20 if (cpu->vendor && host_model->vendor && virCPUx86DataAddCPUIDInt(&guest_model->data, - &host_model->vendor->cpuid) < 0) + &host_model->vendor->data) < 0) goto error; =20 if (host_model->signatures && @@ -2154,7 +2154,7 @@ x86Encode(virArch arch, if (!(data_vendor =3D virCPUDataNew(arch))) goto error; =20 - if (v && virCPUx86DataAddCPUID(data_vendor, &v->cpuid) < 0) + if (v && virCPUx86DataAddCPUID(data_vendor, &v->data) < 0) goto error; } =20 @@ -2651,7 +2651,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus, } =20 if (vendor && - virCPUx86DataAddCPUIDInt(&base_model->data, &vendor->cpuid) < 0) + virCPUx86DataAddCPUIDInt(&base_model->data, &vendor->data) < 0) goto error; =20 if (x86Decode(cpu, &base_model->data, models, modelName, migratable) <= 0) @@ -2950,7 +2950,7 @@ virCPUx86Translate(virCPUDefPtr cpu, goto cleanup; =20 if (model->vendor && - virCPUx86DataAddCPUIDInt(&model->data, &model->vendor->cpuid) < 0) + virCPUx86DataAddCPUIDInt(&model->data, &model->vendor->data) < 0) goto cleanup; =20 if (model->signatures && --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list