From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WBKDs-0004aJ-IT for qemu-devel@nongnu.org; Thu, 06 Feb 2014 03:22:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WBKDm-0008Qt-IN for qemu-devel@nongnu.org; Thu, 06 Feb 2014 03:22:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WBKDm-0008Q0-90 for qemu-devel@nongnu.org; Thu, 06 Feb 2014 03:22:06 -0500 From: Igor Mammedov Date: Thu, 6 Feb 2014 09:16:03 +0100 Message-Id: <1391674564-3783-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1391674564-3783-1-git-send-email-imammedo@redhat.com> References: <1391674564-3783-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] QemuOpts: introduce qemu_find_opts_singleton List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@amazon.com, mjt@tls.msk.ru, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, akong@redhat.com From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Igor Mammedov --- 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 dbd97c4..d4ba20e 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -8,6 +8,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 9298f55..9dfacbc 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(list, NULL, 0, &error_abort); + } + return opts; +} + static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc) { CommandLineParameterInfoList *param_list = NULL, *entry; diff --git a/vl.c b/vl.c index 383be1b..7f2595c 100644 --- a/vl.c +++ b/vl.c @@ -539,16 +539,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(list, NULL, 0, &error_abort); - } - return opts; + return qemu_find_opts_singleton("machine"); } const char *qemu_get_vm_name(void) -- 1.7.1