From nobody Sun Feb 8 11:59:47 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491564246424327.75391965935603; Fri, 7 Apr 2017 04:24: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 15573804F8; Fri, 7 Apr 2017 11:24:05 +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 B7A9CAC18C; Fri, 7 Apr 2017 11:24: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 C279B18521C6; Fri, 7 Apr 2017 11:24:03 +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 v37BO36g008562 for ; Fri, 7 Apr 2017 07:24:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0340AAC190; Fri, 7 Apr 2017 11:24:03 +0000 (UTC) Received: from virval.usersys.redhat.com (dhcp129-92.brq.redhat.com [10.34.129.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBDABAC18C for ; Fri, 7 Apr 2017 11:24:01 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id C66ED1000F3; Fri, 7 Apr 2017 13:23:59 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 15573804F8 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 15573804F8 From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 13:23:55 +0200 Message-Id: <8a1c7ed6d5bbd51f31ffabf4676eb0a894ac3547.1491564112.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/4] Revert "cpu: Drop feature filtering from virCPUUpdate" 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: , MIME-Version: 1.0 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.27]); Fri, 07 Apr 2017 11:24:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This reverts commit 5f96b3feb6b345d3c3bfb68b05b16194ad3fea9d which was pushed accidentally. Signed-off-by: Jiri Denemark --- src/cpu/cpu_x86.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 53359ff9b..a771b251e 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2549,7 +2549,8 @@ x86Baseline(virCPUDefPtr *cpus, =20 static int x86UpdateHostModel(virCPUDefPtr guest, - const virCPUDef *host) + const virCPUDef *host, + virCPUx86MapPtr map) { virCPUDefPtr updated =3D NULL; size_t i; @@ -2558,9 +2559,11 @@ x86UpdateHostModel(virCPUDefPtr guest, if (!(updated =3D virCPUDefCopyWithoutModel(host))) goto cleanup; =20 + /* Remove non-migratable features by default */ updated->type =3D VIR_CPU_TYPE_GUEST; updated->mode =3D VIR_CPU_MODE_CUSTOM; - if (virCPUDefCopyModel(updated, host, true) < 0) + if (virCPUDefCopyModelFilter(updated, host, true, + x86FeatureIsMigratable, map) < 0) goto cleanup; =20 if (guest->vendor_id) { @@ -2624,7 +2627,7 @@ virCPUx86Update(virCPUDefPtr guest, =20 if (guest->mode =3D=3D VIR_CPU_MODE_HOST_MODEL || guest->match =3D=3D VIR_CPU_MATCH_MINIMUM) - ret =3D x86UpdateHostModel(guest, host); + ret =3D x86UpdateHostModel(guest, host, map); else ret =3D 0; =20 --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list