From nobody Mon Feb 9 04:45:23 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 155471298611632.96277097261691; Mon, 8 Apr 2019 01:43:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6FD8B81113; Mon, 8 Apr 2019 08:43:04 +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 4608E665CA; Mon, 8 Apr 2019 08:43:04 +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 F0134181AC92; Mon, 8 Apr 2019 08:43:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x388gvN6009114 for ; Mon, 8 Apr 2019 04:42:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id C16ED5D71C; 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 96C675D71F for ; Mon, 8 Apr 2019 08:42:57 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 000F110366C; Mon, 8 Apr 2019 10:42:50 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Mon, 8 Apr 2019 10:42:24 +0200 Message-Id: <1e7c7ceb088b211961e53c7cc978d68e484f12d5.1554711784.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 20/36] cpu_x86: Make x86cpuidMatchMasked 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 08 Apr 2019 08:43:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The function is renamed as virCPUx86DataItemMatchMasked to reflect the change in parameter types. 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 57bdffc3af..b88cd83aed 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -205,13 +205,13 @@ x86cpuidMatch(const virCPUx86CPUID *cpuid1, =20 =20 static bool -x86cpuidMatchMasked(const virCPUx86CPUID *cpuid, - const virCPUx86CPUID *mask) +virCPUx86DataItemMatchMasked(const virCPUx86DataItem *item, + const virCPUx86DataItem *mask) { - return ((cpuid->eax & mask->eax) =3D=3D mask->eax && - (cpuid->ebx & mask->ebx) =3D=3D mask->ebx && - (cpuid->ecx & mask->ecx) =3D=3D mask->ecx && - (cpuid->edx & mask->edx) =3D=3D mask->edx); + return ((item->cpuid.eax & mask->cpuid.eax) =3D=3D mask->cpuid.eax && + (item->cpuid.ebx & mask->cpuid.ebx) =3D=3D mask->cpuid.ebx && + (item->cpuid.ecx & mask->cpuid.ecx) =3D=3D mask->cpuid.ecx && + (item->cpuid.edx & mask->cpuid.edx) =3D=3D mask->cpuid.edx); } =20 =20 @@ -475,7 +475,7 @@ x86DataIsSubset(const virCPUx86Data *data, =20 while ((itemSubset =3D virCPUx86DataNext(&iter))) { if (!(item =3D virCPUx86DataGet(data, itemSubset)) || - !x86cpuidMatchMasked(&item->cpuid, &itemSubset->cpuid)) + !virCPUx86DataItemMatchMasked(item, itemSubset)) return false; } =20 @@ -516,7 +516,7 @@ x86DataToVendor(const virCPUx86Data *data, for (i =3D 0; i < map->nvendors; i++) { virCPUx86VendorPtr vendor =3D map->vendors[i]; if ((item =3D virCPUx86DataGet(data, &vendor->data)) && - x86cpuidMatchMasked(&item->cpuid, &vendor->data.cpuid)) { + virCPUx86DataItemMatchMasked(item, &vendor->data)) { virCPUx86DataItemClearBits(item, &vendor->data); return vendor; } @@ -1158,7 +1158,7 @@ x86ModelCompare(virCPUx86ModelPtr model1, if ((item2 =3D virCPUx86DataGet(&model2->data, item1))) { if (x86cpuidMatch(&item1->cpuid, &item2->cpuid)) continue; - else if (!x86cpuidMatchMasked(&item1->cpuid, &item2->cpuid)) + else if (!virCPUx86DataItemMatchMasked(item1, item2)) match =3D SUBSET; } =20 @@ -1174,7 +1174,7 @@ x86ModelCompare(virCPUx86ModelPtr model1, if ((item1 =3D virCPUx86DataGet(&model1->data, item2))) { if (x86cpuidMatch(&item2->cpuid, &item1->cpuid)) continue; - else if (!x86cpuidMatchMasked(&item2->cpuid, &item1->cpuid)) + else if (!virCPUx86DataItemMatchMasked(item2, item1)) match =3D SUPERSET; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list