diff options
| author | Marcel Apfelbaum <marcel@redhat.com> | 2015-02-04 17:43:54 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-03-11 18:17:54 +0100 |
| commit | 47c8ca533e502955a4e1b24056639c79500ab8f8 (patch) | |
| tree | f96c0f4e8c5cf016f240fa0422cdd017c6ef21da | |
| parent | 66bd56694beef7fb8687767e6bec0264227c6b14 (diff) | |
machine: query dump-guest-core machine property
Running
qemu-bin ... -machine pc,dump-guest-core=on
leads to crash:
x86_64-softmmu/qemu-system-x86_64 -machine pc,dump-guest-core=on
qemu-system-x86_64: qemu/util/qemu-option.c:387: qemu_opt_get_bool_helper:
Assertion `opt->desc && opt->desc->type == QEMU_OPT_BOOL' failed. Aborted
(core dumped)
This happens because the commit e79d5a6 ("machine: remove qemu_machine_opts
global list") removed the global option descriptions and moved them to
MachineState's QOM properties.
Fix this by querying machine properties through designated wrappers.
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | exec.c | 4 | ||||
| -rw-r--r-- | hw/core/machine.c | 6 | ||||
| -rw-r--r-- | include/hw/boards.h | 1 |
3 files changed, 9 insertions, 2 deletions
@@ -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" @@ -1250,8 +1251,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 5ad24093ad..80336839d5 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 0bf00f7717..bbac39d5e2 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -73,6 +73,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: |