fixed block close() method prototype

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1068 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/block-cow.c b/block-cow.c
index affeefa3f0acde8b812dca17a191224e9ae3667b..81bd334cc164d212988365be19923da28f345f20 100644 (file)
--- a/block-cow.c
+++ b/block-cow.c
@@ -202,7 +202,7 @@ static int cow_write(BlockDriverState *bs, int64_t sector_num,
     return 0;
 }
 
-static int cow_close(BlockDriverState *bs)
+static void cow_close(BlockDriverState *bs)
 {
     BDRVCowState *s = bs->opaque;
     munmap(s->cow_bitmap_addr, s->cow_bitmap_size);

diff --git a/block-qcow.c b/block-qcow.c
index 953f42c7b69c5f9a1983c3483d42a425ccc2f23e..99c38329539f2268f3af7548828647d5aef8b0d8 100644 (file)
--- a/block-qcow.c
+++ b/block-qcow.c
@@ -521,7 +521,7 @@ static int qcow_write(BlockDriverState *bs, int64_t sector_num,
     return 0;
 }
 
-static int qcow_close(BlockDriverState *bs)
+static void qcow_close(BlockDriverState *bs)
 {
     BDRVQcowState *s = bs->opaque;
     qemu_free(s->l1_table);

diff --git a/block-vmdk.c b/block-vmdk.c
index 7193f959a32a2afb9a1c98e0bd745fdc3662bb4c..1cc498853426f6d8add93b3d4477c146fdd8f285 100644 (file)
--- a/block-vmdk.c
+++ b/block-vmdk.c
@@ -258,7 +258,7 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num,
     return -1;
 }
 
-static int vmdk_close(BlockDriverState *bs)
+static void vmdk_close(BlockDriverState *bs)
 {
     BDRVVmdkState *s = bs->opaque;
     qemu_free(s->l1_table);

diff --git a/block.c b/block.c
index 8dea3c932078e1fceb7f7a2104500f9516c10c9d..389617cb4bc9941ef78a0c4dd9f20428d9769223 100644 (file)
--- a/block.c
+++ b/block.c
@@ -554,7 +554,7 @@ static int raw_write(BlockDriverState *bs, int64_t sector_num,
     return 0;
 }
 
-static int raw_close(BlockDriverState *bs)
+static void raw_close(BlockDriverState *bs)
 {
     BDRVRawState *s = bs->opaque;
     close(s->fd);

diff --git a/block_int.h b/block_int.h
index 36a88ed0a11454040a07eb5abf09e612207463c1..9d047c4ff37e91384d5f5a259146b5d8270b6250 100644 (file)
--- a/block_int.h
+++ b/block_int.h
@@ -33,7 +33,7 @@ struct BlockDriver {
                      uint8_t *buf, int nb_sectors);
     int (*bdrv_write)(BlockDriverState *bs, int64_t sector_num, 
                       const uint8_t *buf, int nb_sectors);
-    int (*bdrv_close)(BlockDriverState *bs);
+    void (*bdrv_close)(BlockDriverState *bs);
     int (*bdrv_create)(const char *filename, int64_t total_sectors, 
                        const char *backing_file, int flags);
     int (*bdrv_is_allocated)(BlockDriverState *bs, int64_t sector_num,