Message ID | 20200109152133.23649-15-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | Replace current_machine by qdev_get_machine() | expand |
On Fri, Jan 10, 2020 at 1:40 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > As we want to remove the global current_machine, > replace 'current_machine' by MACHINE(qdev_get_machine()). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> I feel like this could be squashed with the one that adds this function, but either way: Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > accel/accel.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/accel/accel.c b/accel/accel.c > index cb555e3b06..777d6ba119 100644 > --- a/accel/accel.c > +++ b/accel/accel.c > @@ -65,7 +65,9 @@ int accel_init_machine(AccelState *accel, MachineState *ms) > > AccelState *current_accel(void) > { > - return current_machine->accelerator; > + MachineState *ms = MACHINE(qdev_get_machine()); > + > + return ms->accelerator; > } > > void accel_setup_post(MachineState *ms) > -- > 2.21.1 > >
diff --git a/accel/accel.c b/accel/accel.c index cb555e3b06..777d6ba119 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -65,7 +65,9 @@ int accel_init_machine(AccelState *accel, MachineState *ms) AccelState *current_accel(void) { - return current_machine->accelerator; + MachineState *ms = MACHINE(qdev_get_machine()); + + return ms->accelerator; } void accel_setup_post(MachineState *ms)
As we want to remove the global current_machine, replace 'current_machine' by MACHINE(qdev_get_machine()). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- accel/accel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)