[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] machine: query dump-guest-core machine property
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH 7/8] machine: query dump-guest-core machine property rather than qemu opts |
Date: |
Wed, 4 Feb 2015 17:43:54 +0200 |
Fixes a QEMU crash when passing dump_guest_core parameter in command line.
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/8] machine: query machine properties rather than qemu opts, Marcel Apfelbaum, 2015/02/04
- [Qemu-devel] [PATCH 3/8] machine: query kernel-irqchip machine property rather than qemu opts, Marcel Apfelbaum, 2015/02/04
- [Qemu-devel] [PATCH 6/8] machine: query phandle-start machine property rather than qemu opts, Marcel Apfelbaum, 2015/02/04
- [Qemu-devel] [PATCH 7/8] machine: query dump-guest-core machine property rather than qemu opts,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH 5/8] machine: query kvm-shadow-mem machine property rather than qemu opts, Marcel Apfelbaum, 2015/02/04
- Re: [Qemu-devel] [PATCH 0/8] machine: query machine properties rather than qemu opts, Paolo Bonzini, 2015/02/04
- [Qemu-devel] [PATCH 2/8] hw/machine: kernel-irqchip property support for allowed/required, Marcel Apfelbaum, 2015/02/04
- [Qemu-devel] [PATCH 4/8] kvm: add machine state to kvm_arch_init, Marcel Apfelbaum, 2015/02/04
- [Qemu-devel] [PATCH 8/8] machine: query mem-merge machine property rather than qemu opts, Marcel Apfelbaum, 2015/02/04
- Re: [Qemu-devel] [PATCH 0/8] machine: query machine properties rather than qemu opts, Christian Borntraeger, 2015/02/04
- Re: [Qemu-devel] [PATCH 0/8] machine: query machine properties rather than qemu opts, Marcel Apfelbaum, 2015/02/25