From nobody Wed Feb 11 04:00:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1686662437; cv=none; d=zohomail.com; s=zohoarc; b=aZN8qEuLhxQR2mxv6FK4MUJLDtYs32eBfGRch4o5i2I/IHcnUbIW2fKif6iVsV/k+b6+KfUgEt8hhbHLHRXFTVaBnLE4WzpVbyLtZ3SZc07J2ZR1z0hE+dOHbRLA3u1ECJ0NDcD5hAFXCyizcgM/VXFt8ORRK0P5KSOVKZgU6V0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686662437; h=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=ryYoXIhJKTgI7Fjy/qmixU+wYGnmspF+VMN9N2huLOg=; b=MPiEb32JiONxF0G02ToP1cul6nAedVFQ77AbN0raHie+4S4KbmS8upubY86VL3fuPThZneYYN0TnIcN+kCrgkXR3iI3B/V8jEiP4dcLQjWhhiGHzOq7H0qQsYcmY+r+At+ZhTYeRDRbUSiiHVN1lLhi3aQrSBKhbzMH0JKA7uJc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686662437328153.94688907666273; Tue, 13 Jun 2023 06:20:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q93wM-0000cT-Lr; Tue, 13 Jun 2023 09:20:06 -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 1q93wI-0000bb-Mi for qemu-devel@nongnu.org; Tue, 13 Jun 2023 09:20:03 -0400 Received: from mga03.intel.com ([134.134.136.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q93wG-0006qJ-OA for qemu-devel@nongnu.org; Tue, 13 Jun 2023 09:20:02 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 06:19:53 -0700 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.46]) by orsmga001.jf.intel.com with ESMTP; 13 Jun 2023 06:19:52 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686662400; x=1718198400; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pNFH4JwPCYF8TBeuPI1XWTw8Bh3QnsIP8OvvAgHWW74=; b=lvrF9/FxUv++Kc2o+jf3hg5yGxPkxuCmhPwk6yg5HjeNCjTBYAraZKna TvklHN4BIORyxB5jBZSh5wubm8PLt7Wmt2LYDIBYxQUOuuIkDSAR8tud8 NgNdVDYAe3ul38a5pT005fXTo0rO5wQEX2UCWdmTD1/h97CQIggdiwkgP rQPuFpIs8ZJ/qfBFb3MWJIQ47ZRbcqKkMn82OtN62/h8OFXH9XN7vXzQp xdr30t4qT3GFfzcoLlohL5f+zKkqE23MJ3sXZqaGtSZYM+g0DAiCMzd93 BdQ97gDDMXWvZnotkvbgfWERW0BukOe+sEhIHhSOIyqvSeDsgZGFkX0PS g==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="361696807" X-IronPort-AV: E=Sophos;i="6.00,239,1681196400"; d="scan'208";a="361696807" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="744680318" X-IronPort-AV: E=Sophos;i="6.00,239,1681196400"; d="scan'208";a="744680318" From: Xiaoyao Li To: Paolo Bonzini , Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH v2 1/3] i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F Date: Tue, 13 Jun 2023 09:19:27 -0400 Message-Id: <20230613131929.720453-2-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230613131929.720453-1-xiaoyao.li@intel.com> References: <20230613131929.720453-1-xiaoyao.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=134.134.136.65; envelope-from=xiaoyao.li@intel.com; helo=mga03.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.001, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1686662438811100002 Content-Type: text/plain; charset="utf-8" Decrease array index cpuid_i when CPUID leaf 1F is skipped, otherwise it will get an all zero'ed CPUID entry with leaf 0 and subleaf 0. It conflicts with correct leaf 0. Signed-off-by: Xiaoyao Li Reviewed-by:Yang Weijiang --- target/i386/kvm/kvm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index de531842f6b1..afa97799d89a 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1956,6 +1956,7 @@ int kvm_arch_init_vcpu(CPUState *cs) } case 0x1f: if (env->nr_dies < 2) { + cpuid_i--; break; } /* fallthrough */ --=20 2.34.1