On Thu, Jan 9, 2020 at 11:30 PM Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> wrote: > > As we want to remove the global current_machine, > replace MACHINE_GET_CLASS(current_machine) by > MACHINE_GET_CLASS(qdev_get_machine()). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> Reviewed-by: Alistair Francis <alistair.francis@xxxxxxx> Alistair > --- > hw/core/machine-qmp-cmds.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c > index eed5aeb2f7..5a04d00e4f 100644 > --- a/hw/core/machine-qmp-cmds.c > +++ b/hw/core/machine-qmp-cmds.c > @@ -280,9 +280,9 @@ void qmp_cpu_add(int64_t id, Error **errp) > { > MachineClass *mc; > > - mc = MACHINE_GET_CLASS(current_machine); > + mc = MACHINE_GET_CLASS(qdev_get_machine()); > if (mc->hot_add_cpu) { > - mc->hot_add_cpu(current_machine, id, errp); > + mc->hot_add_cpu(MACHINE(qdev_get_machine()), id, errp); > } else { > error_setg(errp, "Not supported"); > } > -- > 2.21.1 > >