From patchwork Wed Jul 17 09:29:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 259646 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CCFDC2C008F for ; Wed, 17 Jul 2013 19:35:57 +1000 (EST) Received: from localhost ([::1]:49481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzO9L-0008RO-86 for incoming@patchwork.ozlabs.org; Wed, 17 Jul 2013 05:35:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzO8n-0008LO-8A for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:35:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UzO8l-0005D3-OA for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:35:21 -0400 Received: from mail-pd0-x22c.google.com ([2607:f8b0:400e:c02::22c]:47318) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzO4E-0003bo-9j for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:30:38 -0400 Received: by mail-pd0-f172.google.com with SMTP id z10so1648505pdj.17 for ; Wed, 17 Jul 2013 02:30:37 -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=69qfuvUS9ijnFORrb+ECdeV3hYB+PvOjZtgHyUVMWEk=; b=IY76et4kiDmiqhRbqOsTVU3uM8SmVNGFwWbMZdT5mKV7jkBJ8AX20cukLujutg7SHt doqauq/1QJPtKPoexahcJSAGkTscpaLBnnPk4eOvol0QU3BiFFdPaYxi/eSD7QloPtCe OHj9uQ5F471CMI15stSL5nr5fxpKrY9Zm0plI8YucvhL8JKhuxiZa2SMjgv0NWR6ziOl enqEcf7/hYz1I7taAVDaosFgTmrlaCUK4QDX3zG7kYRTpqjRSnhj8tnGEdzHBnj8QLZ9 GnSbGzC4D6upwMi6PUwK1pv3Fchl8d4LMtL7xV2x26nGAr7kgVlklJqgxi2jcyEUBo9J GKBA== X-Received: by 10.66.161.166 with SMTP id xt6mr7034723pab.87.1374053437505; Wed, 17 Jul 2013 02:30:37 -0700 (PDT) Received: from 11.wdongxu.kvm58 ([202.108.130.153]) by mx.google.com with ESMTPSA id ie3sm6850075pbc.13.2013.07.17.02.30.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Jul 2013 02:30:37 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2013 17:29:48 +0800 Message-Id: <1374053388-17431-10-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1374053388-17431-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1374053388-17431-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22c Cc: kwolf@redhat.com, wdongxu@cn.ibm.com, stefanha@redhat.com, Dong Xu Wang Subject: [Qemu-devel] [PATCH V17 9/9] qemu-option: use qemu_opts_del without judging NULL 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 Signed-off-by: Dong Xu Wang --- block.c | 8 ++------ hw/core/qdev.c | 4 +--- qemu-char.c | 4 +--- qemu-img.c | 4 +--- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/block.c b/block.c index e1d1c3d..e700593 100644 --- a/block.c +++ b/block.c @@ -408,9 +408,7 @@ int bdrv_create(BlockDriver *drv, const char* filename, QemuOpts *opts) ret = cco.ret; out: - if (!opts) { - qemu_opts_del(cco.opts); - } + qemu_opts_del(cco.opts); g_free(cco.filename); return ret; } @@ -4575,9 +4573,7 @@ void bdrv_img_create(const char *filename, const char *fmt, } out: - if (opts) { - qemu_opts_del(opts); - } + qemu_opts_del(opts); qemu_opts_free(create_opts); if (bs) { diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 9190a7e..2a33eca 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -768,9 +768,7 @@ static void device_initfn(Object *obj) static void device_finalize(Object *obj) { DeviceState *dev = DEVICE(obj); - if (dev->opts) { - qemu_opts_del(dev->opts); - } + qemu_opts_del(dev->opts); } static void device_class_base_init(ObjectClass *class, void *data) diff --git a/qemu-char.c b/qemu-char.c index 800d6a6..6cd650d 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3379,9 +3379,7 @@ void qemu_chr_delete(CharDriverState *chr) } g_free(chr->filename); g_free(chr->label); - if (chr->opts) { - qemu_opts_del(chr->opts); - } + qemu_opts_del(chr->opts); g_free(chr); } diff --git a/qemu-img.c b/qemu-img.c index 3f1b6ee..44dd07d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1527,9 +1527,7 @@ static int img_convert(int argc, char **argv) out: qemu_progress_end(); qemu_opts_free(create_opts); - if (opts) { - qemu_opts_del(opts); - } + qemu_opts_del(opts); qemu_vfree(buf); if (out_bs) { bdrv_delete(out_bs);