Commit cb931c21 authored by Suraj Jitindar Singh's avatar Suraj Jitindar Singh Committed by David Gibson
Browse files

target/ppc: Check mask when setting cap_ppc_safe_indirect_branch 



Check the character and character_mask field when setting
cap_ppc_safe_indirect_branch based on the hypervisor response
to KVM_PPC_GET_CPU_CHAR. Previously the mask field wasn't checked
which was incorrect.

Fixes: 8acc2ae5 (target/ppc/kvm: Add cap_ppc_safe_[cache/bounds_check/indirect_branch])

Signed-off-by: default avatarSuraj Jitindar Singh <sjitindarsingh@gmail.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent b6712ea3

target/ppc/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -2494,7 +2494,7 @@ static void kvmppc_get_cpu_characteristics(KVMState *s) 
        cap_ppc_safe_bounds_check = 1;

    }

    /* Parse and set cap_ppc_safe_indirect_branch */

    if (c.character & H_CPU_CHAR_BCCTRL_SERIALISED) {

    if (c.character & c.character_mask & H_CPU_CHAR_BCCTRL_SERIALISED) {

        cap_ppc_safe_indirect_branch = 2;

    }

}