[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2.1 07/28] qemu-option: introduce qemu_find_opts_sin
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 2.1 07/28] qemu-option: introduce qemu_find_opts_singleton |
Date: |
Tue, 4 Mar 2014 15:00:35 +0100 |
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 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;
}
+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 899b63f..dafe6f6 100644
--- a/vl.c
+++ b/vl.c
@@ -485,16 +485,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.8.5.3
- [Qemu-devel] [PATCH 2.1 00/28] Current state of NUMA series, and hostmem improvements, Paolo Bonzini, 2014/03/04
- [Qemu-devel] [PATCH 2.1 01/28] NUMA: move numa related code to new file numa.c, Paolo Bonzini, 2014/03/04
- [Qemu-devel] [PATCH 2.1 02/28] NUMA: check if the total numa memory size is equal to ram_size, Paolo Bonzini, 2014/03/04
- [Qemu-devel] [PATCH 2.1 03/28] NUMA: Add numa_info structure to contain numa nodes info, Paolo Bonzini, 2014/03/04
- [Qemu-devel] [PATCH 2.1 04/28] NUMA: convert -numa option to use OptsVisitor, Paolo Bonzini, 2014/03/04
- [Qemu-devel] [PATCH 2.1 05/28] NUMA: expand MAX_NODES from 64 to 128, Paolo Bonzini, 2014/03/04
- [Qemu-devel] [PATCH 2.1 06/28] man: improve -numa doc, Paolo Bonzini, 2014/03/04
- [Qemu-devel] [PATCH 2.1 07/28] qemu-option: introduce qemu_find_opts_singleton,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 2.1 08/28] vl: convert -m to QemuOpts, Paolo Bonzini, 2014/03/04
- [Qemu-devel] [PATCH 2.1 09/28] vl: redo -object parsing, Paolo Bonzini, 2014/03/04