diff options
| author | Aneesh Kumar K.V | 2014-03-14 14:51:49 +0100 |
|---|---|---|
| committer | Andreas Färber | 2014-03-20 02:39:23 +0100 |
| commit | 7aaf4957efad2bf6ac449d0caa9a1535f61006bc (patch) | |
| tree | e0f9ad6cde276c6448135cabeeec2582e5ee68d1 | |
| parent | target-ppc: Add missing 'static' and 'const' attributes (diff) | |
| download | qemu-7aaf4957efad2bf6ac449d0caa9a1535f61006bc.tar.gz qemu-7aaf4957efad2bf6ac449d0caa9a1535f61006bc.tar.xz qemu-7aaf4957efad2bf6ac449d0caa9a1535f61006bc.zip | |
spapr_hcall: Fix h_enter to loop correctly
We wanted to loop till index is 8. On 8 we return with H_PTEG_FULL. If we
are successful in loading hpte with any other index, we continue with that
index value.
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | hw/ppc/spapr_hcall.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index e999bbaea0..2ab55d568b 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -110,16 +110,15 @@ static target_ulong h_enter(PowerPCCPU *cpu, sPAPREnvironment *spapr, if (likely((flags & H_EXACT) == 0)) { pte_index &= ~7ULL; token = ppc_hash64_start_access(cpu, pte_index); - do { - if (index == 8) { - ppc_hash64_stop_access(token); - return H_PTEG_FULL; - } + for (; index < 8; index++) { if ((ppc_hash64_load_hpte0(env, token, index) & HPTE64_V_VALID) == 0) { break; } - } while (index++); + } ppc_hash64_stop_access(token); + if (index == 8) { + return H_PTEG_FULL; + } } else { token = ppc_hash64_start_access(cpu, pte_index); if (ppc_hash64_load_hpte0(env, token, 0) & HPTE64_V_VALID) { |