On Fri, Jan 10, 2020 at 1:38 AM Philippe Mathieu-Daudé
<philmd@xxxxxxxxxx> wrote:
>
> As we want to remove the global current_machine,
> replace 'current_machine->accelerator' by current_accel().
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
Reviewed-by: Alistair Francis <alistair.francis@xxxxxxx>
Alistair
> ---
> accel/kvm/kvm-all.c | 4 ++--
> accel/tcg/tcg-all.c | 2 +-
> memory.c | 2 +-
> target/arm/kvm64.c | 4 ++--
> target/i386/kvm.c | 2 +-
> target/ppc/kvm.c | 2 +-
> vl.c | 2 +-
> 7 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index b2f1a5bcb5..be1980f250 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -164,7 +164,7 @@ static NotifierList kvm_irqchip_change_notifiers =
>
> int kvm_get_max_memslots(void)
> {
> - KVMState *s = KVM_STATE(current_machine->accelerator);
> + KVMState *s = KVM_STATE(current_accel());
>
> return s->nr_slots;
> }
> @@ -1847,7 +1847,7 @@ static int kvm_max_vcpu_id(KVMState *s)
>
> bool kvm_vcpu_id_is_valid(int vcpu_id)
> {
> - KVMState *s = KVM_STATE(current_machine->accelerator);
> + KVMState *s = KVM_STATE(current_accel());
> return vcpu_id >= 0 && vcpu_id < kvm_max_vcpu_id(s);
> }
>
> diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
> index 1dc384c8d2..1802ce02f6 100644
> --- a/accel/tcg/tcg-all.c
> +++ b/accel/tcg/tcg-all.c
> @@ -124,7 +124,7 @@ static void tcg_accel_instance_init(Object *obj)
>
> static int tcg_init(MachineState *ms)
> {
> - TCGState *s = TCG_STATE(current_machine->accelerator);
> + TCGState *s = TCG_STATE(current_accel());
>
> tcg_exec_init(s->tb_size * 1024 * 1024);
> cpu_interrupt_handler = tcg_handle_interrupt;
> diff --git a/memory.c b/memory.c
> index 57e38b1f50..60e8993499 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -3106,7 +3106,7 @@ void mtree_info(bool flatview, bool dispatch_tree, bool owner)
> };
> GArray *fv_address_spaces;
> GHashTable *views = g_hash_table_new(g_direct_hash, g_direct_equal);
> - AccelClass *ac = ACCEL_GET_CLASS(current_machine->accelerator);
> + AccelClass *ac = ACCEL_GET_CLASS(current_accel());
>
> if (ac->has_memory) {
> fvi.ac = ac;
> diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
> index 876184b8fe..f677877a1e 100644
> --- a/target/arm/kvm64.c
> +++ b/target/arm/kvm64.c
> @@ -613,14 +613,14 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
>
> bool kvm_arm_aarch32_supported(CPUState *cpu)
> {
> - KVMState *s = KVM_STATE(current_machine->accelerator);
> + KVMState *s = KVM_STATE(current_accel());
>
> return kvm_check_extension(s, KVM_CAP_ARM_EL1_32BIT);
> }
>
> bool kvm_arm_sve_supported(CPUState *cpu)
> {
> - KVMState *s = KVM_STATE(current_machine->accelerator);
> + KVMState *s = KVM_STATE(current_accel());
>
> return kvm_check_extension(s, KVM_CAP_ARM_SVE);
> }
> diff --git a/target/i386/kvm.c b/target/i386/kvm.c
> index 0b511906e3..2ed15814dc 100644
> --- a/target/i386/kvm.c
> +++ b/target/i386/kvm.c
> @@ -147,7 +147,7 @@ bool kvm_allows_irq0_override(void)
>
> static bool kvm_x2apic_api_set_flags(uint64_t flags)
> {
> - KVMState *s = KVM_STATE(current_machine->accelerator);
> + KVMState *s = KVM_STATE(current_accel());
>
> return !kvm_vm_enable_cap(s, KVM_CAP_X2APIC_API, 0, flags);
> }
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index d1c334f0e3..2d011308e0 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;
> diff --git a/vl.c b/vl.c
> index 86474a55c9..3ff3548183 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2804,7 +2804,7 @@ static void configure_accelerators(const char *progname)
> }
>
> if (init_failed) {
> - AccelClass *ac = ACCEL_GET_CLASS(current_machine->accelerator);
> + AccelClass *ac = ACCEL_GET_CLASS(current_accel());
> error_report("falling back to %s", ac->name);
> }
>
> --
> 2.21.1
>
>
