From nobody Sun Feb 8 22:08:28 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 1554712997972261.9922586100747; Mon, 8 Apr 2019 01:43:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EEB3A89C46; Mon, 8 Apr 2019 08:43:15 +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 CBC9E60F88; Mon, 8 Apr 2019 08:43:15 +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 81E153FA4E; Mon, 8 Apr 2019 08:43:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x388gvLi009103 for ; Mon, 8 Apr 2019 04:42:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 73D035DA2C; 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 452C25DA24 for ; Mon, 8 Apr 2019 08:42:57 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id E967310366A; Mon, 8 Apr 2019 10:42:50 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Mon, 8 Apr 2019 10:42:22 +0200 Message-Id: <345d1d121f6b6c349e4cf11e962536d11db3cb1d.1554711784.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 18/36] cpu_x86: Make x86cpuidClearBits more general 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.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 08 Apr 2019 08:43:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The parameters changed from virCPUx86CPUID to virCPUx86DataItem and the function is now called virCPUx86DataItemClearBits. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/cpu/cpu_x86.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index f713f02929..dcdd0b60b0 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -230,16 +230,16 @@ virCPUx86DataItemSetBits(virCPUx86DataItemPtr item, =20 =20 static void -x86cpuidClearBits(virCPUx86CPUID *cpuid, - const virCPUx86CPUID *mask) +virCPUx86DataItemClearBits(virCPUx86DataItemPtr item, + const virCPUx86DataItem *mask) { if (!mask) return; =20 - cpuid->eax &=3D ~mask->eax; - cpuid->ebx &=3D ~mask->ebx; - cpuid->ecx &=3D ~mask->ecx; - cpuid->edx &=3D ~mask->edx; + item->cpuid.eax &=3D ~mask->cpuid.eax; + item->cpuid.ebx &=3D ~mask->cpuid.ebx; + item->cpuid.ecx &=3D ~mask->cpuid.ecx; + item->cpuid.edx &=3D ~mask->cpuid.edx; } =20 =20 @@ -432,8 +432,8 @@ x86DataSubtract(virCPUx86Data *data1, virCPUx86DataItemPtr item2; =20 while ((item1 =3D virCPUx86DataNext(&iter))) { - if ((item2 =3D virCPUx86DataGet(data2, item1))) - x86cpuidClearBits(&item1->cpuid, &item2->cpuid); + item2 =3D virCPUx86DataGet(data2, item1); + virCPUx86DataItemClearBits(item1, item2); } } =20 @@ -451,7 +451,7 @@ x86DataIntersect(virCPUx86Data *data1, if (item2) x86cpuidAndBits(&item1->cpuid, &item2->cpuid); else - x86cpuidClearBits(&item1->cpuid, &item1->cpuid); + virCPUx86DataItemClearBits(item1, item1); } } =20 @@ -517,7 +517,7 @@ x86DataToVendor(const virCPUx86Data *data, virCPUx86VendorPtr vendor =3D map->vendors[i]; if ((item =3D virCPUx86DataGet(data, &vendor->data)) && x86cpuidMatchMasked(&item->cpuid, &vendor->data.cpuid)) { - x86cpuidClearBits(&item->cpuid, &vendor->data.cpuid); + virCPUx86DataItemClearBits(item, &vendor->data); return vendor; } } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list