From patchwork Wed Apr 10 06:25:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 235302 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 651002C00C8 for ; Wed, 10 Apr 2013 16:27:40 +1000 (EST) Received: from localhost ([::1]:53269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPoVO-0006zM-Hq for incoming@patchwork.ozlabs.org; Wed, 10 Apr 2013 02:27:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPoTs-0004o6-TV for qemu-devel@nongnu.org; Wed, 10 Apr 2013 02:26:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPoTr-0008R3-Dy for qemu-devel@nongnu.org; Wed, 10 Apr 2013 02:26:04 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:37149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPoTq-0008Qt-Sl for qemu-devel@nongnu.org; Wed, 10 Apr 2013 02:26:03 -0400 Received: by mail-pd0-f176.google.com with SMTP id r11so87018pdi.7 for ; Tue, 09 Apr 2013 23:26:02 -0700 (PDT) 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=U7/Y5qL24Yb8SexCL0GiTOH3K6FC5DnfCPYXVPnBkIU=; b=XcXLKamWDse3i31laNOHfuq/mOWK6glWUcNkrxrK6qQSPDVZVW28Y0aeiuv2P5DMl3 EVKU8+4jWDRAGvtbnNdLjNBKJFMyefo2sPtnz8HCbM8dZ1aCCun3+dcpAJ+Cvz5GMcnY C0lK86wBSBM3+QDRUTRPO5ZBY6GsPeBfp5uQej+8vc42dthfsyFR78kNpFusodWGJskd o2YDxLN1seJJMwGQIMfduJ28GuyC2RXpWppC6BPEKrPMUL0/YcXSRuaZUx1RGir5c1MS NEiz7R7aLIUVWoZcgMVjuj7mMxsGWLxq04zCjOgcEoavv7OArQMVvIGthgtN6lwwfTug EKtg== X-Received: by 10.68.209.193 with SMTP id mo1mr942770pbc.191.1365575162179; Tue, 09 Apr 2013 23:26:02 -0700 (PDT) Received: from localhost.localdomain ([202.108.130.138]) by mx.google.com with ESMTPS id fq1sm5192926pbb.33.2013.04.09.23.25.54 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Apr 2013 23:26:01 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Wed, 10 Apr 2013 14:25:08 +0800 Message-Id: <1365575111-4476-4-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1365575111-4476-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1365575111-4476-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.192.176 Cc: kwolf@redhat.com, Dong Xu Wang , wdongxu@cn.ibm.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH V13 3/6] Create four QemuOptsList 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, qemu_opts_append, qemu_opts_free and qemu_opts_print_help, they will be used in following commits. Signed-off-by: Dong Xu Wang --- v12->v13: 1) simply assert that neither argument has merge_lists set. 2) drop superfluous paranthesesis around p == first. v11->v12: 1) renmae functions. 2) fix loop styles and code styles. 3) qemu_opts_apend will not return NULL now. 4) merge_lists value is from arguments in qemu_opts_append. v6->v7: 1) Fix typo. v5->v6: 1) allocate enough space in append_opts_list function. include/qemu/option.h | 3 ++ util/qemu-option.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/include/qemu/option.h b/include/qemu/option.h index b928ab0..c7a5c14 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -157,4 +157,7 @@ int qemu_opts_print(QemuOpts *opts); int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque, int abort_on_failure); +QemuOptsList *qemu_opts_append(QemuOptsList *first, QemuOptsList *second); +void qemu_opts_free(QemuOptsList *list); +void qemu_opts_print_help(QemuOptsList *list); #endif diff --git a/util/qemu-option.c b/util/qemu-option.c index 4f94000..0488c27 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -1209,3 +1209,85 @@ 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; + + for (i = 0; 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. + * The result's name and implied_opt_name are not copied from them. + * Both merge_lists should not be set. Both list can be NULL. + */ +QemuOptsList *qemu_opts_append(QemuOptsList *first, + QemuOptsList *second) +{ + size_t num_first_opts, num_second_opts; + QemuOptsList *dest = NULL; + int i = 0; + int index = 0; + QemuOptsList *p = first; + + num_first_opts = count_opts_list(first); + num_second_opts = count_opts_list(second); + + dest = g_malloc0(sizeof(QemuOptsList) + + (num_first_opts + num_second_opts + 1) * sizeof(QemuOptDesc)); + + dest->name = "append_opts_list"; + dest->implied_opt_name = NULL; + assert((!first || !first->merge_lists) + && (!second || !second->merge_lists)); + QTAILQ_INIT(&dest->head); + + for (i = 0; p && p->desc[i].name; i++) { + if (!find_desc_by_name(dest->desc, p->desc[i].name)) { + dest->desc[index].name = g_strdup(p->desc[i].name); + dest->desc[index].help = g_strdup(p->desc[i].help); + dest->desc[index].type = p->desc[i].type; + dest->desc[index].def_value_str = + g_strdup(p->desc[i].def_value_str); + index++; + } + if (p == first && p && !p->desc[i].name) { + p = second; + i = 0; + } + } + dest->desc[index].name = NULL; + return dest; +} + +/* free a QemuOptsList, can accept NULL as arguments */ +void qemu_opts_free(QemuOptsList *list) +{ + int i = 0; + + for (i = 0; list && list->desc[i].name; i++) { + g_free((char *)list->desc[i].name); + g_free((char *)list->desc[i].help); + g_free((char *)list->desc[i].def_value_str); + } + + g_free(list); +} + +void qemu_opts_print_help(QemuOptsList *list) +{ + int i = 0; + printf("Supported options:\n"); + for (i = 0; list && list->desc[i].name; i++) { + printf("%-16s %s\n", list->desc[i].name, + list->desc[i].help ? + list->desc[i].help : "No description available"); + } +}