X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=block-parallels.c;h=18c3d834e722951ade95c152d73b8d84e091c534;hb=221f715d90ec5fec569a19119887445c037bca86;hp=4654b07b159facffbca85f5ccd7031353f6d4e35;hpb=faf07963cb03f98d52ca1f7fde7482a3cb309bcc;p=qemu

diff --git a/block-parallels.c b/block-parallels.c
index 4654b07..18c3d83 100644
--- a/block-parallels.c
+++ b/block-parallels.c
@@ -101,8 +101,6 @@ static int parallels_open(BlockDriverState *bs, const char *filename, int flags)
 
     s->catalog_size = le32_to_cpu(ph.catalog_entries);
     s->catalog_bitmap = qemu_malloc(s->catalog_size * 4);
-    if (!s->catalog_bitmap)
-	goto fail;
     if (read(s->fd, s->catalog_bitmap, s->catalog_size * 4) !=
 	s->catalog_size * 4)
 	goto fail;
@@ -166,11 +164,10 @@ static void parallels_close(BlockDriverState *bs)
 }
 
 BlockDriver bdrv_parallels = {
-    "parallels",
-    sizeof(BDRVParallelsState),
-    parallels_probe,
-    parallels_open,
-    parallels_read,
-    NULL,
-    parallels_close,
+    .format_name	= "parallels",
+    .instance_size	= sizeof(BDRVParallelsState),
+    .bdrv_probe		= parallels_probe,
+    .bdrv_open		= parallels_open,
+    .bdrv_read		= parallels_read,
+    .bdrv_close		= parallels_close,
 };