[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/15] kvm: ppc: Drop KVM_CAP build dependencies
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 10/15] kvm: ppc: Drop KVM_CAP build dependencies |
Date: |
Tue, 21 Jun 2011 14:07:59 -0300 |
From: Jan Kiszka <address@hidden>
No longer needed with accompanied kernel headers.
CC: Alexander Graf <address@hidden>
Signed-off-by: Jan Kiszka <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-ppc/kvm.c | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 0500e3f..21f35af7 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -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:
--
1.7.5.4
- [Qemu-devel] [PATCH 00/15] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 06/15] kvm: ppc: Drop CONFIG_KVM_PPC_PVR, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 12/15] kvm: x86: Pass KVMState to kvm_arch_get_supported_cpuid, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 07/15] kvm: Drop useless zero-initializations, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 10/15] kvm: ppc: Drop KVM_CAP build dependencies,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 08/15] kvm: Drop KVM_CAP build dependencies, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 11/15] kvm: Clean up stubs, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 13/15] Remove unneeded kvm.h from cpu-exec.c, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 05/15] kvm: Drop CONFIG_KVM_PARA, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 14/15] KVM: Fix XSAVE feature bit enumeration, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 01/15] kvm: x86: Save/restore FPU OP, IP and DP, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 04/15] Switch build system to accompanied kernel headers, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 02/15] Add kernel header update script, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 15/15] kvm: fix FPU state subsection, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 09/15] kvm: x86: Drop KVM_CAP build dependencies, Marcelo Tosatti, 2011/06/21