[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V17 3/9] qemu-option: create four QemuOptsList relat
From: |
Dong Xu Wang |
Subject: |
[Qemu-devel] [PATCH V17 3/9] qemu-option: create four QemuOptsList related functions |
Date: |
Wed, 17 Jul 2013 17:29:42 +0800 |
This patch creates 4 functions, count_opts_list, qemu_opts_append,
qemu_opts_free and qemu_opts_print_help, they are used in following
commits.
Signed-off-by: Dong Xu Wang <address@hidden>
---
v16->v17:
1) fix indentation.
2) fix typo.
v15->v16:
1) discard double-initialization.
2) use pointer directly, not g_strdup.
v12->v13:
1) simply assert that neither argument has merge_lists set.
2) drop superfluous paranthesesis around p == first.
v11->v12:
1) renmae functions.
2) fix loop styles and code styles.
3) qemu_opts_apend will not return NULL now.
4) merge_lists value is from arguments in qemu_opts_append.
v6->v7:
1) Fix typo.
v5->v6:
1) allocate enough space in append_opts_list function.
include/qemu/option.h | 3 +++
util/qemu-option.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index 0207209..7473e2b 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -155,4 +155,7 @@ int qemu_opts_print(QemuOpts *opts);
int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void
*opaque,
int abort_on_failure);
+QemuOptsList *qemu_opts_append(QemuOptsList *first, QemuOptsList *second);
+void qemu_opts_free(QemuOptsList *list);
+void qemu_opts_print_help(QemuOptsList *list);
#endif
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 86cc64e..3a055a7 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -1176,3 +1176,76 @@ int qemu_opts_foreach(QemuOptsList *list,
qemu_opts_loopfunc func, void *opaque,
loc_pop(&loc);
return rc;
}
+
+static size_t count_opts_list(QemuOptsList *list)
+{
+ size_t i;
+
+ for (i = 0; list && list->desc[i].name; i++) {
+ ;
+ }
+
+ return i;
+}
+
+/* Create a new QemuOptsList with a desc of the merge of the first
+ * and second. It will allocate space for one new QemuOptsList plus
+ * enough space for QemuOptDesc in first and second QemuOptsList.
+ * First argument's QemuOptDesc members take precedence over second's.
+ * The result's name and implied_opt_name are not copied from them.
+ * Both merge_lists should not be set. Both lists can be NULL.
+ */
+QemuOptsList *qemu_opts_append(QemuOptsList *first,
+ QemuOptsList *second)
+{
+ size_t num_first_opts, num_second_opts;
+ QemuOptsList *dest = NULL;
+ int i;
+ int index = 0;
+ QemuOptsList *p = first;
+
+ num_first_opts = count_opts_list(first);
+ num_second_opts = count_opts_list(second);
+
+ dest = g_malloc0(sizeof(QemuOptsList)
+ + (num_first_opts + num_second_opts + 1) * sizeof(QemuOptDesc));
+
+ dest->name = "append_opts_list";
+ dest->implied_opt_name = NULL;
+ assert((!first || !first->merge_lists)
+ && (!second || !second->merge_lists));
+ QTAILQ_INIT(&dest->head);
+
+ for (i = 0; p && p->desc[i].name; i++) {
+ if (!find_desc_by_name(dest->desc, p->desc[i].name)) {
+ dest->desc[index].name = p->desc[i].name;
+ dest->desc[index].help = p->desc[i].help;
+ dest->desc[index].type = p->desc[i].type;
+ dest->desc[index].def_value_str = p->desc[i].def_value_str;
+ index++;
+ }
+ if (p == first && p && !p->desc[i].name) {
+ p = second;
+ i = 0;
+ }
+ }
+ dest->desc[index].name = NULL;
+ return dest;
+}
+
+/* free a QemuOptsList, can accept NULL as arguments */
+void qemu_opts_free(QemuOptsList *list)
+{
+ g_free(list);
+}
+
+void qemu_opts_print_help(QemuOptsList *list)
+{
+ int i;
+ printf("Supported options:\n");
+ for (i = 0; list && list->desc[i].name; i++) {
+ printf("%-16s %s\n", list->desc[i].name,
+ list->desc[i].help ?
+ list->desc[i].help : "No description available");
+ }
+}
--
1.7.11.7
- [Qemu-devel] [PATCH V17 0/9] replace QEMUOptionParameter with QemuOpts parser, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 1/9] qemu-option: add def_value_str in QemuOptDesc struct and rewrite qemu_opts_print, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 3/9] qemu-option: create four QemuOptsList related functions,
Dong Xu Wang <=
- [Qemu-devel] [PATCH V17 9/9] qemu-option: use qemu_opts_del without judging NULL, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 4/9] qemu-option: create some QemuOpts functons, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 7/9] qemu-option: remove QEMUOptionParameter related functions and struct, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 8/9] qemu-option: make qemu_opts_del accept opts being NULL, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 5/9] block: use QemuOpts support in block layer, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 2/9] qemu-option: avoid duplication of default value in QemuOpts, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 6/9] qapi: query-command-line-options outputs def_value_str, Dong Xu Wang, 2013/07/17