From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVOIa-0003pi-Gx for qemu-devel@nongnu.org; Tue, 10 Mar 2015 13:50:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVOIW-0006du-14 for qemu-devel@nongnu.org; Tue, 10 Mar 2015 13:50:32 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53508 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVOIV-0006d3-Es for qemu-devel@nongnu.org; Tue, 10 Mar 2015 13:50:27 -0400 Message-ID: <54FF2EE0.9010401@suse.de> Date: Tue, 10 Mar 2015 18:50:24 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1423064635-19045-1-git-send-email-marcel@redhat.com> <1423064635-19045-8-git-send-email-marcel@redhat.com> In-Reply-To: <1423064635-19045-8-git-send-email-marcel@redhat.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 7/8] machine: query dump-guest-core machine property rather than qemu opts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, james.hogan@imgtec.com, mst@redhat.com, jan.kiszka@siemens.com, Riku Voipio , agraf@suse.de, scottwood@freescale.com, borntraeger@de.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, leon.alrae@imgtec.com, aurelien@aurel32.net Hi, Am 04.02.2015 um 16:43 schrieb Marcel Apfelbaum: > Fixes a QEMU crash when passing dump_guest_core parameter in command li= ne. Explain that, please? >=20 > Signed-off-by: Marcel Apfelbaum > --- > exec.c | 4 ++-- > hw/core/machine.c | 6 ++++++ > include/hw/boards.h | 1 + > 3 files changed, 9 insertions(+), 2 deletions(-) >=20 > diff --git a/exec.c b/exec.c > index 6b79ad1..bfca528 100644 > --- a/exec.c > +++ b/exec.c > @@ -26,6 +26,7 @@ > #include "cpu.h" > #include "tcg.h" > #include "hw/hw.h" > +#include "hw/boards.h" > #include "hw/qdev.h" > #include "qemu/osdep.h" > #include "sysemu/kvm.h" > @@ -1213,8 +1214,7 @@ static void qemu_ram_setup_dump(void *addr, ram_a= ddr_t size) > int ret; > =20 > /* Use MADV_DONTDUMP, if user doesn't want the guest memory in the= core */ > - if (!qemu_opt_get_bool(qemu_get_machine_opts(), > - "dump-guest-core", true)) { > + if (!machine_dump_guest_core(current_machine)) { linux-user doesn't have a current_machine, and machine.c shouldn't even be compiled in, so I'm guessing this function is #ifdef'ed, which means the header should be #ifdef'ed, too. hw/boards.h has no business being in *-user. Regards, Andreas > ret =3D qemu_madvise(addr, size, QEMU_MADV_DONTDUMP); > if (ret) { > perror("qemu_madvise"); > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 5ad2409..8033683 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -285,6 +285,7 @@ static void machine_initfn(Object *obj) > =20 > ms->kernel_irqchip_allowed =3D true; > ms->kvm_shadow_mem =3D -1; > + ms->dump_guest_core =3D true; > =20 > object_property_add_str(obj, "accel", > machine_get_accel, machine_set_accel, NULL= ); > @@ -425,6 +426,11 @@ int machine_phandle_start(MachineState *machine) > return machine->phandle_start; > } > =20 > +bool machine_dump_guest_core(MachineState *machine) > +{ > + return machine->dump_guest_core; > +} > + > static const TypeInfo machine_info =3D { > .name =3D TYPE_MACHINE, > .parent =3D TYPE_OBJECT, > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 1f21bdf..7de308e 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -71,6 +71,7 @@ bool machine_kernel_irqchip_allowed(MachineState *mac= hine); > bool machine_kernel_irqchip_required(MachineState *machine); > int machine_kvm_shadow_mem(MachineState *machine); > int machine_phandle_start(MachineState *machine); > +bool machine_dump_guest_core(MachineState *machine); > =20 > /** > * MachineClass: >=20 --=20 SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Felix Imend=F6rffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, Graham Norton; HRB 21284 (AG N=FCrnberg)