From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vqily-0003xu-GT for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vqilq-0007Oc-2y for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:14 -0500 Received: from mail-qa0-x230.google.com ([2607:f8b0:400d:c00::230]:49305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vqilp-0007O5-Vi for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:06 -0500 Received: by mail-qa0-f48.google.com with SMTP id w5so517712qac.0 for ; Wed, 11 Dec 2013 04:20:05 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 11 Dec 2013 13:19:14 +0100 Message-Id: <1386764361-15260-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1386764361-15260-1-git-send-email-pbonzini@redhat.com> References: <1386764361-15260-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [RFC PATCH 07/14] QemuOpts: introduce qemu_find_opts_singleton List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, gaowanlong@cn.fujitsu.com, stefanha@redhat.com Signed-off-by: Paolo Bonzini --- include/qemu/config-file.h | 2 ++ util/qemu-config.c | 14 ++++++++++++++ vl.c | 11 +---------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index 508428f..699c3a1 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -7,6 +7,8 @@ QemuOptsList *qemu_find_opts(const char *group); QemuOptsList *qemu_find_opts_err(const char *group, Error **errp); +QemuOpts *qemu_find_opts_singleton(const char *group); + void qemu_add_opts(QemuOptsList *list); void qemu_add_drive_opts(QemuOptsList *list); int qemu_set_option(const char *str); diff --git a/util/qemu-config.c b/util/qemu-config.c index 04da942..c6ac589 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -39,6 +39,20 @@ QemuOptsList *qemu_find_opts(const char *group) return ret; } +QemuOpts *qemu_find_opts_singleton(const char *group) +{ + QemuOptsList *list; + QemuOpts *opts; + + list = qemu_find_opts(group); + assert(list); + opts = qemu_opts_find(list, NULL); + if (!opts) { + opts = qemu_opts_create_nofail(list); + } + return opts; +} + static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc) { CommandLineParameterInfoList *param_list = NULL, *entry; diff --git a/vl.c b/vl.c index 95181e0..ecda5ad 100644 --- a/vl.c +++ b/vl.c @@ -537,16 +537,7 @@ static QemuOptsList qemu_msg_opts = { */ QemuOpts *qemu_get_machine_opts(void) { - QemuOptsList *list; - QemuOpts *opts; - - list = qemu_find_opts("machine"); - assert(list); - opts = qemu_opts_find(list, NULL); - if (!opts) { - opts = qemu_opts_create_nofail(list); - } - return opts; + return qemu_find_opts_singleton("machine"); } const char *qemu_get_vm_name(void) -- 1.8.4.2