| Message ID | 20200109152133.23649-12-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Replace current_machine by qdev_get_machine() | expand |
On Fri, Jan 10, 2020 at 1:37 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> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > exec.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/exec.c b/exec.c > index d4b769d0d4..98f5b049ca 100644 > --- a/exec.c > +++ b/exec.c > @@ -1984,11 +1984,11 @@ static unsigned long last_ram_page(void) > > static void qemu_ram_setup_dump(void *addr, ram_addr_t size) > { > - int ret; > + MachineState *ms = MACHINE(qdev_get_machine()); > > /* Use MADV_DONTDUMP, if user doesn't want the guest memory in the core */ > - if (!machine_dump_guest_core(current_machine)) { > - ret = qemu_madvise(addr, size, QEMU_MADV_DONTDUMP); > + if (!machine_dump_guest_core(ms)) { > + int ret = qemu_madvise(addr, size, QEMU_MADV_DONTDUMP); > if (ret) { > perror("qemu_madvise"); > fprintf(stderr, "madvise doesn't support MADV_DONTDUMP, " > @@ -2108,7 +2108,9 @@ size_t qemu_ram_pagesize_largest(void) > > static int memory_try_enable_merging(void *addr, size_t len) > { > - if (!machine_mem_merge(current_machine)) { > + MachineState *ms = MACHINE(qdev_get_machine()); > + > + if (!machine_mem_merge(ms)) { > /* disabled by the user */ > return 0; > } > -- > 2.21.1 > >
diff --git a/exec.c b/exec.c index d4b769d0d4..98f5b049ca 100644 --- a/exec.c +++ b/exec.c @@ -1984,11 +1984,11 @@ static unsigned long last_ram_page(void) static void qemu_ram_setup_dump(void *addr, ram_addr_t size) { - int ret; + MachineState *ms = MACHINE(qdev_get_machine()); /* Use MADV_DONTDUMP, if user doesn't want the guest memory in the core */ - if (!machine_dump_guest_core(current_machine)) { - ret = qemu_madvise(addr, size, QEMU_MADV_DONTDUMP); + if (!machine_dump_guest_core(ms)) { + int ret = qemu_madvise(addr, size, QEMU_MADV_DONTDUMP); if (ret) { perror("qemu_madvise"); fprintf(stderr, "madvise doesn't support MADV_DONTDUMP, " @@ -2108,7 +2108,9 @@ size_t qemu_ram_pagesize_largest(void) static int memory_try_enable_merging(void *addr, size_t len) { - if (!machine_mem_merge(current_machine)) { + MachineState *ms = MACHINE(qdev_get_machine()); + + if (!machine_mem_merge(ms)) { /* disabled by the user */ return 0; }
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> --- exec.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)