From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFzxk-0004GT-Em for qemu-devel@nongnu.org; Fri, 17 Jul 2015 03:21:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFzxh-0005Zf-6U for qemu-devel@nongnu.org; Fri, 17 Jul 2015 03:21:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFzxh-0005Yh-09 for qemu-devel@nongnu.org; Fri, 17 Jul 2015 03:21:37 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 217FC92470 for ; Fri, 17 Jul 2015 07:21:36 +0000 (UTC) Message-ID: <55A8ACF9.1090303@redhat.com> Date: Fri, 17 Jul 2015 10:21:29 +0300 From: Marcel Apfelbaum MIME-Version: 1.0 References: <1437079157-6316-1-git-send-email-ehabkost@redhat.com> In-Reply-To: <1437079157-6316-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] 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 , Marcel Apfelbaum On 07/16/2015 11:39 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 machine QOM properties > directly. This was the intent. > > Signed-off-by: Eduardo Habkost > --- > backends/hostmem.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/backends/hostmem.c b/backends/hostmem.c > index 61c1ac0..38a32ed 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" > @@ -223,10 +224,10 @@ static void host_memory_backend_init(Object *obj) > { > HostMemoryBackend *backend = MEMORY_BACKEND(obj); > > - 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 = object_property_get_bool(OBJECT(current_machine), > + "mem-merge", &error_abort); > + backend->dump = object_property_get_bool(OBJECT(current_machine), > + "dump-guest-core", &error_abort); > backend->prealloc = mem_prealloc; > > object_property_add_bool(obj, "merge", > Thank you for fixing this, Reviewed-by: Marcel Apfelbaum