mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove NULL checks for bdrv_new return value

Browse Source 
It's an indirect call to qemu_malloc, which never returns an error.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2010-12-16 15:37:41 +01:00
parent 15654a6d7c
commit ad7171394f
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xen_disk.c
View File

@ -635,16 +635,11 @@ static int blk_init(struct XenDevice *xendev)
/* setup via xenbus -> create new block driver instance */ /* setup via xenbus -> create new block driver instance */
xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n"); xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n");
blkdev->bs = bdrv_new(blkdev->dev); blkdev->bs = bdrv_new(blkdev->dev);
if (blkdev->bs) {
if (bdrv_open(blkdev->bs, blkdev->filename, qflags, if (bdrv_open(blkdev->bs, blkdev->filename, qflags,
bdrv_find_whitelisted_format(blkdev->fileproto)) bdrv_find_whitelisted_format(blkdev->fileproto)) != 0) {
!= 0) {
bdrv_delete(blkdev->bs); bdrv_delete(blkdev->bs);
blkdev->bs = NULL;
}
}
if (!blkdev->bs)
return -1; return -1;
}
} else { } else {
/* setup via qemu cmdline -> already setup for us */ /* setup via qemu cmdline -> already setup for us */
xen_be_printf(&blkdev->xendev, 2, "get configured bdrv (cmdline setup)\n"); xen_be_printf(&blkdev->xendev, 2, "get configured bdrv (cmdline setup)\n");

5
qemu-img.c
View File

@ -215,10 +215,7 @@ static BlockDriverState *bdrv_new_open(const char *filename,
char password[256]; char password[256];
bs = bdrv_new(""); bs = bdrv_new("");
if (!bs) {
error_report("Not enough memory");
goto fail;
}
if (fmt) { if (fmt) {
drv = bdrv_find_format(fmt); drv = bdrv_find_format(fmt);
if (!drv) { if (!drv) {

2
qemu-io.c
View File

@ -1509,8 +1509,6 @@ static int openfile(char *name, int flags, int growable)
} }
} else { } else {
bs = bdrv_new("hda"); bs = bdrv_new("hda");
if (!bs)
return 1;
if (bdrv_open(bs, name, flags, NULL) < 0) { if (bdrv_open(bs, name, flags, NULL) < 0) {
fprintf(stderr, "%s: can't open device %s\n", progname, name); fprintf(stderr, "%s: can't open device %s\n", progname, name);

2
qemu-nbd.c
View File

@ -336,8 +336,6 @@ int main(int argc, char **argv)
bdrv_init(); bdrv_init();
bs = bdrv_new("hda"); bs = bdrv_new("hda");
if (bs == NULL)
return 1;
if ((ret = bdrv_open(bs, argv[optind], flags, NULL)) < 0) { if ((ret = bdrv_open(bs, argv[optind], flags, NULL)) < 0) {
errno = -ret; errno = -ret;