From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58869 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTEyE-0000cT-RC for qemu-devel@nongnu.org; Thu, 16 Dec 2010 09:38:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTEyD-0005N2-Kn for qemu-devel@nongnu.org; Thu, 16 Dec 2010 09:38:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTEyD-0005Mk-Ba for qemu-devel@nongnu.org; Thu, 16 Dec 2010 09:38:13 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBGEcCXW003481 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 16 Dec 2010 09:38:12 -0500 From: Kevin Wolf Date: Thu, 16 Dec 2010 15:39:20 +0100 Message-Id: <1292510360-15707-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] Remove NULL checks for bdrv_new return value List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com It's an indirect call to qemu_malloc, which never returns an error. Signed-off-by: Kevin Wolf --- hw/xen_disk.c | 17 ++++++----------- qemu-img.c | 5 +---- qemu-io.c | 2 -- qemu-nbd.c | 2 -- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 85a1c85..1954311 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -634,17 +634,12 @@ static int blk_init(struct XenDevice *xendev) if (!blkdev->dinfo) { /* setup via xenbus -> create new block driver instance */ xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n"); - blkdev->bs = bdrv_new(blkdev->dev); - if (blkdev->bs) { - if (bdrv_open(blkdev->bs, blkdev->filename, qflags, - bdrv_find_whitelisted_format(blkdev->fileproto)) - != 0) { - bdrv_delete(blkdev->bs); - blkdev->bs = NULL; - } - } - if (!blkdev->bs) - return -1; + blkdev->bs = bdrv_new(blkdev->dev); + if (bdrv_open(blkdev->bs, blkdev->filename, qflags, + bdrv_find_whitelisted_format(blkdev->fileproto)) != 0) { + bdrv_delete(blkdev->bs); + blkdev->bs = NULL; + } } else { /* setup via qemu cmdline -> already setup for us */ xen_be_printf(&blkdev->xendev, 2, "get configured bdrv (cmdline setup)\n"); diff --git a/qemu-img.c b/qemu-img.c index 0b871d8..afd9ed2 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -215,10 +215,7 @@ static BlockDriverState *bdrv_new_open(const char *filename, char password[256]; bs = bdrv_new(""); - if (!bs) { - error_report("Not enough memory"); - goto fail; - } + if (fmt) { drv = bdrv_find_format(fmt); if (!drv) { diff --git a/qemu-io.c b/qemu-io.c index ff353eb..0f6d1b6 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -1509,8 +1509,6 @@ static int openfile(char *name, int flags, int growable) } } else { bs = bdrv_new("hda"); - if (!bs) - return 1; if (bdrv_open(bs, name, flags, NULL) < 0) { fprintf(stderr, "%s: can't open device %s\n", progname, name); diff --git a/qemu-nbd.c b/qemu-nbd.c index 99f1d22..e858033 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -336,8 +336,6 @@ int main(int argc, char **argv) bdrv_init(); bs = bdrv_new("hda"); - if (bs == NULL) - return 1; if ((ret = bdrv_open(bs, argv[optind], flags, NULL)) < 0) { errno = -ret; -- 1.7.2.3