machine: query mem-merge machine property
commit75cc7f018328e708d94cca23c3a77e85363f25dc
authorMarcel Apfelbaum <marcel@redhat.com>
Wed, 4 Feb 2015 15:43:55 +0000 (4 17:43 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 11 Mar 2015 17:19:22 +0000 (11 18:19 +0100)
tree7586784f05c5559ba9626bfc618cdc7a3bdbf02b
parent47c8ca533e502955a4e1b24056639c79500ab8f8
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 <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>
exec.c
hw/core/machine.c
include/hw/boards.h