77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
From c57b5e38fd95a68f36a342e19ba7ccb6cbb07948 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 18 Jul 2025 18:03:44 +0200
|
|
Subject: [PATCH 014/115] cpu: Remove nr_cores from struct CPUState
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 391: TDX support, including attestation and device assignment
|
|
RH-Jira: RHEL-15710 RHEL-20798 RHEL-49728
|
|
RH-Acked-by: Yash Mankad <None>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Commit: [14/115] 80f6414c5f8f5e963b0f2251147b8a1ca04f55e4 (bonzini/rhel-qemu-kvm)
|
|
|
|
There is no user of it now, remove it.
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Link: https://lore.kernel.org/r/20241219110125.1266461-9-xiaoyao.li@intel.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 6e090ffe0d188e1f09d4efcd10d82158f92abfbb)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit d4c699c310519b99bedf1bdb516cab230d5d846c)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
hw/core/cpu-common.c | 1 -
|
|
include/hw/core/cpu.h | 2 --
|
|
system/cpus.c | 1 -
|
|
3 files changed, 4 deletions(-)
|
|
|
|
diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c
|
|
index 7982ecd39a..1ac8ab488f 100644
|
|
--- a/hw/core/cpu-common.c
|
|
+++ b/hw/core/cpu-common.c
|
|
@@ -242,7 +242,6 @@ static void cpu_common_initfn(Object *obj)
|
|
cpu->cluster_index = UNASSIGNED_CLUSTER_INDEX;
|
|
/* user-mode doesn't have configurable SMP topology */
|
|
/* the default value is changed by qemu_init_vcpu() for system-mode */
|
|
- cpu->nr_cores = 1;
|
|
cpu->nr_threads = 1;
|
|
cpu->cflags_next_tb = -1;
|
|
|
|
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
|
|
index 1c9c775df6..d90e3b3f2c 100644
|
|
--- a/include/hw/core/cpu.h
|
|
+++ b/include/hw/core/cpu.h
|
|
@@ -402,7 +402,6 @@ struct qemu_work_item;
|
|
* Under TCG this value is propagated to @tcg_cflags.
|
|
* See TranslationBlock::TCG CF_CLUSTER_MASK.
|
|
* @tcg_cflags: Pre-computed cflags for this cpu.
|
|
- * @nr_cores: Number of cores within this CPU package.
|
|
* @nr_threads: Number of threads within this CPU core.
|
|
* @thread: Host thread details, only live once @created is #true
|
|
* @sem: WIN32 only semaphore used only for qtest
|
|
@@ -461,7 +460,6 @@ struct CPUState {
|
|
CPUClass *cc;
|
|
/*< public >*/
|
|
|
|
- int nr_cores;
|
|
int nr_threads;
|
|
|
|
struct QemuThread *thread;
|
|
diff --git a/system/cpus.c b/system/cpus.c
|
|
index 1c818ff682..909d8128e8 100644
|
|
--- a/system/cpus.c
|
|
+++ b/system/cpus.c
|
|
@@ -666,7 +666,6 @@ void qemu_init_vcpu(CPUState *cpu)
|
|
{
|
|
MachineState *ms = MACHINE(qdev_get_machine());
|
|
|
|
- cpu->nr_cores = machine_topo_get_cores_per_socket(ms);
|
|
cpu->nr_threads = ms->smp.threads;
|
|
cpu->stopped = true;
|
|
cpu->random_seed = qemu_guest_random_seed_thread_part1();
|
|
--
|
|
2.50.1
|
|
|