diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-12-17 03:27:07 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-01-15 04:09:13 +0100 |
| commit | ce3960ebe57d0601a3628b64adac6fd23c901f70 (patch) | |
| tree | 0f3cbd92e527d7164bcdd88c6d624d2d6834498c /include | |
| parent | cf7c3f0cb5a7129f57fa9e69d410d6a05031988c (diff) | |
cpu: Move nr_{cores,threads} fields to CPUState
To facilitate the field movements, pass MIPSCPU to malta_mips_config();
avoid that for mips_cpu_map_tc() since callers only access MIPS Thread
Contexts, inside TCG helpers.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/cpu-defs.h | 2 | ||||
| -rw-r--r-- | include/qom/cpu.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index b22b4c6255..c02687b610 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -196,8 +196,6 @@ typedef struct CPUWatchpoint { int cpu_index; /* CPU index (informative) */ \ uint32_t host_tid; /* host thread ID */ \ int numa_node; /* NUMA node this cpu is belonging to */ \ - int nr_cores; /* number of cores within this CPU package */ \ - int nr_threads;/* number of threads within this CPU */ \ int running; /* Nonzero if cpu is currently running(usermode). */ \ /* user data */ \ void *opaque; \ diff --git a/include/qom/cpu.h b/include/qom/cpu.h index fbacb2756b..806b01a01d 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -57,6 +57,8 @@ struct kvm_run; /** * CPUState: + * @nr_cores: Number of cores within this CPU package. + * @nr_threads: Number of threads within this CPU. * @created: Indicates whether the CPU thread has been successfully created. * @stop: Indicates a pending stop request. * @stopped: Indicates the CPU has been artificially stopped. @@ -69,6 +71,9 @@ struct CPUState { DeviceState parent_obj; /*< public >*/ + int nr_cores; + int nr_threads; + struct QemuThread *thread; #ifdef _WIN32 HANDLE hThread; |