ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor kvm&tcg function names in cpus.c 

Pure interface cosmetics: Ensure that only kvm core services (as
declared in kvm.h) start with "kvm_". Prepend "qemu_" to those that
violate this rule in cpus.c. Also rename the corresponding tcg functions
for the sake of consistency.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2011-02-07 12:19:12 +01:00 committed by Marcelo Tosatti
parent b8cc45d6a6
commit 7e97cd8814
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cpus.c
View File

@ -774,7 +774,7 @@ static void qemu_kvm_wait_io_event(CPUState *env)
static int qemu_cpu_exec(CPUState *env); static int qemu_cpu_exec(CPUState *env);
static void *kvm_cpu_thread_fn(void *arg) static void *qemu_kvm_cpu_thread_fn(void *arg)
{ {
CPUState *env = arg; CPUState *env = arg;
int r; int r;
@ -807,7 +807,7 @@ static void *kvm_cpu_thread_fn(void *arg)
return NULL; return NULL;
} }
static void *tcg_cpu_thread_fn(void *arg) static void *qemu_tcg_cpu_thread_fn(void *arg)
{ {
CPUState *env = arg; CPUState *env = arg;
@ -926,7 +926,7 @@ void resume_all_vcpus(void)
} }
} }
static void tcg_init_vcpu(void *_env) static void qemu_tcg_init_vcpu(void *_env)
{ {
CPUState *env = _env; CPUState *env = _env;
/* share a single thread for all cpus with TCG */ /* share a single thread for all cpus with TCG */
@ -934,7 +934,7 @@ static void tcg_init_vcpu(void *_env)
env->thread = qemu_mallocz(sizeof(QemuThread)); env->thread = qemu_mallocz(sizeof(QemuThread));
env->halt_cond = qemu_mallocz(sizeof(QemuCond)); env->halt_cond = qemu_mallocz(sizeof(QemuCond));
qemu_cond_init(env->halt_cond); qemu_cond_init(env->halt_cond);
qemu_thread_create(env->thread, tcg_cpu_thread_fn, env); qemu_thread_create(env->thread, qemu_tcg_cpu_thread_fn, env);
while (env->created == 0) while (env->created == 0)
qemu_cond_timedwait(&qemu_cpu_cond, &qemu_global_mutex, 100); qemu_cond_timedwait(&qemu_cpu_cond, &qemu_global_mutex, 100);
tcg_cpu_thread = env->thread; tcg_cpu_thread = env->thread;
@ -945,12 +945,12 @@ static void tcg_init_vcpu(void *_env)
} }
} }
static void kvm_start_vcpu(CPUState *env) static void qemu_kvm_start_vcpu(CPUState *env)
{ {
env->thread = qemu_mallocz(sizeof(QemuThread)); env->thread = qemu_mallocz(sizeof(QemuThread));
env->halt_cond = qemu_mallocz(sizeof(QemuCond)); env->halt_cond = qemu_mallocz(sizeof(QemuCond));
qemu_cond_init(env->halt_cond); qemu_cond_init(env->halt_cond);
qemu_thread_create(env->thread, kvm_cpu_thread_fn, env); qemu_thread_create(env->thread, qemu_kvm_cpu_thread_fn, env);
while (env->created == 0) while (env->created == 0)
qemu_cond_timedwait(&qemu_cpu_cond, &qemu_global_mutex, 100); qemu_cond_timedwait(&qemu_cpu_cond, &qemu_global_mutex, 100);
} }
@ -962,9 +962,9 @@ void qemu_init_vcpu(void *_env)
env->nr_cores = smp_cores; env->nr_cores = smp_cores;
env->nr_threads = smp_threads; env->nr_threads = smp_threads;
if (kvm_enabled()) if (kvm_enabled())
kvm_start_vcpu(env); qemu_kvm_start_vcpu(env);
else else
tcg_init_vcpu(env); qemu_tcg_init_vcpu(env);
} }
void qemu_notify_event(void) void qemu_notify_event(void)