From: Alistair Francis <alistair23@gmail.com> To: "Philippe Mathieu-Daudé" <philmd@redhat.com> Cc: "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, Peter Maydell <peter.maydell@linaro.org>, Eduardo Habkost <ehabkost@redhat.com>, "open list:Overall" <kvm@vger.kernel.org>, Juan Quintela <quintela@redhat.com>, "open list:New World" <qemu-ppc@nongnu.org>, Marcelo Tosatti <mtosatti@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, qemu-arm <qemu-arm@nongnu.org>, Alistair Francis <alistair.francis@wdc.com>, Paolo Bonzini <pbonzini@redhat.com>, David Gibson <david@gibson.dropbear.id.au>, Richard Henderson <rth@twiddle.net> Subject: Re: [PATCH 13/15] accel: Replace current_machine->accelerator by current_accel() method Date: Tue, 14 Jan 2020 11:58:43 +1000 [thread overview] Message-ID: <CAKmqyKNQbbuxz9jnwa5A8FiXofU9jSwMSHp1LpXmrrAQyM_ddA@mail.gmail.com> (raw) In-Reply-To: <20200109152133.23649-14-philmd@redhat.com> On Fri, Jan 10, 2020 at 1:38 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > As we want to remove the global current_machine, > replace 'current_machine->accelerator' by current_accel(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> 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 > >
WARNING: multiple messages have this Message-ID (diff)
From: Alistair Francis <alistair23@gmail.com> To: "Philippe Mathieu-Daudé" <philmd@redhat.com> Cc: Peter Maydell <peter.maydell@linaro.org>, Eduardo Habkost <ehabkost@redhat.com>, "open list:Overall" <kvm@vger.kernel.org>, Juan Quintela <quintela@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, qemu-arm <qemu-arm@nongnu.org>, "open list:New World" <qemu-ppc@nongnu.org>, Paolo Bonzini <pbonzini@redhat.com>, Alistair Francis <alistair.francis@wdc.com>, Richard Henderson <rth@twiddle.net>, David Gibson <david@gibson.dropbear.id.au> Subject: Re: [PATCH 13/15] accel: Replace current_machine->accelerator by current_accel() method Date: Tue, 14 Jan 2020 11:58:43 +1000 [thread overview] Message-ID: <CAKmqyKNQbbuxz9jnwa5A8FiXofU9jSwMSHp1LpXmrrAQyM_ddA@mail.gmail.com> (raw) In-Reply-To: <20200109152133.23649-14-philmd@redhat.com> On Fri, Jan 10, 2020 at 1:38 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > As we want to remove the global current_machine, > replace 'current_machine->accelerator' by current_accel(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> 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 > >
next prev parent reply other threads:[~2020-01-14 1:59 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-09 15:21 [PATCH 00/15] Replace current_machine by qdev_get_machine() Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-09 15:21 ` [PATCH 01/15] target/arm/kvm: Use CPUState::kvm_state in kvm_arm_pmu_supported() Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-10 9:59 ` Alistair Francis 2020-01-10 9:59 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 02/15] hw/ppc/spapr_rtas: Use local MachineState variable Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-09 17:13 ` Greg Kurz 2020-01-09 17:13 ` Greg Kurz 2020-01-13 1:11 ` David Gibson 2020-01-13 1:11 ` David Gibson 2020-01-09 15:21 ` [PATCH 03/15] hw/ppc/spapr_rtas: Access MachineState via SpaprMachineState argument Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-09 17:13 ` Greg Kurz 2020-01-09 17:13 ` Greg Kurz 2020-01-13 1:11 ` David Gibson 2020-01-13 1:11 ` David Gibson 2020-01-09 15:21 ` [PATCH 04/15] hw/ppc/spapr_rtas: Restrict variables scope to single switch case Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-09 17:43 ` Greg Kurz 2020-01-09 17:43 ` Greg Kurz 2020-01-10 9:34 ` Philippe Mathieu-Daudé 2020-01-10 9:34 ` Philippe Mathieu-Daudé 2020-01-10 9:50 ` Greg Kurz 2020-01-10 9:50 ` Greg Kurz 2020-01-10 19:18 ` Eric Blake 2020-01-10 19:18 ` Eric Blake 2020-01-13 7:16 ` David Gibson 2020-01-13 7:16 ` David Gibson 2020-01-09 15:21 ` [PATCH 05/15] device-hotplug: Replace current_machine by qdev_get_machine() Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-12 9:42 ` Alistair Francis 2020-01-12 9:42 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 06/15] migration/savevm: " Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-09 15:52 ` Dr. David Alan Gilbert 2020-01-09 15:52 ` Dr. David Alan Gilbert 2020-01-12 9:43 ` Alistair Francis 2020-01-12 9:43 ` Alistair Francis 2020-01-14 13:27 ` Juan Quintela 2020-01-14 13:27 ` Juan Quintela 2020-01-09 15:21 ` [PATCH 07/15] hw/core/machine-qmp-cmds: " Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-12 9:44 ` Alistair Francis 2020-01-12 9:44 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 08/15] target/arm/monitor: " Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-12 9:47 ` Alistair Francis 2020-01-12 9:47 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 09/15] device_tree: " Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-12 9:47 ` Alistair Francis 2020-01-12 9:47 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 10/15] memory: " Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-12 9:48 ` Alistair Francis 2020-01-12 9:48 ` Alistair Francis 2020-01-12 13:45 ` Philippe Mathieu-Daudé 2020-01-12 13:45 ` Philippe Mathieu-Daudé 2020-01-14 2:02 ` Alistair Francis 2020-01-14 2:02 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 11/15] exec: " Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-14 1:57 ` Alistair Francis 2020-01-14 1:57 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 12/15] accel: Introduce the current_accel() method Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-14 1:59 ` Alistair Francis 2020-01-14 1:59 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 13/15] accel: Replace current_machine->accelerator by " Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-14 1:58 ` Alistair Francis [this message] 2020-01-14 1:58 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 14/15] accel/accel: Replace current_machine by qdev_get_machine() Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-14 1:59 ` Alistair Francis 2020-01-14 1:59 ` Alistair Francis 2020-01-09 15:21 ` [PATCH 15/15] vl: Make current_machine a local variable Philippe Mathieu-Daudé 2020-01-09 15:21 ` Philippe Mathieu-Daudé 2020-01-14 2:00 ` Alistair Francis 2020-01-14 2:00 ` Alistair Francis 2020-01-21 8:59 ` [PATCH 00/15] Replace current_machine by qdev_get_machine() Markus Armbruster 2020-01-21 8:59 ` Markus Armbruster
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAKmqyKNQbbuxz9jnwa5A8FiXofU9jSwMSHp1LpXmrrAQyM_ddA@mail.gmail.com \ --to=alistair23@gmail.com \ --cc=alistair.francis@wdc.com \ --cc=david@gibson.dropbear.id.au \ --cc=dgilbert@redhat.com \ --cc=ehabkost@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=philmd@redhat.com \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=quintela@redhat.com \ --cc=rth@twiddle.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.