From patchwork Fri Jul 13 20:44:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 170955 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 0B3592C0313 for ; Sat, 14 Jul 2012 06:44:15 +1000 (EST) Received: from localhost ([::1]:45032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Spmij-0002pw-39 for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2012 16:44:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpmiS-0002k8-Oa for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:43:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SpmiR-0001r9-Mx for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:43:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpmiR-0001qw-Er for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:43:55 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6DKhsLK012065 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 13 Jul 2012 16:43:54 -0400 Received: from localhost ([10.3.113.3]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6DKhrHs009272; Fri, 13 Jul 2012 16:43:53 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 13 Jul 2012 17:44:14 -0300 Message-Id: <1342212261-19903-2-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, afaerber@suse.de, armbru@redhat.com Subject: [Qemu-devel] [PATCH 1/8] qemu-option: qemu_opt_set_bool(): fix code duplication 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 Call qemu_opt_set() instead of duplicating opt_set(). Signed-off-by: Luiz Capitulino --- qemu-option.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index bb3886c..2cb2835 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -677,33 +677,7 @@ void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value, int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val) { - QemuOpt *opt; - const QemuOptDesc *desc = opts->list->desc; - int i; - - for (i = 0; desc[i].name != NULL; i++) { - if (strcmp(desc[i].name, name) == 0) { - break; - } - } - if (desc[i].name == NULL) { - if (i == 0) { - /* empty list -> allow any */; - } else { - qerror_report(QERR_INVALID_PARAMETER, name); - return -1; - } - } - - opt = g_malloc0(sizeof(*opt)); - opt->name = g_strdup(name); - opt->opts = opts; - QTAILQ_INSERT_TAIL(&opts->head, opt, next); - if (desc[i].name != NULL) { - opt->desc = desc+i; - } - opt->value.boolean = !!val; - return 0; + return qemu_opt_set(opts, name, val ? "on" : "off"); } int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,