proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-06-15 02:12:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cpu: Move thread_id to CPUState

Browse Source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-05-03 06:59:07 +02:00
parent f100f0b38f
commit 9f09e18a6d
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu-defs.h
View File

@ -201,7 +201,6 @@ typedef struct CPUWatchpoint {
int nr_cores; /* number of cores within this CPU package */ \ int nr_cores; /* number of cores within this CPU package */ \
int nr_threads;/* number of threads within this CPU */ \ int nr_threads;/* number of threads within this CPU */ \
int running; /* Nonzero if cpu is currently running(usermode). */ \ int running; /* Nonzero if cpu is currently running(usermode). */ \
int thread_id; \
/* user data */ \ /* user data */ \
void *opaque; \ void *opaque; \
\ \

11
cpus.c
View File

@ -737,7 +737,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
qemu_mutex_lock(&qemu_global_mutex); qemu_mutex_lock(&qemu_global_mutex);
qemu_thread_get_self(cpu->thread); qemu_thread_get_self(cpu->thread);
env->thread_id = qemu_get_thread_id(); cpu->thread_id = qemu_get_thread_id();
cpu_single_env = env; cpu_single_env = env;
r = kvm_init_vcpu(env); r = kvm_init_vcpu(env);
@ -778,7 +778,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg)
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
qemu_thread_get_self(cpu->thread); qemu_thread_get_self(cpu->thread);
env->thread_id = qemu_get_thread_id(); cpu->thread_id = qemu_get_thread_id();
sigemptyset(&waitset); sigemptyset(&waitset);
sigaddset(&waitset, SIG_IPI); sigaddset(&waitset, SIG_IPI);
@ -822,7 +822,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
qemu_mutex_lock(&qemu_global_mutex); qemu_mutex_lock(&qemu_global_mutex);
for (env = first_cpu; env != NULL; env = env->next_cpu) { for (env = first_cpu; env != NULL; env = env->next_cpu) {
cpu = ENV_GET_CPU(env); cpu = ENV_GET_CPU(env);
env->thread_id = qemu_get_thread_id(); cpu->thread_id = qemu_get_thread_id();
cpu->created = true; cpu->created = true;
} }
qemu_cond_signal(&qemu_cpu_cond); qemu_cond_signal(&qemu_cpu_cond);
@ -1205,7 +1205,8 @@ CpuInfoList *qmp_query_cpus(Error **errp)
CpuInfoList *head = NULL, *cur_item = NULL; CpuInfoList *head = NULL, *cur_item = NULL;
CPUArchState *env; CPUArchState *env;
for(env = first_cpu; env != NULL; env = env->next_cpu) { for (env = first_cpu; env != NULL; env = env->next_cpu) {
CPUState *cpu = ENV_GET_CPU(env);
CpuInfoList *info; CpuInfoList *info;
cpu_synchronize_state(env); cpu_synchronize_state(env);
@ -1215,7 +1216,7 @@ CpuInfoList *qmp_query_cpus(Error **errp)
info->value->CPU = env->cpu_index; info->value->CPU = env->cpu_index;
info->value->current = (env == first_cpu); info->value->current = (env == first_cpu);
info->value->halted = env->halted; info->value->halted = env->halted;
info->value->thread_id = env->thread_id; info->value->thread_id = cpu->thread_id;
#if defined(TARGET_I386) #if defined(TARGET_I386)
info->value->has_pc = true; info->value->has_pc = true;
info->value->pc = env->eip + env->segs[R_CS].base; info->value->pc = env->eip + env->segs[R_CS].base;

5
exec.c
View File

@ -689,6 +689,9 @@ CPUArchState *qemu_get_cpu(int cpu)
void cpu_exec_init(CPUArchState *env) void cpu_exec_init(CPUArchState *env)
{ {
#ifndef CONFIG_USER_ONLY
CPUState *cpu = ENV_GET_CPU(env);
#endif
CPUArchState **penv; CPUArchState **penv;
int cpu_index; int cpu_index;
@ -707,7 +710,7 @@ void cpu_exec_init(CPUArchState *env)
QTAILQ_INIT(&env->breakpoints); QTAILQ_INIT(&env->breakpoints);
QTAILQ_INIT(&env->watchpoints); QTAILQ_INIT(&env->watchpoints);
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
env->thread_id = qemu_get_thread_id(); cpu->thread_id = qemu_get_thread_id();
#endif #endif
*penv = env; *penv = env;
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)

1
include/qemu/cpu.h
View File

@ -69,6 +69,7 @@ struct CPUState {
#ifdef _WIN32 #ifdef _WIN32
HANDLE hThread; HANDLE hThread;
#endif #endif
int thread_id;
struct QemuCond *halt_cond; struct QemuCond *halt_cond;
struct qemu_work_item *queued_work_first, *queued_work_last; struct qemu_work_item *queued_work_first, *queued_work_last;
bool thread_kicked; bool thread_kicked;