From patchwork Tue Jun 13 13:19:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoyao Li X-Patchwork-Id: 13278723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED859C83003 for ; Tue, 13 Jun 2023 13:19:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242034AbjFMNT6 (ORCPT ); Tue, 13 Jun 2023 09:19:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242530AbjFMNTy (ORCPT ); Tue, 13 Jun 2023 09:19:54 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6B4CE6 for ; Tue, 13 Jun 2023 06:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686662393; x=1718198393; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pNFH4JwPCYF8TBeuPI1XWTw8Bh3QnsIP8OvvAgHWW74=; b=NjHbJM/eeSkfTFrCrvaI+AYxsPMM79yc9d0pUxcAR8Ybi6z6E1WQxP0J nfWwjD2JX98VUHN1DvfTOz7tUjaBIYH7dutYsGwAO/BzjGm99kdLchgdZ Gzxm+BtYxB8wfjkdLaXp36e7Ct9HsxNqMYAG8o+goopl+kI4iDSbtCGLL /U24hvZPSeETqmWuMITFxxFKlGGgkqDhNFhtp+s+Y01b2P2PniiTetfqc Ymd22oJdP8gqbP5MxV/FyFN/GQEQmNVOFCvvurzBU8LLzpqudrW7fHvPa uZfOWxYl0ceSRuiko38e7I41+DY74Mv9QewOXbs2+OHnglAZDRHB2xOQU w==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="361696808" X-IronPort-AV: E=Sophos;i="6.00,239,1681196400"; d="scan'208";a="361696808" 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 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" 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 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 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 */