mirror of
https://github.com/qemu/qemu.git
synced 2024-11-27 13:53:45 +08:00
kvm: ppc: Drop KVM_CAP build dependencies
No longer needed with accompanied kernel headers. CC: Alexander Graf <agraf@suse.de> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Reviewed-by: Alexander Graf <agraf@suse.de> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
parent
e56ff191b6
commit
3d0388f76f
@ -65,18 +65,10 @@ static void kvm_kick_env(void *env)
|
||||
|
||||
int kvm_arch_init(KVMState *s)
|
||||
{
|
||||
#ifdef KVM_CAP_PPC_UNSET_IRQ
|
||||
cap_interrupt_unset = kvm_check_extension(s, KVM_CAP_PPC_UNSET_IRQ);
|
||||
#endif
|
||||
#ifdef KVM_CAP_PPC_IRQ_LEVEL
|
||||
cap_interrupt_level = kvm_check_extension(s, KVM_CAP_PPC_IRQ_LEVEL);
|
||||
#endif
|
||||
#ifdef KVM_CAP_PPC_SEGSTATE
|
||||
cap_segstate = kvm_check_extension(s, KVM_CAP_PPC_SEGSTATE);
|
||||
#endif
|
||||
#ifdef KVM_CAP_PPC_BOOKE_SREGS
|
||||
cap_booke_sregs = kvm_check_extension(s, KVM_CAP_PPC_BOOKE_SREGS);
|
||||
#endif
|
||||
|
||||
if (!cap_interrupt_level) {
|
||||
fprintf(stderr, "KVM: Couldn't find level irq capability. Expect the "
|
||||
@ -217,7 +209,6 @@ int kvm_arch_get_registers(CPUState *env)
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef KVM_CAP_PPC_BOOKE_SREGS
|
||||
if (sregs.u.e.features & KVM_SREGS_E_BASE) {
|
||||
env->spr[SPR_BOOKE_CSRR0] = sregs.u.e.csrr0;
|
||||
env->spr[SPR_BOOKE_CSRR1] = sregs.u.e.csrr1;
|
||||
@ -314,7 +305,6 @@ int kvm_arch_get_registers(CPUState *env)
|
||||
env->spr[SPR_BOOKE_PID2] = sregs.u.e.impl.fsl.pid2;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (cap_segstate) {
|
||||
@ -323,7 +313,6 @@ int kvm_arch_get_registers(CPUState *env)
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef KVM_CAP_PPC_SEGSTATE
|
||||
ppc_store_sdr1(env, sregs.u.s.sdr1);
|
||||
|
||||
/* Sync SLB */
|
||||
@ -346,7 +335,6 @@ int kvm_arch_get_registers(CPUState *env)
|
||||
env->IBAT[0][i] = sregs.u.s.ppc32.ibat[i] & 0xffffffff;
|
||||
env->IBAT[1][i] = sregs.u.s.ppc32.ibat[i] >> 32;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -525,7 +513,6 @@ int kvmppc_get_hypercall(CPUState *env, uint8_t *buf, int buf_len)
|
||||
{
|
||||
uint32_t *hc = (uint32_t*)buf;
|
||||
|
||||
#ifdef KVM_CAP_PPC_GET_PVINFO
|
||||
struct kvm_ppc_pvinfo pvinfo;
|
||||
|
||||
if (kvm_check_extension(env->kvm_state, KVM_CAP_PPC_GET_PVINFO) &&
|
||||
@ -534,7 +521,6 @@ int kvmppc_get_hypercall(CPUState *env, uint8_t *buf, int buf_len)
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Fallback to always fail hypercalls:
|
||||
|
Loading…
Reference in New Issue
Block a user