hw/eeprom93xx.c: substitute structure dump with discrete dump in eeprom_save/load

[qemu] / block-vpc.c

diff --git a/block-vpc.c b/block-vpc.c
index 3eea506..7ae5202 100644 (file)
--- a/block-vpc.c
+++ b/block-vpc.c
@@ -196,8 +196,6 @@ static int vpc_open(BlockDriverState *bs, const char *filename, int flags)
 
     s->max_table_entries = be32_to_cpu(dyndisk_header->max_table_entries);
     s->pagetable = qemu_malloc(s->max_table_entries * 4);
-    if (!s->pagetable)
-        goto fail;
 
     s->bat_offset = be64_to_cpu(dyndisk_header->table_offset);
     if (bdrv_pread(s->hd, s->bat_offset, s->pagetable,
@@ -222,8 +220,6 @@ static int vpc_open(BlockDriverState *bs, const char *filename, int flags)
 
 #ifdef CACHE
     s->pageentry_u8 = qemu_malloc(512);
-    if (!s->pageentry_u8)
-       goto fail;
     s->pageentry_u32 = s->pageentry_u8;
     s->pageentry_u16 = s->pageentry_u8;
     s->last_pagetable = -1;
@@ -586,12 +582,12 @@ static void vpc_close(BlockDriverState *bs)
 }
 
 BlockDriver bdrv_vpc = {
-    "vpc",
-    sizeof(BDRVVPCState),
-    vpc_probe,
-    vpc_open,
-    vpc_read,
-    vpc_write,
-    vpc_close,
-    vpc_create,
+    .format_name       = "vpc",
+    .instance_size     = sizeof(BDRVVPCState),
+    .bdrv_probe                = vpc_probe,
+    .bdrv_open         = vpc_open,
+    .bdrv_read         = vpc_read,
+    .bdrv_write                = vpc_write,
+    .bdrv_close                = vpc_close,
+    .bdrv_create       = vpc_create,
 };