From nobody Sat Apr 5 15:05:38 2025 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=1743517313; cv=none; d=zohomail.com; s=zohoarc; b=kvbFGbOxDypOgLSqVVazp3+0qWsJDNVkXlri8ivmxyYAiNrCWQ2CEgS8cVFRZlAPDAUS/Si9UcriK1UU95Yvm1Fo7uZimFNeovC0zm7dWSVvgXk6LJfImvVUKelAFpCU3ObEnIECn9T02w6aH628KvM3lFI2X/5XczBOv/baWfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743517313; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pJiOEV8Aa5OCRegmx84xdTCIdk0Tez7d2LGLSv43cf0=; b=l2qfLGipcuTYCHBbtXx+J99efb+Pwq2Gn1lPDhuJANLeOJRYw0pYvsUTsc+togNbqRMr1UfqvQQjTWOvmVJ9YlW+1iYwoDPl1k7+rrEyLMU6v4G2pNRGt6ppepQrrIKeiNCZX5SBCImGeMtlKuH50jkDLOxxjDHvc9E67lCVBW4= 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 1743517313799926.7702204398146; Tue, 1 Apr 2025 07:21:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzbtg-00008Y-Be; Tue, 01 Apr 2025 09:43:20 -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 1tzbtZ-0008E6-JD for qemu-devel@nongnu.org; Tue, 01 Apr 2025 09:43:13 -0400 Received: from mgamail.intel.com ([192.198.163.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tzbtX-0006ZP-2p for qemu-devel@nongnu.org; Tue, 01 Apr 2025 09:43:13 -0400 Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 06:42:28 -0700 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by fmviesa008.fm.intel.com with ESMTP; 01 Apr 2025 06:42:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743514991; x=1775050991; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wiwxhBXcxE7KHNFCmgFXFBZn4NnWmDR0H8WVam0bEko=; b=YQHU6abeB5ymqSGnAmYmzsMSKAhVWCacLkIQ46sw11VuzKHI3J0mId9f b1+Kti4srHW9E7aGgqxrNXNNMLmdZ4WlsnYpQ62rCCmvVaINN9O35L39f QKIOa4Hb4TNK0jlOtI8c8gkLwFp5tcyVfxdDc49e6gThfHAuf+fr6o2op u1KnoRQqJ6fbrvmkjUW6vCOmIewOpqXCLfME6zMjY3+/qygldXtO/zXPq kqziXxUidv/Llt+rbk57QAPw0f9xuhaWhT3DEQq7p5eGasIFuwH7VFW1v cUE7xCgRsX8yVq3vFtm+6yk2C+3xfzvoYH9Hg3p+D6hZY9ViccKtF/4I6 w==; X-CSE-ConnectionGUID: 68wmlEVjT7ebqJooOaqPRg== X-CSE-MsgGUID: KExxDFRdTeuLEaxZQcrMSA== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="32433413" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="32433413" X-CSE-ConnectionGUID: zzAicSvyRMCxMW0qnQzjow== X-CSE-MsgGUID: 4tOO35KlQl2VN7zDqhKCsQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="126640090" From: Xiaoyao Li To: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Cc: "Michael S. Tsirkin" , Markus Armbruster , Francesco Lavra , Marcelo Tosatti , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Rick Edgecombe , Xiaoyao Li Subject: [PATCH v8 30/55] kvm: Check KVM_CAP_MAX_VCPUS at vm level Date: Tue, 1 Apr 2025 09:01:40 -0400 Message-Id: <20250401130205.2198253-31-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250401130205.2198253-1-xiaoyao.li@intel.com> References: <20250401130205.2198253-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=192.198.163.16; envelope-from=xiaoyao.li@intel.com; helo=mgamail.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.997, 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.999, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1743517316783019100 Content-Type: text/plain; charset="utf-8" KVM with TDX support starts to report different KVM_CAP_MAX_VCPUS per different VM types. So switch to check the KVM_CAP_MAX_VCPUS at vm level. KVM still returns the global KVM_CAP_MAX_VCPUS when the KVM is old that doesn't report different value at vm level. Signed-off-by: Xiaoyao Li --- accel/kvm/kvm-all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index df9840e53a35..5835d840f3ad 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2425,7 +2425,7 @@ static int kvm_recommended_vcpus(KVMState *s) =20 static int kvm_max_vcpus(KVMState *s) { - int ret =3D kvm_check_extension(s, KVM_CAP_MAX_VCPUS); + int ret =3D kvm_vm_check_extension(s, KVM_CAP_MAX_VCPUS); return (ret) ? ret : kvm_recommended_vcpus(s); } =20 --=20 2.34.1