[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 07/14] QemuOpts: introduce qemu_find_opts_single
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [RFC PATCH 07/14] QemuOpts: introduce qemu_find_opts_singleton |
Date: |
Wed, 11 Dec 2013 13:19:14 +0100 |
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 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
- [Qemu-devel] [RFC PATCH 00/14] Common base for memory hotplug and NUMA policy work, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 01/14] NUMA: move numa related code to new file numa.c, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 02/14] NUMA: check if the total numa memory size is equal to ram_size, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 03/14] NUMA: Add numa_info structure to contain numa nodes info, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 04/14] NUMA: convert -numa option to use OptsVisitor, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 05/14] NUMA: expand MAX_NODES from 64 to 128, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 06/14] qapi: add SIZE type parser to string_input_visitor, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 07/14] QemuOpts: introduce qemu_find_opts_singleton,
Paolo Bonzini <=
- [Qemu-devel] [RFC PATCH 08/14] vl: convert -m to QemuOpts, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 09/14] qom: fix leak for objects created with -object, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 10/14] qom: catch errors in object_property_add_child, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 11/14] pc: pass QEMUMachineInitArgs to pc_memory_init, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 12/14] numa: introduce memory_region_allocate_system_memory, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 13/14] add memdev backend infrastructure, Paolo Bonzini, 2013/12/11
- [Qemu-devel] [RFC PATCH 14/14] numa: add -numa node, memdev= option, Paolo Bonzini, 2013/12/11