From 47c8ca533e502955a4e1b24056639c79500ab8f8 Mon Sep 17 00:00:00 2001 From: Marcel Apfelbaum Date: Wed, 4 Feb 2015 17:43:54 +0200 Subject: 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 Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Paolo Bonzini --- exec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'exec.c') diff --git a/exec.c b/exec.c index b44a33c9ac..f55270bdeb 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" @@ -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"); -- cgit v1.2.3-55-g7522 From 75cc7f018328e708d94cca23c3a77e85363f25dc Mon Sep 17 00:00:00 2001 From: Marcel Apfelbaum Date: Wed, 4 Feb 2015 17:43:55 +0200 Subject: machine: query mem-merge machine property Running qemu-bin ... -machine pc,mem-merge=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 Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Paolo Bonzini --- exec.c | 2 +- hw/core/machine.c | 6 ++++++ include/hw/boards.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'exec.c') diff --git a/exec.c b/exec.c index f55270bdeb..fe64009f0c 100644 --- a/exec.c +++ b/exec.c @@ -1326,7 +1326,7 @@ void qemu_ram_unset_idstr(ram_addr_t addr) static int memory_try_enable_merging(void *addr, size_t len) { - if (!qemu_opt_get_bool(qemu_get_machine_opts(), "mem-merge", true)) { + if (!machine_mem_merge(current_machine)) { /* disabled by the user */ return 0; } diff --git a/hw/core/machine.c b/hw/core/machine.c index 80336839d5..e3a3e2ab73 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -286,6 +286,7 @@ static void machine_initfn(Object *obj) ms->kernel_irqchip_allowed = true; ms->kvm_shadow_mem = -1; ms->dump_guest_core = true; + ms->mem_merge = true; object_property_add_str(obj, "accel", machine_get_accel, machine_set_accel, NULL); @@ -431,6 +432,11 @@ bool machine_dump_guest_core(MachineState *machine) return machine->dump_guest_core; } +bool machine_mem_merge(MachineState *machine) +{ + return machine->mem_merge; +} + static const TypeInfo machine_info = { .name = TYPE_MACHINE, .parent = TYPE_OBJECT, diff --git a/include/hw/boards.h b/include/hw/boards.h index bbac39d5e2..cd6deb0547 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -74,6 +74,7 @@ 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); +bool machine_mem_merge(MachineState *machine); /** * MachineClass: -- cgit v1.2.3-55-g7522 From 4485bd269c0e1c051d21d0196be89cdba23d9520 Mon Sep 17 00:00:00 2001 From: Michael S. Tsirkin Date: Wed, 11 Mar 2015 07:56:34 +0100 Subject: exec: don't include hw/boards for linux-user As noted by Andreas, hw/boards.h shouldn't be used outside softmmu code. Include it conditionally, and drop the (now unnecessary) ifdef guards in hw/boards.h Reported-by: Andreas Färber Cc: Peter Maydell Signed-off-by: Michael S. Tsirkin Reviewed-by: Andreas Färber --- exec.c | 2 ++ include/hw/boards.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'exec.c') diff --git a/exec.c b/exec.c index fe64009f0c..bc37c7b485 100644 --- a/exec.c +++ b/exec.c @@ -26,7 +26,9 @@ #include "cpu.h" #include "tcg.h" #include "hw/hw.h" +#if !defined(CONFIG_USER_ONLY) #include "hw/boards.h" +#endif #include "hw/qdev.h" #include "qemu/osdep.h" #include "sysemu/kvm.h" diff --git a/include/hw/boards.h b/include/hw/boards.h index cd6deb0547..f44d6f542a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -3,8 +3,6 @@ #ifndef HW_BOARDS_H #define HW_BOARDS_H -#if !defined(CONFIG_USER_ONLY) - #include "qemu/typedefs.h" #include "sysemu/blockdev.h" #include "sysemu/accel.h" @@ -158,5 +156,3 @@ struct MachineState { }; #endif - -#endif -- cgit v1.2.3-55-g7522