From patchwork Tue Jul 12 02:12:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoyao Li X-Patchwork-Id: 1655159 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=kKChTBoF; dkim-atps=neutral Authentication-Results: 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LhkpQ6WCjz9s07 for ; Tue, 12 Jul 2022 12:14:22 +1000 (AEST) Received: from localhost ([::1]:36736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oB5Po-00086v-KA for incoming@patchwork.ozlabs.org; Mon, 11 Jul 2022 22:14:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oB5Oj-00086I-PG for qemu-devel@nongnu.org; Mon, 11 Jul 2022 22:13:14 -0400 Received: from mga01.intel.com ([192.55.52.88]:21784) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oB5Ob-0007qx-Pi for qemu-devel@nongnu.org; Mon, 11 Jul 2022 22:13:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657591985; x=1689127985; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r/dM6zuxOsycIsS+pswJqYib9i9kyiLg5BUSrz5lpm8=; b=kKChTBoFAR4HbvfUrgNv91l1ZICadthDHoZQLB8s+jTgXMkk+6DqyHjJ btj8K3Q8xHsq0cdkVmMsPh3Xb9AdfUpZDEj5AsP5/zMor91OUGpHJkIbh BVax51rjp/F4D2uLjGI4pvY+AeHSN0AliS0FqzhbK9JtV/bkjoKcaYiz5 jcl4IvD1L8qbXFcr5h4j7jWN8bFrodbyqBvdV9EmhGAn3lVGWRCb9gGgt xqAqu6t8FzsmkB/XaMITH9P2Aqicau7Diko6lrss99Vcs6GR2RqTBTDU3 tJscW1lK63dT9O8wvwO7P1hKJC16uaKiPgAyMKkdyFzMoCAn4JVkQhLpu Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="310429699" X-IronPort-AV: E=Sophos;i="5.92,264,1650956400"; d="scan'208";a="310429699" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2022 19:12:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,264,1650956400"; d="scan'208";a="622320254" Received: from lxy-dell.sh.intel.com ([10.239.159.55]) by orsmga008.jf.intel.com with ESMTP; 11 Jul 2022 19:12:52 -0700 From: Xiaoyao Li To: Paolo Bonzini , Marcelo Tosatti Cc: qemu-devel@nongnu.org, xiaoyao.li@intel.com Subject: [PATCH 1/2] i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F Date: Tue, 12 Jul 2022 10:12:48 +0800 Message-Id: <20220712021249.3227256-2-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220712021249.3227256-1-xiaoyao.li@intel.com> References: <20220712021249.3227256-1-xiaoyao.li@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.55.52.88; envelope-from=xiaoyao.li@intel.com; helo=mga01.intel.com X-Spam_score_int: -51 X-Spam_score: -5.2 X-Spam_bar: ----- X-Spam_report: (-5.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.998, HK_RANDOM_FROM=0.998, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 b8578882c12b..a0b412a1129f 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1831,6 +1831,7 @@ int kvm_arch_init_vcpu(CPUState *cs) } case 0x1f: if (env->nr_dies < 2) { + cpuid_i--; break; } /* fallthrough */