mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
Rename CPUState -> CPUArchState
Scripted conversion:
for file in *.[hc] hw/*.[hc] hw/kvm/*.[hc] linux-user/*.[hc] linux-user/m68k/*.[hc] bsd-user/*.[hc] darwin-user/*.[hc] tcg/*/*.[hc] target-*/cpu.h; do
sed -i "s/CPUState/CPUArchState/g" $file
done
All occurrences of CPUArchState are expected to be replaced by QOM CPUState,
once all targets are QOM'ified and common fields have been extracted.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andreas Färber
parent
5bfcb36ec4
commit
9349b4f9fd
59 changed files with 419 additions and 419 deletions
76
cpus.c
76
cpus.c
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
#endif /* CONFIG_LINUX */
|
||||
|
||||
static CPUState *next_cpu;
|
||||
static CPUArchState *next_cpu;
|
||||
|
||||
/***********************************************************/
|
||||
/* guest cycle counter */
|
||||
|
|
@ -89,7 +89,7 @@ TimersState timers_state;
|
|||
int64_t cpu_get_icount(void)
|
||||
{
|
||||
int64_t icount;
|
||||
CPUState *env = cpu_single_env;
|
||||
CPUArchState *env = cpu_single_env;
|
||||
|
||||
icount = qemu_icount;
|
||||
if (env) {
|
||||
|
|
@ -339,7 +339,7 @@ void configure_icount(const char *option)
|
|||
void hw_error(const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
CPUState *env;
|
||||
CPUArchState *env;
|
||||
|
||||
va_start(ap, fmt);
|
||||
fprintf(stderr, "qemu: hardware error: ");
|
||||
|
|
@ -359,7 +359,7 @@ void hw_error(const char *fmt, ...)
|
|||
|
||||
void cpu_synchronize_all_states(void)
|
||||
{
|
||||
CPUState *cpu;
|
||||
CPUArchState *cpu;
|
||||
|
||||
for (cpu = first_cpu; cpu; cpu = cpu->next_cpu) {
|
||||
cpu_synchronize_state(cpu);
|
||||
|
|
@ -368,7 +368,7 @@ void cpu_synchronize_all_states(void)
|
|||
|
||||
void cpu_synchronize_all_post_reset(void)
|
||||
{
|
||||
CPUState *cpu;
|
||||
CPUArchState *cpu;
|
||||
|
||||
for (cpu = first_cpu; cpu; cpu = cpu->next_cpu) {
|
||||
cpu_synchronize_post_reset(cpu);
|
||||
|
|
@ -377,14 +377,14 @@ void cpu_synchronize_all_post_reset(void)
|
|||
|
||||
void cpu_synchronize_all_post_init(void)
|
||||
{
|
||||
CPUState *cpu;
|
||||
CPUArchState *cpu;
|
||||
|
||||
for (cpu = first_cpu; cpu; cpu = cpu->next_cpu) {
|
||||
cpu_synchronize_post_init(cpu);
|
||||
}
|
||||
}
|
||||
|
||||
int cpu_is_stopped(CPUState *env)
|
||||
int cpu_is_stopped(CPUArchState *env)
|
||||
{
|
||||
return !runstate_is_running() || env->stopped;
|
||||
}
|
||||
|
|
@ -402,7 +402,7 @@ static void do_vm_stop(RunState state)
|
|||
}
|
||||
}
|
||||
|
||||
static int cpu_can_run(CPUState *env)
|
||||
static int cpu_can_run(CPUArchState *env)
|
||||
{
|
||||
if (env->stop) {
|
||||
return 0;
|
||||
|
|
@ -413,7 +413,7 @@ static int cpu_can_run(CPUState *env)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static bool cpu_thread_is_idle(CPUState *env)
|
||||
static bool cpu_thread_is_idle(CPUArchState *env)
|
||||
{
|
||||
if (env->stop || env->queued_work_first) {
|
||||
return false;
|
||||
|
|
@ -430,7 +430,7 @@ static bool cpu_thread_is_idle(CPUState *env)
|
|||
|
||||
bool all_cpu_threads_idle(void)
|
||||
{
|
||||
CPUState *env;
|
||||
CPUArchState *env;
|
||||
|
||||
for (env = first_cpu; env != NULL; env = env->next_cpu) {
|
||||
if (!cpu_thread_is_idle(env)) {
|
||||
|
|
@ -440,7 +440,7 @@ bool all_cpu_threads_idle(void)
|
|||
return true;
|
||||
}
|
||||
|
||||
static void cpu_handle_guest_debug(CPUState *env)
|
||||
static void cpu_handle_guest_debug(CPUArchState *env)
|
||||
{
|
||||
gdb_set_stop_cpu(env);
|
||||
qemu_system_debug_request();
|
||||
|
|
@ -494,7 +494,7 @@ static void qemu_init_sigbus(void)
|
|||
prctl(PR_MCE_KILL, PR_MCE_KILL_SET, PR_MCE_KILL_EARLY, 0, 0);
|
||||
}
|
||||
|
||||
static void qemu_kvm_eat_signals(CPUState *env)
|
||||
static void qemu_kvm_eat_signals(CPUArchState *env)
|
||||
{
|
||||
struct timespec ts = { 0, 0 };
|
||||
siginfo_t siginfo;
|
||||
|
|
@ -537,7 +537,7 @@ static void qemu_init_sigbus(void)
|
|||
{
|
||||
}
|
||||
|
||||
static void qemu_kvm_eat_signals(CPUState *env)
|
||||
static void qemu_kvm_eat_signals(CPUArchState *env)
|
||||
{
|
||||
}
|
||||
#endif /* !CONFIG_LINUX */
|
||||
|
|
@ -547,7 +547,7 @@ static void dummy_signal(int sig)
|
|||
{
|
||||
}
|
||||
|
||||
static void qemu_kvm_init_cpu_signals(CPUState *env)
|
||||
static void qemu_kvm_init_cpu_signals(CPUArchState *env)
|
||||
{
|
||||
int r;
|
||||
sigset_t set;
|
||||
|
|
@ -582,7 +582,7 @@ static void qemu_tcg_init_cpu_signals(void)
|
|||
}
|
||||
|
||||
#else /* _WIN32 */
|
||||
static void qemu_kvm_init_cpu_signals(CPUState *env)
|
||||
static void qemu_kvm_init_cpu_signals(CPUArchState *env)
|
||||
{
|
||||
abort();
|
||||
}
|
||||
|
|
@ -619,7 +619,7 @@ void qemu_init_cpu_loop(void)
|
|||
qemu_thread_get_self(&io_thread);
|
||||
}
|
||||
|
||||
void run_on_cpu(CPUState *env, void (*func)(void *data), void *data)
|
||||
void run_on_cpu(CPUArchState *env, void (*func)(void *data), void *data)
|
||||
{
|
||||
struct qemu_work_item wi;
|
||||
|
||||
|
|
@ -641,14 +641,14 @@ void run_on_cpu(CPUState *env, void (*func)(void *data), void *data)
|
|||
|
||||
qemu_cpu_kick(env);
|
||||
while (!wi.done) {
|
||||
CPUState *self_env = cpu_single_env;
|
||||
CPUArchState *self_env = cpu_single_env;
|
||||
|
||||
qemu_cond_wait(&qemu_work_cond, &qemu_global_mutex);
|
||||
cpu_single_env = self_env;
|
||||
}
|
||||
}
|
||||
|
||||
static void flush_queued_work(CPUState *env)
|
||||
static void flush_queued_work(CPUArchState *env)
|
||||
{
|
||||
struct qemu_work_item *wi;
|
||||
|
||||
|
|
@ -665,7 +665,7 @@ static void flush_queued_work(CPUState *env)
|
|||
qemu_cond_broadcast(&qemu_work_cond);
|
||||
}
|
||||
|
||||
static void qemu_wait_io_event_common(CPUState *env)
|
||||
static void qemu_wait_io_event_common(CPUArchState *env)
|
||||
{
|
||||
if (env->stop) {
|
||||
env->stop = 0;
|
||||
|
|
@ -678,7 +678,7 @@ static void qemu_wait_io_event_common(CPUState *env)
|
|||
|
||||
static void qemu_tcg_wait_io_event(void)
|
||||
{
|
||||
CPUState *env;
|
||||
CPUArchState *env;
|
||||
|
||||
while (all_cpu_threads_idle()) {
|
||||
/* Start accounting real time to the virtual clock if the CPUs
|
||||
|
|
@ -696,7 +696,7 @@ static void qemu_tcg_wait_io_event(void)
|
|||
}
|
||||
}
|
||||
|
||||
static void qemu_kvm_wait_io_event(CPUState *env)
|
||||
static void qemu_kvm_wait_io_event(CPUArchState *env)
|
||||
{
|
||||
while (cpu_thread_is_idle(env)) {
|
||||
qemu_cond_wait(env->halt_cond, &qemu_global_mutex);
|
||||
|
|
@ -708,7 +708,7 @@ static void qemu_kvm_wait_io_event(CPUState *env)
|
|||
|
||||
static void *qemu_kvm_cpu_thread_fn(void *arg)
|
||||
{
|
||||
CPUState *env = arg;
|
||||
CPUArchState *env = arg;
|
||||
int r;
|
||||
|
||||
qemu_mutex_lock(&qemu_global_mutex);
|
||||
|
|
@ -745,7 +745,7 @@ static void tcg_exec_all(void);
|
|||
|
||||
static void *qemu_tcg_cpu_thread_fn(void *arg)
|
||||
{
|
||||
CPUState *env = arg;
|
||||
CPUArchState *env = arg;
|
||||
|
||||
qemu_tcg_init_cpu_signals();
|
||||
qemu_thread_get_self(env->thread);
|
||||
|
|
@ -779,7 +779,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static void qemu_cpu_kick_thread(CPUState *env)
|
||||
static void qemu_cpu_kick_thread(CPUArchState *env)
|
||||
{
|
||||
#ifndef _WIN32
|
||||
int err;
|
||||
|
|
@ -800,7 +800,7 @@ static void qemu_cpu_kick_thread(CPUState *env)
|
|||
|
||||
void qemu_cpu_kick(void *_env)
|
||||
{
|
||||
CPUState *env = _env;
|
||||
CPUArchState *env = _env;
|
||||
|
||||
qemu_cond_broadcast(env->halt_cond);
|
||||
if (kvm_enabled() && !env->thread_kicked) {
|
||||
|
|
@ -825,7 +825,7 @@ void qemu_cpu_kick_self(void)
|
|||
|
||||
int qemu_cpu_is_self(void *_env)
|
||||
{
|
||||
CPUState *env = _env;
|
||||
CPUArchState *env = _env;
|
||||
|
||||
return qemu_thread_is_self(env->thread);
|
||||
}
|
||||
|
|
@ -852,7 +852,7 @@ void qemu_mutex_unlock_iothread(void)
|
|||
|
||||
static int all_vcpus_paused(void)
|
||||
{
|
||||
CPUState *penv = first_cpu;
|
||||
CPUArchState *penv = first_cpu;
|
||||
|
||||
while (penv) {
|
||||
if (!penv->stopped) {
|
||||
|
|
@ -866,7 +866,7 @@ static int all_vcpus_paused(void)
|
|||
|
||||
void pause_all_vcpus(void)
|
||||
{
|
||||
CPUState *penv = first_cpu;
|
||||
CPUArchState *penv = first_cpu;
|
||||
|
||||
qemu_clock_enable(vm_clock, false);
|
||||
while (penv) {
|
||||
|
|
@ -899,7 +899,7 @@ void pause_all_vcpus(void)
|
|||
|
||||
void resume_all_vcpus(void)
|
||||
{
|
||||
CPUState *penv = first_cpu;
|
||||
CPUArchState *penv = first_cpu;
|
||||
|
||||
qemu_clock_enable(vm_clock, true);
|
||||
while (penv) {
|
||||
|
|
@ -912,7 +912,7 @@ void resume_all_vcpus(void)
|
|||
|
||||
static void qemu_tcg_init_vcpu(void *_env)
|
||||
{
|
||||
CPUState *env = _env;
|
||||
CPUArchState *env = _env;
|
||||
|
||||
/* share a single thread for all cpus with TCG */
|
||||
if (!tcg_cpu_thread) {
|
||||
|
|
@ -935,7 +935,7 @@ static void qemu_tcg_init_vcpu(void *_env)
|
|||
}
|
||||
}
|
||||
|
||||
static void qemu_kvm_start_vcpu(CPUState *env)
|
||||
static void qemu_kvm_start_vcpu(CPUArchState *env)
|
||||
{
|
||||
env->thread = g_malloc0(sizeof(QemuThread));
|
||||
env->halt_cond = g_malloc0(sizeof(QemuCond));
|
||||
|
|
@ -949,7 +949,7 @@ static void qemu_kvm_start_vcpu(CPUState *env)
|
|||
|
||||
void qemu_init_vcpu(void *_env)
|
||||
{
|
||||
CPUState *env = _env;
|
||||
CPUArchState *env = _env;
|
||||
|
||||
env->nr_cores = smp_cores;
|
||||
env->nr_threads = smp_threads;
|
||||
|
|
@ -996,7 +996,7 @@ void vm_stop_force_state(RunState state)
|
|||
}
|
||||
}
|
||||
|
||||
static int tcg_cpu_exec(CPUState *env)
|
||||
static int tcg_cpu_exec(CPUArchState *env)
|
||||
{
|
||||
int ret;
|
||||
#ifdef CONFIG_PROFILER
|
||||
|
|
@ -1045,7 +1045,7 @@ static void tcg_exec_all(void)
|
|||
next_cpu = first_cpu;
|
||||
}
|
||||
for (; next_cpu != NULL && !exit_request; next_cpu = next_cpu->next_cpu) {
|
||||
CPUState *env = next_cpu;
|
||||
CPUArchState *env = next_cpu;
|
||||
|
||||
qemu_clock_enable(vm_clock,
|
||||
(env->singlestep_enabled & SSTEP_NOTIMER) == 0);
|
||||
|
|
@ -1065,7 +1065,7 @@ static void tcg_exec_all(void)
|
|||
|
||||
void set_numa_modes(void)
|
||||
{
|
||||
CPUState *env;
|
||||
CPUArchState *env;
|
||||
int i;
|
||||
|
||||
for (env = first_cpu; env != NULL; env = env->next_cpu) {
|
||||
|
|
@ -1111,7 +1111,7 @@ void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg)
|
|||
CpuInfoList *qmp_query_cpus(Error **errp)
|
||||
{
|
||||
CpuInfoList *head = NULL, *cur_item = NULL;
|
||||
CPUState *env;
|
||||
CPUArchState *env;
|
||||
|
||||
for(env = first_cpu; env != NULL; env = env->next_cpu) {
|
||||
CpuInfoList *info;
|
||||
|
|
@ -1157,7 +1157,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
|
|||
{
|
||||
FILE *f;
|
||||
uint32_t l;
|
||||
CPUState *env;
|
||||
CPUArchState *env;
|
||||
uint8_t buf[1024];
|
||||
|
||||
if (!has_cpu) {
|
||||
|
|
@ -1232,7 +1232,7 @@ exit:
|
|||
void qmp_inject_nmi(Error **errp)
|
||||
{
|
||||
#if defined(TARGET_I386)
|
||||
CPUState *env;
|
||||
CPUArchState *env;
|
||||
|
||||
for (env = first_cpu; env != NULL; env = env->next_cpu) {
|
||||
if (!env->apic_state) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue