Patchwork [09/12] kvm: ppc: Drop KVM_CAP build dependencies

login
register
mail settings
Submitter Jan Kiszka
Date June 8, 2011, 2:11 p.m.
Message ID <95341919f37374d98bbcd7ee5991b779011fba20.1307542247.git.jan.kiszka@siemens.com>
Download mbox | patch
Permalink /patch/99445/
State New
Headers show

Comments

Jan Kiszka - June 8, 2011, 2:11 p.m.
No longer needed with accompanied kernel headers.

CC: Alexander Graf <agraf@suse.de>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 target-ppc/kvm.c |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)
Eduardo Habkost - June 10, 2011, 6:32 p.m.
On Wed, Jun 08, 2011 at 04:11:03PM +0200, Jan Kiszka wrote:
<snip>
> @@ -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;

Which tree/commit-id did you use as base for this series? This chunk
doesn't apply on uq/master (patch 11/12, on the other hand, doesn't
apply against qemu.git/master, only uq/master).

After some patch hunting, I found out that the series apply cleanly if I
apply it against a manual merge of uq/master and qemu.git/master, but
maybe there is a branch that already had all the dependencies, that I
didn't know about?
Jan Kiszka - June 11, 2011, 7:45 a.m.
On 2011-06-10 20:32, Eduardo Habkost wrote:
> On Wed, Jun 08, 2011 at 04:11:03PM +0200, Jan Kiszka wrote:
> <snip>
>> @@ -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;
> 
> Which tree/commit-id did you use as base for this series? This chunk
> doesn't apply on uq/master (patch 11/12, on the other hand, doesn't
> apply against qemu.git/master, only uq/master).
> 
> After some patch hunting, I found out that the series apply cleanly if I
> apply it against a manual merge of uq/master and qemu.git/master, but
> maybe there is a branch that already had all the dependencies, that I
> didn't know about?

As I wrote in the introduction, the series requires a trivial rebase of
uq/master over current qemu master (because of this patch).

Jan
Alexander Graf - June 14, 2011, 11:07 a.m.
On 08.06.2011, at 16:11, Jan Kiszka wrote:

> No longer needed with accompanied kernel headers.

What a nice code cleanup.

Reviewed-by: Alexander Graf <agraf@suse.de>

Patch

diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 0500e3f..21f35af 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: