From: Chunyan Liu <cyliu@suse.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, Chunyan Liu <cyliu@suse.com>, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v21 06/25] add convert functions between QEMUOptionParameter to QemuOpts
Date: Fri, 21 Feb 2014 18:35:29 +0800 [thread overview]
Message-ID: <1392978948-27416-7-git-send-email-cyliu@suse.com> (raw)
In-Reply-To: <1392978948-27416-1-git-send-email-cyliu@suse.com>
Add two temp convert functions between QEMUOptionParameter to QemuOpts, so that
next patch can use it. It will simplify next patch for easier review.
Signed-off-by: Chunyan Liu <cyliu@suse.com>
---
changes to v20:
* fix Eric's comments:
- use g_strdup instead of strdup
include/qemu/option.h | 2 +
util/qemu-option.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 107 insertions(+), 0 deletions(-)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index 62f0432..c3e85bd 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -168,4 +168,6 @@ int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque,
QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);
void qemu_opts_free(QemuOptsList *list);
void qemu_opts_print_help(QemuOptsList *list);
+QEMUOptionParameter *opts_to_params(QemuOpts *opts);
+QemuOptsList *params_to_opts(QEMUOptionParameter *list);
#endif
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 708fafa..c78adca 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -1415,3 +1415,108 @@ void qemu_opts_print_help(QemuOptsList *list)
list->desc[i].help : "");
}
}
+
+/* convert QEMUOptionParameter to QemuOpts */
+QemuOptsList *params_to_opts(QEMUOptionParameter *list)
+{
+ QemuOptsList *opts = NULL;
+ size_t num_opts, i = 0;
+
+ if (!list) {
+ return NULL;
+ }
+
+ num_opts = count_option_parameters(list);
+ opts = g_malloc0(sizeof(QemuOptsList) +
+ (num_opts + 1) * sizeof(QemuOptDesc));
+ QTAILQ_INIT(&opts->head);
+ opts->desc[i].name = NULL;
+
+ while (list && list->name) {
+ opts->desc[i].name = g_strdup(list->name);
+ opts->desc[i].help = g_strdup(list->help);
+ switch (list->type) {
+ case OPT_FLAG:
+ opts->desc[i].type = QEMU_OPT_BOOL;
+ opts->desc[i].def_value_str = list->value.n ? "on" : "off";
+ break;
+
+ case OPT_NUMBER:
+ opts->desc[i].type = QEMU_OPT_NUMBER;
+ if (list->value.n) {
+ opts->desc[i].def_value_str =
+ g_strdup_printf("%" PRIu64, list->value.n);
+ }
+ break;
+
+ case OPT_SIZE:
+ opts->desc[i].type = QEMU_OPT_SIZE;
+ if (list->value.n) {
+ opts->desc[i].def_value_str =
+ g_strdup_printf("%" PRIu64, list->value.n);
+ }
+ break;
+
+ case OPT_STRING:
+ opts->desc[i].type = QEMU_OPT_STRING;
+ opts->desc[i].def_value_str = g_strdup(list->value.s);
+ break;
+ }
+
+ i++;
+ list++;
+ opts->desc[i].name = NULL;
+ }
+
+ return opts;
+}
+
+QEMUOptionParameter *opts_to_params(QemuOpts *opts)
+{
+ QEMUOptionParameter *dest = NULL;
+ QemuOptDesc *desc;
+ size_t num_opts, i = 0;
+ const char *tmp;
+
+ if (!opts || !opts->list || !opts->list->desc) {
+ return NULL;
+ }
+
+ num_opts = count_opts_list(opts->list);
+ dest = g_malloc0((num_opts + 1) * sizeof(QEMUOptionParameter));
+ dest[i].name = NULL;
+
+ desc = opts->list->desc;
+ while (desc && desc->name) {
+ dest[i].name = g_strdup(desc->name);
+ dest[i].help = g_strdup(desc->help);
+ switch (desc->type) {
+ case QEMU_OPT_STRING:
+ dest[i].type = OPT_STRING;
+ tmp = qemu_opt_get(opts, desc->name);
+ dest[i].value.s = g_strdup(tmp);
+ break;
+
+ case QEMU_OPT_BOOL:
+ dest[i].type = OPT_FLAG;
+ dest[i].value.n = qemu_opt_get_bool(opts, desc->name, 0) ? 1 : 0;
+ break;
+
+ case QEMU_OPT_NUMBER:
+ dest[i].type = OPT_NUMBER;
+ dest[i].value.n = qemu_opt_get_number(opts, desc->name, 0);
+ break;
+
+ case QEMU_OPT_SIZE:
+ dest[i].type = OPT_SIZE;
+ dest[i].value.n = qemu_opt_get_size(opts, desc->name, 0);
+ break;
+ }
+
+ i++;
+ desc++;
+ dest[i].name = NULL;
+ }
+
+ return dest;
+}
--
1.6.0.2
next prev parent reply other threads:[~2014-02-21 10:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-21 10:35 [Qemu-devel] [PATCH v21 00/25] replace QEMUOptionParameter with QemuOpts Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 01/25] add def_value_str to QemuOptDesc Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 02/25] qapi: output def_value_str when query command line options Chunyan Liu
2014-03-04 0:02 ` Eric Blake
2014-03-04 2:01 ` Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 03/25] improve some functions in qemu-option.c Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 04/25] improve assertion in qemu_opt_get functions Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 05/25] add some QemuOpts functions for replace work Chunyan Liu
2014-02-21 10:35 ` Chunyan Liu [this message]
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 07/25] change block layer to support both QemuOpts and QEMUOptionParamter Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 08/25] cow.c: replace QEMUOptionParameter with QemuOpts Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 09/25] gluster.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 10/25] iscsi.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 11/25] qcow.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 12/25] qcow2.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 13/25] qed.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 14/25] raw-posix.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 15/25] raw-win32.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 16/25] raw_bsd.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 17/25] rbd.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 18/25] sheepdog.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 19/25] ssh.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 20/25] vdi.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 21/25] vmdk.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 22/25] vpc.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 23/25] vhdx.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 24/25] vvfat.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 25/25] cleanup QEMUOptionParameter Chunyan Liu
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=1392978948-27416-7-git-send-email-cyliu@suse.com \
--to=cyliu@suse.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).