From patchwork Thu Nov 1 09:12:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 196119 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 E91892C0485 for ; Thu, 1 Nov 2012 20:41:50 +1100 (EST) Received: from localhost ([::1]:51000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTqqU-0000XW-6t for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2012 05:13:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTqpf-00079Z-UA for qemu-devel@nongnu.org; Thu, 01 Nov 2012 05:13:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTqpZ-0000Xe-Fq for qemu-devel@nongnu.org; Thu, 01 Nov 2012 05:12:55 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:56709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTqpZ-0000WK-86 for qemu-devel@nongnu.org; Thu, 01 Nov 2012 05:12:53 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so1545080pad.4 for ; Thu, 01 Nov 2012 02:12:49 -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=dmYY5by0aed+1rYylf25nnPJFO+n5yJoe8FGJ3oi7s8=; b=KfWcw7SPofKAmJIiHrq/h69EgbwkR2fQikADxKt16+ANx6FA//QBnIkngKsjvfLlbN osPAT9VOvc0OI6QqUUgADDMLmSDJKIJ6HbXw8rxEF3Q+6yL4Hdgyf3p/Gm+CvB4hrDIi UPTvhCW4AR8G+9LF+/8YhfPZ/atQnfh7dNs89zdHwTRnOa2kacywMEayt5NnajoM4S7B fl80nS3i1RjJQuqpapgLm9xzo4s1le/ZTIk6Ag13vkaOM7Jnsu0znlhc7dSqAJdlM5lW K2++p4mOJbyPN/a3ULGstGEhMYhz8gSYUkq1nfnPPri8294+1hu4dnDFBz1KiqR2mS7c BPwg== Received: by 10.66.85.10 with SMTP id d10mr109450847paz.52.1351761169220; Thu, 01 Nov 2012 02:12:49 -0700 (PDT) Received: from localhost.localdomain ([202.108.130.138]) by mx.google.com with ESMTPS id o11sm3751238pby.8.2012.11.01.02.12.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 02:12:48 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Thu, 1 Nov 2012 17:12:22 +0800 Message-Id: <1351761150-20705-3-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1351761150-20705-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1351761150-20705-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.220.45 Cc: kwolf@redhat.com, Dong Xu Wang , Luiz Capitulino Subject: [Qemu-devel] [PATCH V5 02/10] qemu-option: qemu_opts_validate(): fix duplicated code 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 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 375daaa..74321bb 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -1076,23 +1076,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);