From patchwork Thu Sep 27 05:14:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 187281 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 17FCC2C00AF for ; Thu, 27 Sep 2012 15:50:55 +1000 (EST) Received: from localhost ([::1]:35880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH6Qw-0008S1-8B for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 01:14:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55165) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH6QL-0006yT-JC for qemu-devel@nongnu.org; Thu, 27 Sep 2012 01:14:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TH6QK-0003Xd-IM for qemu-devel@nongnu.org; Thu, 27 Sep 2012 01:14:09 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:53262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH6QK-0003XY-Cs for qemu-devel@nongnu.org; Thu, 27 Sep 2012 01:14:08 -0400 Received: by obbta14 with SMTP id ta14so1308124obb.4 for ; Wed, 26 Sep 2012 22:14:07 -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=ApyXOKyzEQCo87st8PkZQoB8sbU0Ada/G6aiF3McJKg=; b=FNAbpNkNykbha8JX3w7f8n7YP1IFgArZ1H1CuYItGg/Uq27WncinBHo795BTnHEhyi owmIHrYK2nTyLe5NPyqeTGgsfEwXZtfVK0BV674rzhDgDx+daeRsQ8lR9+JI2SRk/ESE nNomFZsp+Z//5oAuxRFVY5EjVbGODcXinXKi0Og5RImshzDcniO1kdpt7BgWWn0zbAga oR6+Ru/2svnPMSkhf5OxyBfl9VUp+WK7tQeAfR+FG3Tf7Gd7KMRzbV1iDY8kebuv0jqG 17L1JB+XYEYe7C0EEUAX+7GRuLkkDakNNLlzGRtqI5/Qa/vkcg7YzdJby3YuDcWKGPV/ riFQ== Received: by 10.60.7.169 with SMTP id k9mr2200374oea.77.1348722847802; Wed, 26 Sep 2012 22:14:07 -0700 (PDT) Received: from localhost.localdomain ([202.108.130.138]) by mx.google.com with ESMTPS id q6sm3833954oec.7.2012.09.26.22.14.04 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Sep 2012 22:14:07 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 13:14:19 +0800 Message-Id: <1348722865-20564-2-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Cc: kwolf@redhat.com, Dong Xu Wang , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [RFC v2 1/7] 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(). It will set opt->str in qemu_opt_set_bool, without opt->str, there will be some potential bugs. These are uses of opt->str, and what happens when it isn't set: * qemu_opt_get(): returns NULL, which means "not set". Bug can bite when value isn't the default value. * qemu_opt_parse(): passes NULL to parse_option_bool(), which treats it like "on". Wrong if the value is actually false. Bug can bite when qemu_opts_validate() runs after qemu_opt_set_bool(). * qemu_opt_del(): passes NULL to g_free(), which is just fine. * qemu_opt_foreach(): passes NULL to the callback, which is unlikely to be prepared for it. * qemu_opts_print(): prints NULL, which crashes on some systems. * qemu_opts_to_qdict(): passes NULL to qstring_from_str(), which crashes. Signed-off-by: Luiz Capitulino Signed-off-by: Dong Xu Wang --- qemu-option.c | 28 +--------------------------- 1 files changed, 1 insertions(+), 27 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 27891e7..0b81e77 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -667,33 +667,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,