From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOLUi-0002XX-Tu for qemu-devel@nongnu.org; Wed, 27 Jan 2016 03:30:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOLUd-0006DS-W8 for qemu-devel@nongnu.org; Wed, 27 Jan 2016 03:30:28 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:26038) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOLUd-0006CA-DG for qemu-devel@nongnu.org; Wed, 27 Jan 2016 03:30:23 -0500 From: zhanghailiang Date: Wed, 27 Jan 2016 16:29:37 +0800 Message-ID: <1453883380-10532-3-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1453883380-10532-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1453883380-10532-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH RFC v2 2/5] vl: Make object_create() public List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zhanghailiang , zhangchen.fnst@cn.fujitsu.com, jasowang@redhat.com, Paolo Bonzini , hongyang.yang@easystack.cn Make the helper object_create() public and fix its first parameter to accept NULL value. Signed-off-by: zhanghailiang Cc: Paolo Bonzini --- v2: - New patch --- include/qemu-common.h | 2 ++ vl.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 22b010c..52cf4fd 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -500,4 +500,6 @@ int parse_debug_env(const char *name, int max, int initial); const char *qemu_ether_ntoa(const MACAddr *mac); void page_size_init(void); +int object_create(void *opaque, QemuOpts *opts, Error **errp); + #endif diff --git a/vl.c b/vl.c index f043009..b21335e 100644 --- a/vl.c +++ b/vl.c @@ -2819,7 +2819,7 @@ static bool object_create_delayed(const char *type) } -static int object_create(void *opaque, QemuOpts *opts, Error **errp) +int object_create(void *opaque, QemuOpts *opts, Error **errp) { Error *err = NULL; char *type = NULL; @@ -2842,7 +2842,7 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp) if (err) { goto out; } - if (!type_predicate(type)) { + if (type_predicate && !type_predicate(type)) { goto out; } -- 1.8.3.1