From patchwork Tue Jun 18 09:31:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 252196 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 730F02C007B for ; Tue, 18 Jun 2013 19:34:17 +1000 (EST) Received: from localhost ([::1]:55704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UosIp-0007Ix-6k for incoming@patchwork.ozlabs.org; Tue, 18 Jun 2013 05:34:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UosIF-0007Eh-Ob for qemu-devel@nongnu.org; Tue, 18 Jun 2013 05:33:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UosIA-0002B0-V3 for qemu-devel@nongnu.org; Tue, 18 Jun 2013 05:33:39 -0400 Received: from mail-ie0-x22c.google.com ([2607:f8b0:4001:c03::22c]:62331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UosIA-0002Al-OU for qemu-devel@nongnu.org; Tue, 18 Jun 2013 05:33:34 -0400 Received: by mail-ie0-f172.google.com with SMTP id 16so9375513iea.17 for ; Tue, 18 Jun 2013 02:33:34 -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=zduGCM8odaw8D3yvucKeU+4kmTGTwVk/ke4mQrkke2A=; b=dA+Yb4qs5LYLAjIfDEabOvFTWaH582vlW9wBW+q6S/qNiclT1XHnN6iPF2/u4Fnt/E 4/7HHDeL1B4wZ1UkbJGtjkpO3BD9Sc+4sR5hVSOZjwCkO8h9kgti0zVQ6hnHvo3FmyVa 3lrkZzgk9gBon9Z18q9bN26tCZL+tl5g7IjvWR3Wm+RkmFb/BhWVi6P/dFF/YByJL6ID 1g4lo2A/d0rWCBuKQPtTrTTVSNBVjDfebihm5CalIZSUd73wst5Fv3DJ84M9veqt2XjW 4Ef/QwXvyOkCMMXcolzw3RNL6miefWPotB9738ltjI4n8MGTVRxnlbPwme2OqQBGSE/3 UIKA== X-Received: by 10.42.200.148 with SMTP id ew20mr906156icb.16.1371548014190; Tue, 18 Jun 2013 02:33:34 -0700 (PDT) Received: from 11.wdongxu.kvm58 ([202.108.130.153]) by mx.google.com with ESMTPSA id bc6sm373016igb.1.2013.06.18.02.33.31 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 18 Jun 2013 02:33:33 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Tue, 18 Jun 2013 17:31:55 +0800 Message-Id: <1371547919-15654-4-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1371547919-15654-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1371547919-15654-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::22c Cc: kwolf@redhat.com, Dong Xu Wang , wdongxu@cn.ibm.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH V16 3/7] 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 creates 4 functions, count_opts_list, qemu_opts_append, qemu_opts_free and qemu_opts_print_help, they are used in following commits. Signed-off-by: Dong Xu Wang --- v16->v17: 1) discard double-initialization. 2) use pointer directly, not g_strdup. 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 | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 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 bd2acdc..5dd62e8 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -1218,3 +1218,76 @@ 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; + + 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; + 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 = p->desc[i].name; + dest->desc[index].help = p->desc[i].help; + dest->desc[index].type = p->desc[i].type; + dest->desc[index].def_value_str = 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) +{ + g_free(list); +} + +void qemu_opts_print_help(QemuOptsList *list) +{ + int i; + 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"); + } +}