From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW4JJ-0000AE-RW for qemu-devel@nongnu.org; Fri, 04 Apr 2014 09:37:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WW4JE-0005p2-Sd for qemu-devel@nongnu.org; Fri, 04 Apr 2014 09:37:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW4JE-0005ow-KG for qemu-devel@nongnu.org; Fri, 04 Apr 2014 09:37:28 -0400 From: Igor Mammedov Date: Fri, 4 Apr 2014 15:36:26 +0200 Message-Id: <1396618620-27823-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1396618620-27823-1-git-send-email-imammedo@redhat.com> References: <1396618620-27823-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 01/35] qemu-option: introduce qemu_find_opts_singleton List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mst@redhat.com, aik@ozlabs.ru, hutao@cn.fujitsu.com, mjt@tls.msk.ru, lcapitulino@redhat.com, kraxel@redhat.com, akong@redhat.com, quintela@redhat.com, armbru@redhat.com, aliguori@amazon.com, jan.kiszka@siemens.com, lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com, stefanha@redhat.com, chegu_vinod@hp.com, rth@twiddle.net, kwolf@redhat.com, s.priebe@profihost.ag, mreitz@redhat.com, vasilis.liaskovitis@profitbricks.com, pbonzini@redhat.com, afaerber@suse.de From: Paolo Bonzini Reviewed-by: Laszlo Ersek Reviewed-by: Andreas F=C3=A4rber 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 @@ =20 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 f610101..60051df 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -39,6 +39,20 @@ QemuOptsList *qemu_find_opts(const char *group) return ret; } =20 +QemuOpts *qemu_find_opts_singleton(const char *group) +{ + QemuOptsList *list; + QemuOpts *opts; + + list =3D qemu_find_opts(group); + assert(list); + opts =3D qemu_opts_find(list, NULL); + if (!opts) { + opts =3D qemu_opts_create(list, NULL, 0, &error_abort); + } + return opts; +} + static CommandLineParameterInfoList *query_option_descs(const QemuOptDes= c *desc) { CommandLineParameterInfoList *param_list =3D NULL, *entry; diff --git a/vl.c b/vl.c index 9975e5a..1dd6319 100644 --- a/vl.c +++ b/vl.c @@ -517,16 +517,7 @@ static QemuOptsList qemu_name_opts =3D { */ QemuOpts *qemu_get_machine_opts(void) { - QemuOptsList *list; - QemuOpts *opts; - - list =3D qemu_find_opts("machine"); - assert(list); - opts =3D qemu_opts_find(list, NULL); - if (!opts) { - opts =3D qemu_opts_create(list, NULL, 0, &error_abort); - } - return opts; + return qemu_find_opts_singleton("machine"); } =20 const char *qemu_get_vm_name(void) --=20 1.9.0