diff options
| author | Peter Maydell | 2015-07-23 13:54:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-07-23 13:54:53 +0200 |
| commit | 12e21eb088a51161c78ee39ed54ac56ebcff4243 (patch) | |
| tree | 26d83f4bcfc86a6ca1042173697d52f0bad88be5 | |
| parent | Update version for v2.4.0-rc2 release (diff) | |
| parent | hostmem: Fix qemu_opt_get_bool() crash in host_memory_backend_init() (diff) | |
| download | qemu-12e21eb088a51161c78ee39ed54ac56ebcff4243.tar.gz qemu-12e21eb088a51161c78ee39ed54ac56ebcff4243.tar.xz qemu-12e21eb088a51161c78ee39ed54ac56ebcff4243.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging
NUMA queue, 2015-07-22
# gpg: Signature made Wed Jul 22 19:11:04 2015 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/numa-pull-request:
hostmem: Fix qemu_opt_get_bool() crash in host_memory_backend_init()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | backends/hostmem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/hostmem.c b/backends/hostmem.c index 61c1ac0843..41ba2af52f 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ #include "sysemu/hostmem.h" +#include "hw/boards.h" #include "qapi/visitor.h" #include "qapi-types.h" #include "qapi-visit.h" @@ -222,11 +223,10 @@ static void host_memory_backend_set_prealloc(Object *obj, bool value, static void host_memory_backend_init(Object *obj) { HostMemoryBackend *backend = MEMORY_BACKEND(obj); + MachineState *machine = MACHINE(qdev_get_machine()); - backend->merge = qemu_opt_get_bool(qemu_get_machine_opts(), - "mem-merge", true); - backend->dump = qemu_opt_get_bool(qemu_get_machine_opts(), - "dump-guest-core", true); + backend->merge = machine_mem_merge(machine); + backend->dump = machine_dump_guest_core(machine); backend->prealloc = mem_prealloc; object_property_add_bool(obj, "merge", |