Message ID | 20200109152133.23649-10-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | Replace current_machine by qdev_get_machine() | expand |
On Thu, Jan 9, 2020 at 11:34 PM 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> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > device_tree.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/device_tree.c b/device_tree.c > index f8b46b3c73..665ea2f586 100644 > --- a/device_tree.c > +++ b/device_tree.c > @@ -466,7 +466,9 @@ uint32_t qemu_fdt_alloc_phandle(void *fdt) > * which phandle id to start allocating phandles. > */ > if (!phandle) { > - phandle = machine_phandle_start(current_machine); > + MachineState *ms = MACHINE(qdev_get_machine()); > + > + phandle = machine_phandle_start(ms); > } > > if (!phandle) { > -- > 2.21.1 > >
diff --git a/device_tree.c b/device_tree.c index f8b46b3c73..665ea2f586 100644 --- a/device_tree.c +++ b/device_tree.c @@ -466,7 +466,9 @@ uint32_t qemu_fdt_alloc_phandle(void *fdt) * which phandle id to start allocating phandles. */ if (!phandle) { - phandle = machine_phandle_start(current_machine); + MachineState *ms = MACHINE(qdev_get_machine()); + + phandle = machine_phandle_start(ms); } if (!phandle) {
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> --- device_tree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)