OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

kvm: Move KVM mp_state accessors to i386-specific code 

Unbreaks PowerPC and S390 KVM builds.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Hollis Blanchard 2009-11-09 21:05:37 +00:00 committed by Anthony Liguori
parent 49c3c8dca7
commit 9bdbe550f0
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kvm-all.c
View File

@ -207,26 +207,6 @@ err:
return ret;
}
int kvm_put_mp_state(CPUState *env)
{
struct kvm_mp_state mp_state = { .mp_state = env->mp_state };
return kvm_vcpu_ioctl(env, KVM_SET_MP_STATE, &mp_state);
}
int kvm_get_mp_state(CPUState *env)
{
struct kvm_mp_state mp_state;
int ret;
ret = kvm_vcpu_ioctl(env, KVM_GET_MP_STATE, &mp_state);
if (ret < 0) {
return ret;
}
env->mp_state = mp_state.mp_state;
return 0;
}
/*
* dirty pages logging control
*/

3
kvm.h
View File

@ -74,9 +74,6 @@ int kvm_vm_ioctl(KVMState *s, int type, ...);
int kvm_vcpu_ioctl(CPUState *env, int type, ...);
int kvm_get_mp_state(CPUState *env);
int kvm_put_mp_state(CPUState *env);
/* Arch specific hooks */
int kvm_arch_post_run(CPUState *env, struct kvm_run *run);

20
target-i386/kvm.c
View File

@ -659,6 +659,26 @@ static int kvm_get_msrs(CPUState *env)
return 0;
}
static int kvm_put_mp_state(CPUState *env)
{
struct kvm_mp_state mp_state = { .mp_state = env->mp_state };
return kvm_vcpu_ioctl(env, KVM_SET_MP_STATE, &mp_state);
}
static int kvm_get_mp_state(CPUState *env)
{
struct kvm_mp_state mp_state;
int ret;
ret = kvm_vcpu_ioctl(env, KVM_GET_MP_STATE, &mp_state);
if (ret < 0) {
return ret;
}
env->mp_state = mp_state.mp_state;
return 0;
}
int kvm_arch_put_registers(CPUState *env)
{
int ret;