From patchwork Mon Jan 7 05:26:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 209857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 06F092C007E for ; Mon, 7 Jan 2013 16:27:25 +1100 (EST) Received: from localhost ([::1]:36286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ts5F4-0001Wf-TH for incoming@patchwork.ozlabs.org; Mon, 07 Jan 2013 00:27:22 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ts5Ei-0001Fl-7L for qemu-devel@nongnu.org; Mon, 07 Jan 2013 00:27:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ts5Eg-0001bd-PS for qemu-devel@nongnu.org; Mon, 07 Jan 2013 00:26:59 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:57787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ts5Eg-0001bS-Hf for qemu-devel@nongnu.org; Mon, 07 Jan 2013 00:26:58 -0500 Received: by mail-pa0-f54.google.com with SMTP id bi5so10542117pad.41 for ; Sun, 06 Jan 2013 21:26:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=LYYKn52nIHEsNy6ysW5OXWQJ5P9zb6PiPs1B/J/jsaA=; b=QKC453Q8m0OeXPnZ4VmU4Tzk5/9D0MvM6YMwEXdGX0wnS2CSrdz8BvtnGe8V64JcP+ GZdhEEXdJqm0s78w4iK4Kzj5P1IYQ+3E2KpLn4+M4DXMLDQcpIkuBXAp9bpbYYWVIwsF 1UyLc8DiCPEtF2fvGq2UzWgTPn4rG/yUal5FaAz7Wq5K9IuRQ+aIZaDQbcOk4py+SeOg LWoOt05XzoJJXrsoq7z55FxDxrn7ZjCXe6JUMpJ1mrwXSpQ1VQT1/p5TrVkyR12jvzpf 9Dyza+sIxcYIeLK4szRAmT6x5e6bE+IuUbE3qfNa8VtrRYTHnnvXcrbGylMa/KGWdnqI gepQ== X-Received: by 10.69.0.8 with SMTP id au8mr185116680pbd.58.1357536417815; Sun, 06 Jan 2013 21:26:57 -0800 (PST) Received: from localhost.localdomain ([202.108.130.194]) by mx.google.com with ESMTPS id x6sm38033607pav.29.2013.01.06.21.26.53 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 06 Jan 2013 21:26:56 -0800 (PST) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2013 13:26:21 +0800 Message-Id: <1357536383-7299-3-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1357536383-7299-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1357536383-7299-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.54 Cc: kwolf@redhat.com, Dong Xu Wang , stefanha@redhat.com Subject: [Qemu-devel] [PATCH V10 2/4] Create four opts list related functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- v6->v7): 1) Fix typo. v5->v6): 1) allocate enough space in append_opts_list function. include/qemu/option.h | 4 ++ qemu-option.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 0 deletions(-) diff --git a/include/qemu/option.h b/include/qemu/option.h index 394170a..f784c2e 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -156,4 +156,8 @@ 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 diff --git a/qemu-option.c b/qemu-option.c index 6f19fd3..227daa9 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -1149,3 +1149,93 @@ 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 enough 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 + 1) * 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_str = + g_strdup(first->desc[i].def_value_str); + ++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_str = + g_strdup(second->desc[i].def_value_str); + ++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); + g_free((char *)list->desc[i].def_value_str); + 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++; + } +}