From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwV3H-00040T-K0 for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:26:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwV3C-0001tA-8V for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:26:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwV3B-0001su-PU for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:26:10 -0400 From: Stefan Hajnoczi Date: Mon, 16 Jun 2014 19:23:40 +0800 Message-Id: <1402917843-6459-17-git-send-email-stefanha@redhat.com> In-Reply-To: <1402917843-6459-1-git-send-email-stefanha@redhat.com> References: <1402917843-6459-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 16/39] QemuOpts: add qemu_opts_append to replace append_option_parameters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Chunyan Liu , Stefan Hajnoczi From: Chunyan Liu For later merge .create_opts of drv and proto_drv in qemu-img commands. Reviewed-by: Stefan Hajnoczi Reviewed-by: Eric Blake Reviewed-by: Leandro Dorileo Signed-off-by: Chunyan Liu Signed-off-by: Stefan Hajnoczi --- 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 3c5484b..6acfb0e 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -1499,3 +1499,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.9.3