From nobody Sat Nov 15 14:51:47 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=1751271263; cv=none; d=zohomail.com; s=zohoarc; b=Y7ESF4QjuuSnRSMrQzgl3urNBW2f48inBoQ+AjtasvgMRrOoUsJALyGDz4uT8g+8PkrlhSiKuOvj07Uq/N1BlpIO0IqIbsYv2FmYjU4jyiiSHgBXAm3cdpjcGz5fKfi1+s+FeQ4aDRbVctR8cmqJoBvZKBxMttE1ZmQKDe4gfic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751271263; 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=tXA6FkqoiJt9kdd4Ol8MyCBVN2oyBrm6uoXkES+QYF0=; b=QHaY5PbRd3yB2TpMkutQ0+3pDeH3UHR7TxD938UdNy56K2phNoE90S192vx/p9RNWxHtbtTNvaPUGY1YjlYmKa6FU+bUEyqcRNWSxjGZKP0oKmh91uM6+TSlU2hUS+nXdq4+eKu/OWbFdm0TPsvNCCu1jFKnIRhUlpuFWpyGbko= 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 175127126387734.76399185947241; Mon, 30 Jun 2025 01:14:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uW9eB-0003yz-BO; Mon, 30 Jun 2025 04:13:51 -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 1uW9eA-0003vd-24 for qemu-devel@nongnu.org; Mon, 30 Jun 2025 04:13:50 -0400 Received: from mgamail.intel.com ([192.198.163.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uW9e3-0008Fh-CM for qemu-devel@nongnu.org; Mon, 30 Jun 2025 04:13:49 -0400 Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2025 01:13:37 -0700 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by orviesa010.jf.intel.com with ESMTP; 30 Jun 2025 01:13:36 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1751271223; x=1782807223; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=huJnZK6/VFdFTS+MtsTCfXogRK27ANF61hUOOHmIvh0=; b=GHKUw2Jf1g+xa8govwK9PHBcbtiflgFf5efEI+zSxNSsMW3ty61sypMb Az4mKeJtT9u6cFTXB+UPX68q87GXpj8vQicwX5CpzXQAVgf5UGD30UQi0 brn6CH1XeRyOJusYS+tV4W9bBnP55FTgB7Eo0oSJ+9mpoNY7mZ9USHOtF dr6966EIhFZ6vrvrTNQyy3KQf2ljdp61VGTp+jKplzkQj+zby1SzLoejH envGmQf1Mte4gZEec8u/eRcIJK+6+lULPfbU18xyOOjvYf7i7oXg2S6Ap BIVJfwJ6M7r6Vyh3qzqSObn+UpnwpMWOP7X0Z21jUDUHk7XrrwANe9IY/ g==; X-CSE-ConnectionGUID: 9DaoTr13QQe61R1YEw95CA== X-CSE-MsgGUID: hDs72dupTN+2eW0jbHcHnw== X-IronPort-AV: E=McAfee;i="6800,10657,11479"; a="53637397" X-IronPort-AV: E=Sophos;i="6.16,277,1744095600"; d="scan'208";a="53637397" X-CSE-ConnectionGUID: KrpeSJEhTNqnmt//GeESdA== X-CSE-MsgGUID: qNkGmzTSTTaNHEGwCXxPzw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,277,1744095600"; d="scan'208";a="152777285" From: Xiaoyao Li To: Paolo Bonzini Cc: Zhao Liu , Marcelo Tosatti , Richard Henderson , qemu-devel@nongnu.org, xiaoyao.li@intel.com Subject: [PATCH 1/4] i386/cpu: Use CPUID_MODEL_ID_SZ instead of hardcoded 48 Date: Mon, 30 Jun 2025 16:06:07 +0800 Message-ID: <20250630080610.3151956-2-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250630080610.3151956-1-xiaoyao.li@intel.com> References: <20250630080610.3151956-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.15; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.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.999, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1751271265331116600 Content-Type: text/plain; charset="utf-8" There is already the MACRO CPUID_MODEL_ID_SZ defined in QEMU. Use it to replace all the hardcoded 48. Opportunistically fix the indentation of CPUID_VENDOR_SZ. Signed-off-by: Xiaoyao Li Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.c | 8 ++++---- target/i386/cpu.h | 3 ++- target/i386/host-cpu.c | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0d35e95430fe..d80e57d0cc0d 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6468,11 +6468,11 @@ static char *x86_cpuid_get_model_id(Object *obj, Er= ror **errp) char *value; int i; =20 - value =3D g_malloc(48 + 1); - for (i =3D 0; i < 48; i++) { + value =3D g_malloc(CPUID_MODEL_ID_SZ + 1); + for (i =3D 0; i < CPUID_MODEL_ID_SZ; i++) { value[i] =3D env->cpuid_model[i >> 2] >> (8 * (i & 3)); } - value[48] =3D '\0'; + value[CPUID_MODEL_ID_SZ] =3D '\0'; return value; } =20 @@ -6487,7 +6487,7 @@ static void x86_cpuid_set_model_id(Object *obj, const= char *model_id, model_id =3D ""; } len =3D strlen(model_id); - memset(env->cpuid_model, 0, 48); + memset(env->cpuid_model, 0, CPUID_MODEL_ID_SZ); for (i =3D 0; i < 48; i++) { if (i >=3D len) { c =3D '\0'; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 51e10139dfdf..b83c521d9fbb 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1159,7 +1159,8 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *c= pu, FeatureWord w); /* PMM enabled */ #define CPUID_C000_0001_EDX_PMM_EN (1U << 13) =20 -#define CPUID_VENDOR_SZ 12 +#define CPUID_VENDOR_SZ 12 +#define CPUID_MODEL_ID_SZ 48 =20 #define CPUID_VENDOR_INTEL_1 0x756e6547 /* "Genu" */ #define CPUID_VENDOR_INTEL_2 0x49656e69 /* "ineI" */ diff --git a/target/i386/host-cpu.c b/target/i386/host-cpu.c index 7512567298bc..16c236478e2b 100644 --- a/target/i386/host-cpu.c +++ b/target/i386/host-cpu.c @@ -80,7 +80,6 @@ bool host_cpu_realizefn(CPUState *cs, Error **errp) return true; } =20 -#define CPUID_MODEL_ID_SZ 48 /** * cpu_x86_fill_model_id: * Get CPUID model ID string from host CPU. --=20 2.43.0