[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v27 10/33] QemuOpts: add qemu_opts_append to replace
From: |
Chunyan Liu |
Subject: |
[Qemu-devel] [PATCH v27 10/33] QemuOpts: add qemu_opts_append to replace append_option_parameters |
Date: |
Wed, 7 May 2014 17:54:13 +0800 |
For later merge .create_opts of drv and proto_drv in qemu-img commands.
Signed-off-by: Chunyan Liu <address@hidden>
---
Changes:
* fix memory free:
if (param) {
- g_free(list);
+ qemu_opts_free(list); //free allocated memory too
}
include/qemu/option.h | 5 ++++
util/qemu-option.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index e98e8ef..44d9961 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -176,5 +176,10 @@ void qemu_opts_print_help(QemuOptsList *list);
void qemu_opts_free(QemuOptsList *list);
QEMUOptionParameter *opts_to_params(QemuOpts *opts);
QemuOptsList *params_to_opts(QEMUOptionParameter *list);
+/* FIXME: will remove QEMUOptionParameter after all drivers switch to QemuOpts.
+ */
+QemuOptsList *qemu_opts_append(QemuOptsList *dst,
+ QemuOptsList *list,
+ QEMUOptionParameter *param);
#endif
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 93ffcd5..e15723a 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -1498,3 +1498,70 @@ void qemu_opts_free(QemuOptsList *list)
g_free(list);
}
+
+/* Realloc dst option list and append options either from an option list (list)
+ * or a QEMUOptionParameter (param) to it. dst could be NULL or a malloced
list.
+ * FIXME: will remove QEMUOptionParameter after all drivers switch to QemuOpts.
+ */
+QemuOptsList *qemu_opts_append(QemuOptsList *dst,
+ QemuOptsList *list,
+ QEMUOptionParameter *param)
+{
+ size_t num_opts, num_dst_opts;
+ QemuOptDesc *desc;
+ bool need_init = false;
+
+ assert(!(list && param));
+ if (!param && !list) {
+ return dst;
+ }
+
+ if (param) {
+ list = params_to_opts(param);
+ }
+
+ /* If dst is NULL, after realloc, some area of dst should be initialized
+ * before adding options to it.
+ */
+ if (!dst) {
+ need_init = true;
+ }
+
+ num_opts = count_opts_list(dst);
+ num_dst_opts = num_opts;
+ num_opts += count_opts_list(list);
+ dst = g_realloc(dst, sizeof(QemuOptsList) +
+ (num_opts + 1) * sizeof(QemuOptDesc));
+ if (need_init) {
+ dst->name = NULL;
+ dst->implied_opt_name = NULL;
+ QTAILQ_INIT(&dst->head);
+ dst->allocated = true;
+ dst->merge_lists = false;
+ }
+ dst->desc[num_dst_opts].name = NULL;
+
+ /* (const char *) members of result dst are malloced, need free. */
+ assert(dst->allocated);
+ /* append list->desc to dst->desc */
+ if (list) {
+ desc = list->desc;
+ while (desc && desc->name) {
+ if (find_desc_by_name(dst->desc, desc->name) == NULL) {
+ dst->desc[num_dst_opts].name = g_strdup(desc->name);
+ dst->desc[num_dst_opts].type = desc->type;
+ dst->desc[num_dst_opts].help = g_strdup(desc->help);
+ dst->desc[num_dst_opts].def_value_str =
+ g_strdup(desc->def_value_str);
+ num_dst_opts++;
+ dst->desc[num_dst_opts].name = NULL;
+ }
+ desc++;
+ }
+ }
+
+ if (param) {
+ qemu_opts_free(list);
+ }
+ return dst;
+}
--
1.7.12.4
- [Qemu-devel] [PATCH v27 04/33] qapi: output def_value_str when query command line options, (continued)
- [Qemu-devel] [PATCH v27 04/33] qapi: output def_value_str when query command line options, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 05/33] QemuOpts: change opt->name|str from (const char *) to (char *), Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 01/33] QemuOpts: move find_desc_by_name ahead for later calling, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 02/33] QemuOpts: repurpose qemu_opts_print to replace print_option_parameters, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 03/33] QemuOpts: add def_value_str to QemuOptDesc, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 06/33] QemuOpts: move qemu_opt_del ahead for later calling, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 08/33] QemuOpts: add qemu_opts_print_help to replace print_option_help, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 07/33] QemuOpts: add qemu_opt_get_*_del functions for replace work, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 09/33] QemuOpts: add conversion between QEMUOptionParameter to QemuOpts, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 11/33] QemuOpts: check NULL input for qemu_opts_del, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 10/33] QemuOpts: add qemu_opts_append to replace append_option_parameters,
Chunyan Liu <=
- [Qemu-devel] [PATCH v27 14/33] cow.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 12/33] change block layer to support both QemuOpts and QEMUOptionParamter, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 15/33] gluster.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 16/33] iscsi.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/05/07
- [Qemu-devel] [PATCH v27 13/33] vvfat.c: handle cross_driver's create_options and create_opts, Chunyan Liu, 2014/05/07
- Re: [Qemu-devel] [PATCH v27 00/33] replace QEMUOptionParameter with QemuOpts, Chun Yan Liu, 2014/05/07
- Re: [Qemu-devel] [PATCH v27 00/33] replace QEMUOptionParameter with QemuOpts, Chun Yan Liu, 2014/05/14
- [Qemu-devel] [PATCH v27 00/33] replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/05/07