From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Dong Xu Wang From: Dong Xu Wang Date: Thu, 27 Sep 2012 13:14:19 +0800 Message-Id: <1348722865-20564-2-git-send-email-wdongxu@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [RFC v2 1/7] qemu-option: qemu_opt_set_bool(): fix code duplication List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Dong Xu Wang , armbru@redhat.com, lcapitulino@redhat.com 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, -- 1.7.1