From patchwork Thu Nov 1 09:12:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 196096 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 CA5642C0290 for ; Thu, 1 Nov 2012 20:13:08 +1100 (EST) Received: from localhost ([::1]:47493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTqpm-00075O-Gf for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2012 05:13:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTqpT-0006oq-To for qemu-devel@nongnu.org; Thu, 01 Nov 2012 05:12:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTqpS-0000Vz-TQ for qemu-devel@nongnu.org; Thu, 01 Nov 2012 05:12:47 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:46990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTqpS-0000Uq-NC for qemu-devel@nongnu.org; Thu, 01 Nov 2012 05:12:46 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so1555663pbb.4 for ; Thu, 01 Nov 2012 02:12:46 -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=bRClk8zJ5hcfmE021m5xmk32HNpfgx8Gl0MNGBu7q8g=; b=SMjA/9V1HgGCHOTy2XaAvtvdRwJywj55fhTiqfpt1DAWmUK5Iq6gnI1TAWU6AkjlCL +vW4Ar8N4hQ3ZuEArhx6tZBaqTyRHX3yfQjlJYd4gKN/pxeKsfWAULtybDSEgf9MYr6R bbFNfZUm1dV29lIQeyqaftJNWjLnC5mYY48thYK4eU/EVLVTBDny1bbjJ3zZBGrt8L3w Dnu3HHNr2kkjpav2oSknaXWBOWafbiefIrZskrxy/U4mmQezDtbAnGKNfNIRPInjm4Rz QIMqpAD7h9NiGpdjRcyYcJbY7yZruRPvuRPyZtRpiUekrC5stYRdD+h3ofzvdjoGKZ/Q a08g== Received: by 10.66.84.40 with SMTP id v8mr109382615pay.47.1351761166423; Thu, 01 Nov 2012 02:12:46 -0700 (PDT) Received: from localhost.localdomain ([202.108.130.138]) by mx.google.com with ESMTPS id o11sm3751238pby.8.2012.11.01.02.12.43 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 02:12:45 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Thu, 1 Nov 2012 17:12:21 +0800 Message-Id: <1351761150-20705-2-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.160.45 Cc: kwolf@redhat.com, Dong Xu Wang , Luiz Capitulino Subject: [Qemu-devel] [PATCH V5 01/10] qemu-option: opt_set(): split it up into more 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 The new functions are opts_accepts_any() and find_desc_by_name(), which are also going to be used by qemu_opts_validate() (see next commit). This also makes opt_set() slightly more readable. Signed-off-by: Luiz Capitulino Signed-off-by: Dong Xu Wang --- qemu-option.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 27891e7..375daaa 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -602,26 +602,36 @@ static void qemu_opt_del(QemuOpt *opt) g_free(opt); } -static void opt_set(QemuOpts *opts, const char *name, const char *value, - bool prepend, Error **errp) +static bool opts_accepts_any(const QemuOpts *opts) +{ + return opts->list->desc[0].name == NULL; +} + +static const QemuOptDesc *find_desc_by_name(const QemuOptDesc *desc, + const char *name) { - QemuOpt *opt; - const QemuOptDesc *desc = opts->list->desc; - Error *local_err = NULL; int i; for (i = 0; desc[i].name != NULL; i++) { if (strcmp(desc[i].name, name) == 0) { - break; + return &desc[i]; } } - if (desc[i].name == NULL) { - if (i == 0) { - /* empty list -> allow any */; - } else { - error_set(errp, QERR_INVALID_PARAMETER, name); - return; - } + + return NULL; +} + +static void opt_set(QemuOpts *opts, const char *name, const char *value, + bool prepend, Error **errp) +{ + QemuOpt *opt; + const QemuOptDesc *desc; + Error *local_err = NULL; + + desc = find_desc_by_name(opts->list->desc, name); + if (!desc && !opts_accepts_any(opts)) { + error_set(errp, QERR_INVALID_PARAMETER, name); + return; } opt = g_malloc0(sizeof(*opt)); @@ -632,9 +642,7 @@ static void opt_set(QemuOpts *opts, const char *name, const char *value, } else { QTAILQ_INSERT_TAIL(&opts->head, opt, next); } - if (desc[i].name != NULL) { - opt->desc = desc+i; - } + opt->desc = desc; if (value) { opt->str = g_strdup(value); }