From patchwork Fri Nov 23 07:47:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 201253 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 B84032C0091 for ; Fri, 23 Nov 2012 19:15:33 +1100 (EST) Received: from localhost ([::1]:41240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbo1C-0006fq-Mp for incoming@patchwork.ozlabs.org; Fri, 23 Nov 2012 02:49:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbo0F-0004hn-JG for qemu-devel@nongnu.org; Fri, 23 Nov 2012 02:48:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tbo09-0001vC-K4 for qemu-devel@nongnu.org; Fri, 23 Nov 2012 02:48:47 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:33630) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbo09-0001rA-FK for qemu-devel@nongnu.org; Fri, 23 Nov 2012 02:48:41 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so2761118iej.4 for ; Thu, 22 Nov 2012 23:48:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=PlCX47ka0FMcJ26+ffcKXtkYrQLrwmXHBVl8tKMJSS4=; b=znZtPRBaZh+0INiDfrs8xl4sRrAgIJj95kVqEr0ltifswmnu1dfVnm7DOB5OysjoeA Vedyr+J3c+gaA8wcx6a+myMOzLmf1qy6VQGToW3Isbs5nVe1cCDTaRctiscJd/A9mvmu Z8nWfkVNq6QmjYzUXh0yvIon0Cb+xLOYMdM3p0dnc76USakMwUzNPYwoE2ga1RKK8f3H JM7T+uEEysmpXxWY3E/wg6/LZj4/+dGEPV+8c+NkAZBdPqxqD+1+1HhpBuDcsJSalV2I qOFDav2lXvHpmg1PKsVn6w90V7TRia6m/ZSRwCzn7cUMhi2cbF8sp5ynMbEh0Bx7QTSq Djsw== Received: by 10.50.89.162 with SMTP id bp2mr2840638igb.7.1353656921136; Thu, 22 Nov 2012 23:48:41 -0800 (PST) Received: from localhost.localdomain ([202.108.130.194]) by mx.google.com with ESMTPS id az6sm3859043igb.11.2012.11.22.23.48.38 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 23:48:40 -0800 (PST) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Fri, 23 Nov 2012 15:47:43 +0800 Message-Id: <1353656865-20910-9-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1353656865-20910-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1353656865-20910-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.223.173 Cc: kwolf@redhat.com, Dong Xu Wang Subject: [Qemu-devel] [PATCH V6 08/10] 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. v5->v6): 1) allocate enough space in append_opts_list function. Signed-off-by: Dong Xu Wang --- qemu-option.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-option.h | 4 ++ 2 files changed, 94 insertions(+), 0 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index e0628da..63f3474 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -1145,3 +1145,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 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 + 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_print_str = + g_strdup(first->desc[i].def_print_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_print_str = + g_strdup(second->desc[i].def_print_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_print_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++; + } +} diff --git a/qemu-option.h b/qemu-option.h index ab02023..091a2f2 100644 --- a/qemu-option.h +++ b/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