From nobody Sun Feb 8 13:38:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1605901180; cv=none; d=zohomail.com; s=zohoarc; b=Fk9zuGwcSyHljux8f/gedyMM40ZeuKEeZ4UeydDYIuOFvq/NCbBwHlTmD3xQ8pYztFmVJeBnkUUyXn4O/k4cV8Av+4mxlTYCpgwZXLXzOJEPANdViqWpsiefo3Ptiy30aXWekDKrEvhrmljSwmcd7FjrXSoGrLgb/7ZEwC28G6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605901180; h=Content-Type:Content-Transfer-Encoding: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=UVNqdsuSyMJ/1cD/Gz73koKDsJ794O5wFRueBoKbGYc=; b=aqYA8WYNo0/JwmDJlVv2ZHgvc+NlEA7IKlq+uQl0EGv+wEU5di07hJQ3lYStcw30MRaz9Ii0UVT/lQGkLDKqLp0p0U28bmuMZGNLdsUF/ZbTGV5FwmGYYSaijc5iSfX3MSBtnDVekegDhuGOU/86mxCGHhgSGiV3pMqixf3DDI4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605901180006973.0488455153725; Fri, 20 Nov 2020 11:39:40 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-504-I4olCYMKM2qEtCGaXHnhcw-1; Fri, 20 Nov 2020 14:39:36 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F3C380ED8B; Fri, 20 Nov 2020 19:39:30 +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 7E3571349A; Fri, 20 Nov 2020 19:39:30 +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 49E051809CA9; Fri, 20 Nov 2020 19:39:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AKJdDxX023268 for ; Fri, 20 Nov 2020 14:39:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id F1D5F6085D; Fri, 20 Nov 2020 19:39:13 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.40.194.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4BF460853 for ; Fri, 20 Nov 2020 19:39:13 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id E56702437F2; Fri, 20 Nov 2020 20:39:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605901178; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=UVNqdsuSyMJ/1cD/Gz73koKDsJ794O5wFRueBoKbGYc=; b=d2ExziFXLUj/xD6wgWY1CPdDEZ1Mbpit/pGH5WQlfGX79luQr2volyzIplXFXV0dOqOkFN UujFJSNR8nsaFAMmkSiWbyqGi9ZXHCR26OodiWSrIdxEhgZcZSp5DvbU5cdMToj9ij50VL Xy7wn8Rlk4jiBhQaiiMmyZp23hJxhU8= X-MC-Unique: I4olCYMKM2qEtCGaXHnhcw-1 From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 5/8] cpu_x86: Change the flow in virCPUx86Update Date: Fri, 20 Nov 2020 20:39:04 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This is just a preparation for adding new functionality to virCPUx86Update. Signed-off-by: Jiri Denemark --- src/cpu/cpu_x86.c | 49 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 72f17070e1..a7ff095456 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2943,38 +2943,39 @@ virCPUx86Update(virCPUDefPtr guest, virCPUx86MapPtr map; size_t i; =20 - if (!relative) - return 0; - - if (!host) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unknown host CPU model")); - return -1; - } - if (!(map =3D virCPUx86GetMap())) return -1; =20 - if (!(model =3D x86ModelFromCPU(host, map, -1))) - return -1; + if (relative) { + if (!host) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unknown host CPU model")); + return -1; + } =20 - for (i =3D 0; i < guest->nfeatures; i++) { - if (guest->features[i].policy =3D=3D VIR_CPU_FEATURE_OPTIONAL) { - int supported =3D x86FeatureInData(guest->features[i].name, - &model->data, map); - if (supported < 0) + if (!(model =3D x86ModelFromCPU(host, map, -1))) + return -1; + + for (i =3D 0; i < guest->nfeatures; i++) { + if (guest->features[i].policy =3D=3D VIR_CPU_FEATURE_OPTIONAL)= { + int supported =3D x86FeatureInData(guest->features[i].name, + &model->data, map); + if (supported < 0) + return -1; + else if (supported) + guest->features[i].policy =3D VIR_CPU_FEATURE_REQUIRE; + else + guest->features[i].policy =3D VIR_CPU_FEATURE_DISABLE; + } + } + + if (guest->mode =3D=3D VIR_CPU_MODE_HOST_MODEL || + guest->match =3D=3D VIR_CPU_MATCH_MINIMUM) { + if (x86UpdateHostModel(guest, host) < 0) return -1; - else if (supported) - guest->features[i].policy =3D VIR_CPU_FEATURE_REQUIRE; - else - guest->features[i].policy =3D VIR_CPU_FEATURE_DISABLE; } } =20 - if (guest->mode =3D=3D VIR_CPU_MODE_HOST_MODEL || - guest->match =3D=3D VIR_CPU_MATCH_MINIMUM) - return x86UpdateHostModel(guest, host); - return 0; } =20 --=20 2.29.2