From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpmiV-0002qt-RW for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SpmiU-0001rn-SJ for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:43:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpmiU-0001ri-KK for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:43:58 -0400 From: Luiz Capitulino Date: Fri, 13 Jul 2012 17:44:16 -0300 Message-Id: <1342212261-19903-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1342212261-19903-1-git-send-email-lcapitulino@redhat.com> References: <1342212261-19903-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 3/8] 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: jan.kiszka@siemens.com, aliguori@us.ibm.com, afaerber@suse.de, armbru@redhat.com Use opts_accepts_any() and find_desc_by_name(). Signed-off-by: Luiz Capitulino --- qemu-option.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index d67e10f..65ba1cf 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -1060,23 +1060,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.11.1.116.g8228a23