Re: [Qemu-devel] [PATCH 09/12] kvm: ppc: Drop KVM_CAP build dependencies

2011-06-14 Thread Alexander Graf 

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 ag...@suse.de

Re: [Qemu-devel] [PATCH 09/12] kvm: ppc: Drop KVM_CAP build dependencies

2011-06-11 Thread Jan Kiszka 
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



signature.asc
Description: OpenPGP digital signature

Re: [Qemu-devel] [PATCH 09/12] kvm: ppc: Drop KVM_CAP build dependencies

2011-06-10 Thread Eduardo Habkost 
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?

-- 
Eduardo

[Qemu-devel] [PATCH 09/12] kvm: ppc: Drop KVM_CAP build dependencies

2011-06-08 Thread Jan Kiszka 
No longer needed with accompanied kernel headers.

CC: Alexander Graf ag...@suse.de
Signed-off-by: Jan Kiszka jan.kis...@siemens.com
---
 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..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]  0x;
 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.1