From: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH V4 08/10] Create four opts list related functions
Date: Thu, 25 Oct 2012 20:57:26 +0800 [thread overview]
Message-ID: <1351169848-28223-9-git-send-email-wdongxu@linux.vnet.ibm.com> (raw)
In-Reply-To: <1351169848-28223-1-git-send-email-wdongxu@linux.vnet.ibm.com>
This patch will create 4 functions, count_opts_list, append_opts_list,
free_opts_list and print_opts_list, they will used in following commits.
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
---
qemu-option.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
qemu-option.h | 5 ++-
2 files changed, 91 insertions(+), 1 deletions(-)
diff --git a/qemu-option.c b/qemu-option.c
index 54dbdd0..ab270f0 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -1153,3 +1153,90 @@ 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 = 0;
+
+ while (list && list->desc[i].name) {
+ i++;
+ }
+
+ return i;
+}
+
+/* Create a new QemuOptsList and make its desc to the merge of first and second.
+ * It will allocate space for one new QemuOptsList plus enouth space for
+ * QemuOptDesc in first and second QemuOptsList. First argument's QemuOptDesc
+ * members take precedence over second's.
+ */
+QemuOptsList *append_opts_list(QemuOptsList *first,
+ QemuOptsList *second)
+{
+ size_t num_first_options, num_second_options;
+ QemuOptsList *dest = NULL;
+ int i = 0;
+ int index = 0;
+
+ num_first_options = count_opts_list(first);
+ num_second_options = count_opts_list(second);
+ if (num_first_options + num_second_options == 0) {
+ return NULL;
+ }
+
+ dest = g_malloc0(sizeof(QemuOptsList)
+ + (num_first_options + num_second_options) * sizeof(QemuOptDesc));
+
+ dest->name = "append_opts_list";
+ dest->implied_opt_name = NULL;
+ dest->merge_lists = false;
+ QTAILQ_INIT(&dest->head);
+ while (first && (first->desc[i].name)) {
+ if (!find_desc_by_name(dest->desc, first->desc[i].name)) {
+ dest->desc[index].name = g_strdup(first->desc[i].name);
+ dest->desc[index].help = g_strdup(first->desc[i].help);
+ dest->desc[index].type = first->desc[i].type;
+ dest->desc[index].def_value = first->desc[i].def_value;
+ ++index;
+ }
+ i++;
+ }
+ i = 0;
+ while (second && (second->desc[i].name)) {
+ if (!find_desc_by_name(dest->desc, second->desc[i].name)) {
+ dest->desc[index].name = g_strdup(first->desc[i].name);
+ dest->desc[index].help = g_strdup(first->desc[i].help);
+ dest->desc[index].type = second->desc[i].type;
+ dest->desc[index].def_value = second->desc[i].def_value;
+ ++index;
+ }
+ i++;
+ }
+ dest->desc[index].name = NULL;
+ return dest;
+}
+
+void free_opts_list(QemuOptsList *list)
+{
+ int i = 0;
+
+ while (list && list->desc[i].name) {
+ g_free((char *)list->desc[i].name);
+ g_free((char *)list->desc[i].help);
+ i++;
+ }
+
+ g_free(list);
+}
+
+void print_opts_list(QemuOptsList *list)
+{
+ int i = 0;
+ printf("Supported options:\n");
+ while (list && list->desc[i].name) {
+ printf("%-16s %s\n", list->desc[i].name,
+ list->desc[i].help ?
+ list->desc[i].help : "No description available");
+ i++;
+ }
+}
diff --git a/qemu-option.h b/qemu-option.h
index 9ea59cf..d1825ee 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -155,5 +155,8 @@ typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque);
int qemu_opts_print(QemuOpts *opts, void *dummy);
int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque,
int abort_on_failure);
-
+QemuOptsList *append_opts_list(QemuOptsList *dest,
+ QemuOptsList *list);
+void free_opts_list(QemuOptsList *list);
+void print_opts_list(QemuOptsList *list);
#endif
--
1.7.1
next prev parent reply other threads:[~2012-10-25 12:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 12:57 [Qemu-devel] [PATCH V4 00/10] replace QEMUOptionParameter with QemuOpts parser Dong Xu Wang
2012-10-25 12:57 ` [Qemu-devel] [PATCH V4 01/10] qemu-option: opt_set(): split it up into more functions Dong Xu Wang
2012-10-25 12:57 ` [Qemu-devel] [PATCH V4 02/10] qemu-option: qemu_opts_validate(): fix duplicated code Dong Xu Wang
2012-10-25 12:57 ` [Qemu-devel] [PATCH V4 03/10] qemu-option: qemu_opt_set_bool(): fix code duplication Dong Xu Wang
2012-10-25 12:57 ` [Qemu-devel] [PATCH V4 04/10] introduce qemu_opts_create_nofail function Dong Xu Wang
2012-10-25 13:06 ` Peter Maydell
2012-10-26 2:46 ` Dong Xu Wang
2012-10-25 12:57 ` [Qemu-devel] [PATCH V4 05/10] use qemu_opts_create_nofail Dong Xu Wang
2012-10-25 12:57 ` [Qemu-devel] [PATCH V4 06/10] create new function: qemu_opt_set_number Dong Xu Wang
2012-10-26 9:02 ` Stefan Hajnoczi
2012-10-29 8:03 ` Dong Xu Wang
2012-10-25 12:57 ` [Qemu-devel] [PATCH V4 07/10] add def_value and use it in qemu_opts_print Dong Xu Wang
2012-10-26 9:32 ` Stefan Hajnoczi
2012-10-25 12:57 ` Dong Xu Wang [this message]
2012-10-25 12:57 ` [Qemu-devel] [PATCH V4 09/10] Use QemuOpts support in block layer Dong Xu Wang
2012-10-26 9:51 ` Stefan Hajnoczi
2012-10-25 12:57 ` [Qemu-devel] [PATCH V4 10/10] remove QEMUOptionParameter related functions and struct Dong Xu Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351169848-28223-9-git-send-email-wdongxu@linux.vnet.ibm.com \
--to=wdongxu@linux.vnet.ibm.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).