From e2731add29e3c74a472dcb81f90bf9aa14f4b8e1 Mon Sep 17 00:00:00 2001 From: bellard Date: Sat, 18 Sep 2004 19:32:11 +0000 Subject: [PATCH] fixed block close() method prototype git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1068 c046a42c-6fe2-441c-8c8c-71466251a162 --- block-cow.c | 2 +- block-qcow.c | 2 +- block-vmdk.c | 2 +- block.c | 2 +- block_int.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block-cow.c b/block-cow.c index affeefa3f..81bd334cc 100644 --- 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 953f42c7b..99c383295 100644 --- 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 7193f959a..1cc498853 100644 --- 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 8dea3c932..389617cb4 100644 --- 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 36a88ed0a..9d047c4ff 100644 --- 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, -- 2.39.2