On Tue, 21 Jan 2020 12:03:48 +0100 Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> wrote: > We actually want to access the accelerator, not the machine, so > use the current_accel() wrapper instead. > > Suggested-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> > Reviewed-by: Alistair Francis <alistair.francis@xxxxxxx> > Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> > --- > v2: > - Reworded description > - Remove unused include in arm/kvm64 > --- > accel/kvm/kvm-all.c | 4 ++-- > accel/tcg/tcg-all.c | 2 +- > memory.c | 2 +- > target/arm/kvm64.c | 5 ++--- > target/i386/kvm.c | 2 +- > target/ppc/kvm.c | 2 +- > vl.c | 2 +- > 7 files changed, 9 insertions(+), 10 deletions(-) > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index b5799e62b4..45ede6b6d9 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -258,7 +258,7 @@ static void kvm_get_smmu_info(struct kvm_ppc_smmu_info *info, Error **errp) > > struct ppc_radix_page_info *kvm_get_radix_page_info(void) > { > - KVMState *s = KVM_STATE(current_machine->accelerator); > + KVMState *s = KVM_STATE(current_accel()); > struct ppc_radix_page_info *radix_page_info; > struct kvm_ppc_rmmu_info rmmu_info; > int i; What about the usage in kvmppc_svm_off()?