From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHHVV-0004Gt-UJ for qemu-devel@nongnu.org; Mon, 20 Jul 2015 16:17:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHHVQ-0000z4-PK for qemu-devel@nongnu.org; Mon, 20 Jul 2015 16:17:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHHVQ-0000yw-JO for qemu-devel@nongnu.org; Mon, 20 Jul 2015 16:17:44 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3CB90AEF16 for ; Mon, 20 Jul 2015 20:17:44 +0000 (UTC) References: <1437423301-4991-1-git-send-email-ehabkost@redhat.com> From: Marcel Apfelbaum Message-ID: <55AD5764.8090908@redhat.com> Date: Mon, 20 Jul 2015 23:17:40 +0300 MIME-Version: 1.0 In-Reply-To: <1437423301-4991-1-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2] hostmem: Fix qemu_opt_get_bool() crash in host_memory_backend_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , Marcel Apfelbaum On 07/20/2015 11:15 PM, Eduardo Habkost wrote: > This fixes the following crash, introduced by commit > 49d2e648e8087d154d8bf8b91f27c8e05e79d5a6: > > $ gdb --args qemu-system-x86_64 -machine pc,mem-merge=off -object memory-backend-ram,id=ram-node0,size=1024 > [...] > Program received signal SIGABRT, Aborted. > (gdb) bt > #0 0x00007ffff253b8c7 in raise () at /lib64/libc.so.6 > #1 0x00007ffff253d52a in abort () at /lib64/libc.so.6 > #2 0x00007ffff253446d in __assert_fail_base () at /lib64/libc.so.6 > #3 0x00007ffff2534522 in () at /lib64/libc.so.6 > #4 0x00005555558bb80a in qemu_opt_get_bool_helper (opts=0x55555621b650, name=name@entry=0x5555558ec922 "mem-merge", defval=defval@entry=true, del=del@entry=false) at qemu/util/qemu-option.c:388 > #5 0x00005555558bbb5a in qemu_opt_get_bool (opts=, name=name@entry=0x5555558ec922 "mem-merge", defval=defval@entry=true) at qemu/util/qemu-option.c:398 > #6 0x0000555555720a24 in host_memory_backend_init (obj=0x5555562ac970) at qemu/backends/hostmem.c:226 > > Instead of using qemu_opt_get_bool(), that didn't work with > qemu_machine_opts for a long time, we can use the corresponding > MachineState fields. > > Signed-off-by: Eduardo Habkost > --- > Changes v1 -> v2: > * Use qdev_get_machine() instead of current_machine > * Use the MachineState field wrappers intead of QOM properties, > to allow compile-time type checks > --- > backends/hostmem.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/backends/hostmem.c b/backends/hostmem.c > index 61c1ac0..41ba2af 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", > Reviewed-by: Marcel Apfelbaum