X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=block-bochs.c;h=7a75412d84c0cf702a7587b49b908b066ffe15d7;hb=f722945efe6302fba6470c64d70825e7c3e0ee44;hp=9baea9b6f1711162582f87f51d40f89caadfadc2;hpb=3b46e6242767a2c770c0aba0a6595e9511623c92;p=qemu

diff --git a/block-bochs.c b/block-bochs.c
index 9baea9b..7a75412 100644
--- a/block-bochs.c
+++ b/block-bochs.c
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "vl.h"
+#include "qemu-common.h"
 #include "block_int.h"
 
 /**************************************************************/
@@ -149,8 +149,6 @@ static int bochs_open(BlockDriverState *bs, const char *filename, int flags)
 
     s->catalog_size = le32_to_cpu(bochs.extra.redolog.catalog);
     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;
@@ -244,11 +242,10 @@ static void bochs_close(BlockDriverState *bs)
 }
 
 BlockDriver bdrv_bochs = {
-    "bochs",
-    sizeof(BDRVBochsState),
-    bochs_probe,
-    bochs_open,
-    bochs_read,
-    NULL,
-    bochs_close,
+    .format_name	= "bochs",
+    .instance_size	= sizeof(BDRVBochsState),
+    .bdrv_probe		= bochs_probe,
+    .bdrv_open		= bochs_open,
+    .bdrv_read		= bochs_read,
+    .bdrv_close		= bochs_close,
 };