From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH6QR-0007Es-42 for qemu-devel@nongnu.org; Thu, 27 Sep 2012 01:14:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TH6QQ-0003YT-6d for qemu-devel@nongnu.org; Thu, 27 Sep 2012 01:14:15 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:37197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH6QP-0003X6-Vt for qemu-devel@nongnu.org; Thu, 27 Sep 2012 01:14:14 -0400 Received: by mail-oa0-f45.google.com with SMTP id i18so1324797oag.4 for ; Wed, 26 Sep 2012 22:14:13 -0700 (PDT) Sender: Dong Xu Wang From: Dong Xu Wang Date: Thu, 27 Sep 2012 13:14:21 +0800 Message-Id: <1348722865-20564-4-git-send-email-wdongxu@linux.vnet.ibm.com> In-Reply-To: <1348722865-20564-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1348722865-20564-1-git-send-email-wdongxu@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC v2 3/7] qemu-option: qemu_opts_validate(): fix duplicated code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Dong Xu Wang , armbru@redhat.com, lcapitulino@redhat.com Use opts_accepts_any() and find_desc_by_name(). Signed-off-by: Luiz Capitulino Signed-off-by: Dong Xu Wang --- qemu-option.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index d8b0988..b7baacc 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -1050,23 +1050,15 @@ void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp) QemuOpt *opt; Error *local_err = NULL; - assert(opts->list->desc[0].name == NULL); + assert(opts_accepts_any(opts)); QTAILQ_FOREACH(opt, &opts->head, next) { - int i; - - for (i = 0; desc[i].name != NULL; i++) { - if (strcmp(desc[i].name, opt->name) == 0) { - break; - } - } - if (desc[i].name == NULL) { + opt->desc = find_desc_by_name(desc, opt->name); + if (!opt->desc) { error_set(errp, QERR_INVALID_PARAMETER, opt->name); return; } - opt->desc = &desc[i]; - qemu_opt_parse(opt, &local_err); if (error_is_set(&local_err)) { error_propagate(errp, local_err); -- 1.7.1