From patchwork Thu Aug 24 13:57:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Wiederhake X-Patchwork-Id: 1825421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=cTDFovSO; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RWl6z2H28z1yZs for ; Thu, 24 Aug 2023 23:58:51 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZApv-0007mG-8r; Thu, 24 Aug 2023 09:57:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZApt-0007ly-N9 for qemu-devel@nongnu.org; Thu, 24 Aug 2023 09:57:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZApr-0001om-O8 for qemu-devel@nongnu.org; Thu, 24 Aug 2023 09:57:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692885435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FaDRF28uMktYiOKYo9SyGQvy1PeTOStGvV2FQhYelj8=; b=cTDFovSObqViZnFXAncNunUg/u7YTg4g6CaZ4fzgAPx733GH20HNUAHekmmtLwRg5Gcwue BN7EEWrjhcTSkqjmdZoX3ezqbqAHWlI5RTYYd4WOSs+ZJjrVXeibCEksCxYHCQzL3jeHGQ /kasD5HoX71A4zrBk7gmO6ePtFHlT14= Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-284-yyUJKKtVPAeZowjck7V0zw-1; Thu, 24 Aug 2023 09:57:13 -0400 X-MC-Unique: yyUJKKtVPAeZowjck7V0zw-1 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 623623C100B1 for ; Thu, 24 Aug 2023 13:57:13 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.193.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF8986B595; Thu, 24 Aug 2023 13:57:12 +0000 (UTC) From: Tim Wiederhake To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Tim Wiederhake Subject: [PATCH 2/3] target/i386: Fix feature names in FEAT_VMX_EPT_VPID_CAPS Date: Thu, 24 Aug 2023 15:57:09 +0200 Message-Id: <20230824135710.343175-3-twiederh@redhat.com> In-Reply-To: <20230824135710.343175-1-twiederh@redhat.com> References: <20230824135710.343175-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass client-ip=170.10.133.124; envelope-from=twiederh@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix a copy-paste-mistake in the FEAT_VMX_EPT_VIPD_CAPS cpuid leaf. The mistake became apparent as there were two features with the same name in this cpuid leaf. The names are now in line with SDM volume 3, appendix A, section 10. Fixes: 20a78b02d3 ("target/i386: add VMX features") Signed-off-by: Tim Wiederhake --- target/i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index e6b8c62b92..0b74d80371 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1322,8 +1322,8 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = { NULL, NULL, NULL, NULL, "vmx-invvpid", NULL, NULL, NULL, NULL, NULL, NULL, NULL, - "vmx-invvpid-single-addr", "vmx-invept-single-context", - "vmx-invvpid-all-context", "vmx-invept-single-context-noglobals", + "vmx-invvpid-single-addr", "vmx-invvpid-single-context", + "vmx-invvpid-all-context", "vmx-invvpid-single-context-noglobals", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,