| Message ID | 20200109152133.23649-13-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Replace current_machine by qdev_get_machine() | expand |
On Fri, Jan 10, 2020 at 1:27 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > We want to remove the global current_machine. The accel/ > code access few times current_machine->accelerator. Introduce > the current_accel() method first, it will then be easier to > replace 'current_machine' by MACHINE(qdev_get_machine()). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > include/sysemu/accel.h | 2 ++ > accel/accel.c | 5 +++++ > 2 files changed, 7 insertions(+) > > diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h > index d4c1429711..47e5788530 100644 > --- a/include/sysemu/accel.h > +++ b/include/sysemu/accel.h > @@ -70,4 +70,6 @@ int accel_init_machine(AccelState *accel, MachineState *ms); > /* Called just before os_setup_post (ie just before drop OS privs) */ > void accel_setup_post(MachineState *ms); > > +AccelState *current_accel(void); > + > #endif > diff --git a/accel/accel.c b/accel/accel.c > index 1c5c3a6abb..cb555e3b06 100644 > --- a/accel/accel.c > +++ b/accel/accel.c > @@ -63,6 +63,11 @@ int accel_init_machine(AccelState *accel, MachineState *ms) > return ret; > } > > +AccelState *current_accel(void) > +{ > + return current_machine->accelerator; > +} > + > void accel_setup_post(MachineState *ms) > { > AccelState *accel = ms->accelerator; > -- > 2.21.1 > >
diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index d4c1429711..47e5788530 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -70,4 +70,6 @@ int accel_init_machine(AccelState *accel, MachineState *ms); /* Called just before os_setup_post (ie just before drop OS privs) */ void accel_setup_post(MachineState *ms); +AccelState *current_accel(void); + #endif diff --git a/accel/accel.c b/accel/accel.c index 1c5c3a6abb..cb555e3b06 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -63,6 +63,11 @@ int accel_init_machine(AccelState *accel, MachineState *ms) return ret; } +AccelState *current_accel(void) +{ + return current_machine->accelerator; +} + void accel_setup_post(MachineState *ms) { AccelState *accel = ms->accelerator;
We want to remove the global current_machine. The accel/ code access few times current_machine->accelerator. Introduce the current_accel() method first, it will then be easier to replace 'current_machine' by MACHINE(qdev_get_machine()). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- include/sysemu/accel.h | 2 ++ accel/accel.c | 5 +++++ 2 files changed, 7 insertions(+)