9ad2faa8b2
- ui/vnc.c: Fixed a deadlock bug. - hw/i386: Fix comment style in topology.h - migration/multifd: Remove unnecessary usage of local Error - linux-user: fix sockaddr_in6 endianness - vhost_vdpa: fix the input in trace_vhost_vdpa_listener_region_del() - iotests: fix 194: filter out racy postcopy-active event - tests/avocado: fix waiting for vm shutdown in replay_linux - ui/vnc: fix debug output for invalid audio message Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 2b6068aae3fe18cd0c948c22b4531b344c3e2b6c)
146 lines
4.9 KiB
Diff
146 lines
4.9 KiB
Diff
From 92bf314bb73b4df9b94e68448c37a8bbeed7ae65 Mon Sep 17 00:00:00 2001
|
|
From: Zhao Liu <zhao1.liu@intel.com>
|
|
Date: Tue, 24 Oct 2023 17:03:04 +0800
|
|
Subject: [PATCH] hw/i386: Fix comment style in topology.h
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
mainline inclusion
|
|
commit 5f0d69b5a69f56d63a1afd5f927919b1584e5e9b
|
|
category: bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
For function comments in this file, keep the comment style consistent
|
|
with other files in the directory.
|
|
|
|
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
|
|
Reviewed-by: Xiaoyao Li <xiaoyao.li@Intel.com>
|
|
Reviewed-by: Babu Moger <babu.moger@amd.com>
|
|
Tested-by: Babu Moger <babu.moger@amd.com>
|
|
Tested-by: Yongwei Ma <yongwei.ma@intel.com>
|
|
Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Message-ID: <20231024090323.1859210-2-zhao1.liu@linux.intel.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
include/hw/i386/topology.h | 33 +++++++++++++++++----------------
|
|
1 file changed, 17 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
|
|
index 81573f6cfd..5a19679f61 100644
|
|
--- a/include/hw/i386/topology.h
|
|
+++ b/include/hw/i386/topology.h
|
|
@@ -24,7 +24,8 @@
|
|
#ifndef HW_I386_TOPOLOGY_H
|
|
#define HW_I386_TOPOLOGY_H
|
|
|
|
-/* This file implements the APIC-ID-based CPU topology enumeration logic,
|
|
+/*
|
|
+ * This file implements the APIC-ID-based CPU topology enumeration logic,
|
|
* documented at the following document:
|
|
* Intel® 64 Architecture Processor Topology Enumeration
|
|
* http://software.intel.com/en-us/articles/intel-64-architecture-processor-topology-enumeration/
|
|
@@ -41,7 +42,8 @@
|
|
|
|
#include "qemu/bitops.h"
|
|
|
|
-/* APIC IDs can be 32-bit, but beware: APIC IDs > 255 require x2APIC support
|
|
+/*
|
|
+ * APIC IDs can be 32-bit, but beware: APIC IDs > 255 require x2APIC support
|
|
*/
|
|
typedef uint32_t apic_id_t;
|
|
|
|
@@ -58,8 +60,7 @@ typedef struct X86CPUTopoInfo {
|
|
unsigned threads_per_core;
|
|
} X86CPUTopoInfo;
|
|
|
|
-/* Return the bit width needed for 'count' IDs
|
|
- */
|
|
+/* Return the bit width needed for 'count' IDs */
|
|
static unsigned apicid_bitwidth_for_count(unsigned count)
|
|
{
|
|
g_assert(count >= 1);
|
|
@@ -67,15 +68,13 @@ static unsigned apicid_bitwidth_for_count(unsigned count)
|
|
return count ? 32 - clz32(count) : 0;
|
|
}
|
|
|
|
-/* Bit width of the SMT_ID (thread ID) field on the APIC ID
|
|
- */
|
|
+/* Bit width of the SMT_ID (thread ID) field on the APIC ID */
|
|
static inline unsigned apicid_smt_width(X86CPUTopoInfo *topo_info)
|
|
{
|
|
return apicid_bitwidth_for_count(topo_info->threads_per_core);
|
|
}
|
|
|
|
-/* Bit width of the Core_ID field
|
|
- */
|
|
+/* Bit width of the Core_ID field */
|
|
static inline unsigned apicid_core_width(X86CPUTopoInfo *topo_info)
|
|
{
|
|
return apicid_bitwidth_for_count(topo_info->cores_per_die);
|
|
@@ -87,8 +86,7 @@ static inline unsigned apicid_die_width(X86CPUTopoInfo *topo_info)
|
|
return apicid_bitwidth_for_count(topo_info->dies_per_pkg);
|
|
}
|
|
|
|
-/* Bit offset of the Core_ID field
|
|
- */
|
|
+/* Bit offset of the Core_ID field */
|
|
static inline unsigned apicid_core_offset(X86CPUTopoInfo *topo_info)
|
|
{
|
|
return apicid_smt_width(topo_info);
|
|
@@ -100,14 +98,14 @@ static inline unsigned apicid_die_offset(X86CPUTopoInfo *topo_info)
|
|
return apicid_core_offset(topo_info) + apicid_core_width(topo_info);
|
|
}
|
|
|
|
-/* Bit offset of the Pkg_ID (socket ID) field
|
|
- */
|
|
+/* Bit offset of the Pkg_ID (socket ID) field */
|
|
static inline unsigned apicid_pkg_offset(X86CPUTopoInfo *topo_info)
|
|
{
|
|
return apicid_die_offset(topo_info) + apicid_die_width(topo_info);
|
|
}
|
|
|
|
-/* Make APIC ID for the CPU based on Pkg_ID, Core_ID, SMT_ID
|
|
+/*
|
|
+ * Make APIC ID for the CPU based on Pkg_ID, Core_ID, SMT_ID
|
|
*
|
|
* The caller must make sure core_id < nr_cores and smt_id < nr_threads.
|
|
*/
|
|
@@ -120,7 +118,8 @@ static inline apic_id_t x86_apicid_from_topo_ids(X86CPUTopoInfo *topo_info,
|
|
topo_ids->smt_id;
|
|
}
|
|
|
|
-/* Calculate thread/core/package IDs for a specific topology,
|
|
+/*
|
|
+ * Calculate thread/core/package IDs for a specific topology,
|
|
* based on (contiguous) CPU index
|
|
*/
|
|
static inline void x86_topo_ids_from_idx(X86CPUTopoInfo *topo_info,
|
|
@@ -137,7 +136,8 @@ static inline void x86_topo_ids_from_idx(X86CPUTopoInfo *topo_info,
|
|
topo_ids->smt_id = cpu_index % nr_threads;
|
|
}
|
|
|
|
-/* Calculate thread/core/package IDs for a specific topology,
|
|
+/*
|
|
+ * Calculate thread/core/package IDs for a specific topology,
|
|
* based on APIC ID
|
|
*/
|
|
static inline void x86_topo_ids_from_apicid(apic_id_t apicid,
|
|
@@ -155,7 +155,8 @@ static inline void x86_topo_ids_from_apicid(apic_id_t apicid,
|
|
topo_ids->pkg_id = apicid >> apicid_pkg_offset(topo_info);
|
|
}
|
|
|
|
-/* Make APIC ID for the CPU 'cpu_index'
|
|
+/*
|
|
+ * Make APIC ID for the CPU 'cpu_index'
|
|
*
|
|
* 'cpu_index' is a sequential, contiguous ID for the CPU.
|
|
*/
|
|
--
|
|
2.27.0
|
|
|