mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kvm: Pass CPUState to kvm_init_vcpu()

Browse Source 
CPUArchState is no longer needed, and it thereby no longer depends on
NEED_CPU_H.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-12-17 06:38:45 +01:00
parent 55e5c28502
commit 504134d27f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpus.c
View File

@ -742,7 +742,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
cpu->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(cpu);
if (r < 0) { if (r < 0) {
fprintf(stderr, "kvm_init_vcpu failed: %s\n", strerror(-r)); fprintf(stderr, "kvm_init_vcpu failed: %s\n", strerror(-r));
exit(1); exit(1);

5
include/sysemu/kvm.h
View File

@ -17,6 +17,7 @@
#include <errno.h> #include <errno.h>
#include "config-host.h" #include "config-host.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qom/cpu.h"
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
#include <linux/kvm.h> #include <linux/kvm.h>
@ -120,9 +121,9 @@ int kvm_has_many_ioeventfds(void);
int kvm_has_gsi_routing(void); int kvm_has_gsi_routing(void);
int kvm_has_intx_set_mask(void); int kvm_has_intx_set_mask(void);
#ifdef NEED_CPU_H int kvm_init_vcpu(CPUState *cpu);
int kvm_init_vcpu(CPUArchState *env);
#ifdef NEED_CPU_H
int kvm_cpu_exec(CPUArchState *env); int kvm_cpu_exec(CPUArchState *env);
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)

3
kvm-all.c
View File

@ -214,9 +214,8 @@ static void kvm_reset_vcpu(void *opaque)
kvm_arch_reset_vcpu(cpu); kvm_arch_reset_vcpu(cpu);
} }
int kvm_init_vcpu(CPUArchState *env) int kvm_init_vcpu(CPUState *cpu)
{ {
CPUState *cpu = ENV_GET_CPU(env);
KVMState *s = kvm_state; KVMState *s = kvm_state;
long mmap_size; long mmap_size;
int ret; int ret;

2
kvm-stub.c
View File

@ -24,7 +24,7 @@ bool kvm_irqfds_allowed;
bool kvm_msi_via_irqfd_allowed; bool kvm_msi_via_irqfd_allowed;
bool kvm_gsi_routing_allowed; bool kvm_gsi_routing_allowed;
int kvm_init_vcpu(CPUArchState *env) int kvm_init_vcpu(CPUState *cpu)
{ {
return -ENOSYS; return -ENOSYS;
} }