From nobody Fri Dec 19 07:48:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667576639; cv=none; d=zohomail.com; s=zohoarc; b=SUq9qQI7t1hB7SXzlUnVLdhny2eEAuGWTvmSGpKusX961+3fYR8N/V9N6G+Wn3iG7tIV4um3AjQly5Gcl55DkP6j2lfn0xTGeEpHoT+PR0Tf0zQBg/2NmszvaSUBkx2LqpERDbNUaLKLRKkIA41S9JBBopN5sPfmpJ/90/FdKSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667576639; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zmHeduGLmvP5+esbnnD4JabvbAGcDwE5OBtKrTVrrVM=; b=JAKH4gnARldeW/7BmeArPnuv/HdSX0RH81AoEEH2VTURcZAUKEmKS7528PSpDUVMwTF7dbHIoxDUfBFXJWvoo//zUSpeVNO2KFHjq9mZ3eIgMOlOlp/1dKmGn5CjkitcKegpsyNnIVosOZqovKyTYbhW0K0nYTX5BnCcAveufTI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667576639982635.8286956245054; Fri, 4 Nov 2022 08:43:59 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-81-Ra-lzLCgMqahCh_G3AH_pg-1; Fri, 04 Nov 2022 11:43:53 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2A4623826A4F; Fri, 4 Nov 2022 15:43:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EA694EA5A; Fri, 4 Nov 2022 15:43:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EEA071946A67; Fri, 4 Nov 2022 15:43:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A672B1946587 for ; Fri, 4 Nov 2022 15:43:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 98F52C2DF63; Fri, 4 Nov 2022 15:43:47 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.193.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02B6FC2C8DD; Fri, 4 Nov 2022 15:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667576639; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=zmHeduGLmvP5+esbnnD4JabvbAGcDwE5OBtKrTVrrVM=; b=XKO7dmiKVistkn1tEgx/foSoT2LeizQ5xdipS8k/Yt+MvZIY3rEPKIkppbLuYsfhpJcAeb sE9T/6EXaJsXuM6EjQJ5xjeEK4PXqJ2v3Gr0sOhy1CauCT6qlt6/HxixYAfTKYEIJwD+Oc D3GWfJrCnKOIXEo8a+/ClJed9hhMURA= X-MC-Unique: Ra-lzLCgMqahCh_G3AH_pg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 02/24] cpu_x86: Ignore alias names Date: Fri, 4 Nov 2022 16:43:22 +0100 Message-Id: <20221104154344.213211-3-twiederh@redhat.com> In-Reply-To: <20221104154344.213211-1-twiederh@redhat.com> References: <20221104154344.213211-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiri Denemark , Tim Wiederhake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667576640675100001 Content-Type: text/plain; charset="utf-8"; x-default="true" A later patch will add alias names to the feature map. They will be used in virQEMUCapsCPUFeatureTranslate and for synchronizing the list with QEMU. Signed-off-by: Tim Wiederhake Reviewed-by: Jiri Denemark --- src/cpu/cpu_x86.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 4d2379803c..d2560de497 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1089,7 +1089,7 @@ static int x86ParseDataItemList(virCPUx86Data *cpudata, xmlNodePtr node) { - size_t i; + size_t i =3D 0; =20 if (xmlChildElementCount(node) <=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no x86 CPU data fo= und")); @@ -1097,9 +1097,14 @@ x86ParseDataItemList(virCPUx86Data *cpudata, } =20 node =3D xmlFirstElementChild(node); - for (i =3D 0; node; ++i) { + while (node) { virCPUx86DataItem item; =20 + if (virXMLNodeNameEqual(node, "alias")) { + node =3D xmlNextElementSibling(node); + continue; + } + if (virXMLNodeNameEqual(node, "cpuid")) { if (x86ParseCPUID(node, &item) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1116,6 +1121,7 @@ x86ParseDataItemList(virCPUx86Data *cpudata, =20 if (virCPUx86DataAddItem(cpudata, &item) < 0) return -1; + ++i; =20 node =3D xmlNextElementSibling(node); } --=20 2.36.1