From patchwork Tue Aug 13 04:31:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 266695 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1CFB2C012F for ; Tue, 13 Aug 2013 14:34:05 +1000 (EST) Received: from localhost ([::1]:49149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V96J1-00077S-L0 for incoming@patchwork.ozlabs.org; Tue, 13 Aug 2013 00:34:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V96I1-0006Rs-IV for qemu-devel@nongnu.org; Tue, 13 Aug 2013 00:33:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V96Ht-0000Dx-4z for qemu-devel@nongnu.org; Tue, 13 Aug 2013 00:33:01 -0400 Received: from mail-pd0-x231.google.com ([2607:f8b0:400e:c02::231]:34966) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V96Hs-0000DY-SI for qemu-devel@nongnu.org; Tue, 13 Aug 2013 00:32:53 -0400 Received: by mail-pd0-f177.google.com with SMTP id y10so4326346pdj.36 for ; Mon, 12 Aug 2013 21:32:52 -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:in-reply-to:references; bh=szW6Rzgu8PbUc5mTzUdWx6EHL+yU4pMGQBM95Ie+VfM=; b=g3sDHN2YmKa0zj3Vh5vLJ3Q4ArPCrIHjYBOIaeR19pihfSAQuE5yCbsRUg2/n+5hkR yAC8Vh5OfqJR128PiHGmBZLSO7iJG0XhICNRS8RA3dDDWu5eOg3o8mT2TVTROrIQNaru 0lsD/ei9jKLITZtd3CUKQseZPzy3L/EaAA4KxjoHwewhM5bZocAtWF5BjwItm/dmLZnq TOCYUXbFDmUFVyWqKMWDYZ9HKP2SVXMf1V0laEf9uhKs2745gsJDiVrzEQ/MjN/gcvV3 YxS2lZzMIrKsLoHVmSvfDBlRS4JzRXqFomW8zt1C11CiidJEYgqRVksxOimG1taE7lsn 3qRA== X-Received: by 10.67.1.203 with SMTP id bi11mr2485994pad.137.1376368372067; Mon, 12 Aug 2013 21:32:52 -0700 (PDT) Received: from 11.wdongxu.kvm58 ([202.108.130.153]) by mx.google.com with ESMTPSA id mz5sm10285023pbc.18.2013.08.12.21.32.48 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 12 Aug 2013 21:32:51 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2013 12:31:44 +0800 Message-Id: <1376368326-7433-4-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1376368326-7433-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1376368326-7433-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:400e:c02::231 Cc: kwolf@redhat.com, wdongxu@cn.ibm.com, stefanha@redhat.com, Dong Xu Wang Subject: [Qemu-devel] [PATCH V18 03/25] qemu-option: 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. v16->v17: 1) fix indentation. 2) fix typo. v15->v16: 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. Signed-off-by: Dong Xu Wang --- 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 bbbdea3..3b514bb 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -158,4 +158,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 a3c3c17..2a5447c 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -1201,3 +1201,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 with a desc of the merge of the 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 lists 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"); + } +}