From patchwork Thu Oct 25 12:57:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 194169 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 CEF742C00BF for ; Fri, 26 Oct 2012 01:11:30 +1100 (EST) Received: from localhost ([::1]:38883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRO9g-0005EN-QA for incoming@patchwork.ozlabs.org; Thu, 25 Oct 2012 10:11:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRN14-0007U2-E2 for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:58:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRN0y-0005R7-09 for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:58:30 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:55027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRN0x-0005GV-S8 for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:58:23 -0400 Received: by mail-oa0-f45.google.com with SMTP id i18so1476486oag.4 for ; Thu, 25 Oct 2012 05:58:23 -0700 (PDT) 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=p/6XeDJVhuxri4j9iKVMuIivC1bPmTIFxFjlHV12UgM=; b=QQ0xFpihTBYZaGRtUyUFukUTr63GhZ+9sHktv+E0t3K1+uQRARSrwvUdTHYHGu9CLm 9mdl44hbxcqVNcAopTdue1XmKuQAHeELJMVazPYjVCCC8Oo07WTgfpUeqPRSRosJKx84 pMBaSkbKv7MQx22LfccxJfW3cA0IpQSt52XBI7IiIAVpoamHVJqYrfYtlCi2agan3FiW kjmyBwfozeiQ1lyTh40o9Yg5Jw+q9ebJqiHoblOcxreaEJAVHFXqe8WCC6xu+dit4V1d caLyG5MQ92Enguwix30/GcSmNqzoXnbaTdl5dgtHbGeyWhIJb+SNOL/EbmolwMDmCSwN HfDA== Received: by 10.60.170.75 with SMTP id ak11mr16746869oec.90.1351169903375; Thu, 25 Oct 2012 05:58:23 -0700 (PDT) Received: from localhost.localdomain ([202.108.130.138]) by mx.google.com with ESMTPS id k9sm6019404oeg.6.2012.10.25.05.58.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 05:58:22 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2012 20:57:26 +0800 Message-Id: <1351169848-28223-9-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1351169848-28223-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1351169848-28223-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.219.45 Cc: kwolf@redhat.com, Dong Xu Wang Subject: [Qemu-devel] [PATCH V4 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. Signed-off-by: Dong Xu Wang --- qemu-option.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-option.h | 5 ++- 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 54dbdd0..ab270f0 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -1153,3 +1153,90 @@ 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) * 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 = first->desc[i].def_value; + ++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 = second->desc[i].def_value; + ++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); + 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 9ea59cf..d1825ee 100644 --- a/qemu-option.h +++ b/qemu-option.h @@ -155,5 +155,8 @@ typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque); 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