From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJ28U-0003st-EJ for qemu-devel@nongnu.org; Wed, 04 Feb 2015 10:45:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJ28M-0004hH-Gr for qemu-devel@nongnu.org; Wed, 04 Feb 2015 10:45:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJ28M-0004gz-82 for qemu-devel@nongnu.org; Wed, 04 Feb 2015 10:44:54 -0500 From: Marcel Apfelbaum Date: Wed, 4 Feb 2015 17:43:54 +0200 Message-Id: <1423064635-19045-8-git-send-email-marcel@redhat.com> In-Reply-To: <1423064635-19045-1-git-send-email-marcel@redhat.com> References: <1423064635-19045-1-git-send-email-marcel@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, james.hogan@imgtec.com, mst@redhat.com, marcel@redhat.com, jan.kiszka@siemens.com, cornelia.huck@de.ibm.com, agraf@suse.de, borntraeger@de.ibm.com, scottwood@freescale.com, pbonzini@redhat.com, leon.alrae@imgtec.com, aurelien@aurel32.net Fixes a QEMU crash when passing dump_guest_core parameter in command line. 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(-) 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_addr_t size) int ret; /* 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)) { ret = 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) ms->kernel_irqchip_allowed = true; ms->kvm_shadow_mem = -1; + ms->dump_guest_core = true; 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; } +bool machine_dump_guest_core(MachineState *machine) +{ + return machine->dump_guest_core; +} + static const TypeInfo machine_info = { .name = TYPE_MACHINE, .parent = 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 *machine); 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); /** * MachineClass: -- 2.1.0