[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/13] bochs: Fix bdrv_open() error handling
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 06/13] bochs: Fix bdrv_open() error handling |
Date: |
Fri, 1 Feb 2013 15:27:57 +0100 |
From: Kevin Wolf <address@hidden>
Return -errno instead of -1 on errors. While touching the
code, fix a memory leak.
Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/bochs.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/block/bochs.c b/block/bochs.c
index 3737583..a6eb33d 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -114,11 +114,13 @@ static int bochs_open(BlockDriverState *bs, int flags)
int i;
struct bochs_header bochs;
struct bochs_header_v1 header_v1;
+ int ret;
bs->read_only = 1; // no write support yet
- if (bdrv_pread(bs->file, 0, &bochs, sizeof(bochs)) != sizeof(bochs)) {
- goto fail;
+ ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
+ if (ret < 0) {
+ return ret;
}
if (strcmp(bochs.magic, HEADER_MAGIC) ||
@@ -138,9 +140,13 @@ static int bochs_open(BlockDriverState *bs, int flags)
s->catalog_size = le32_to_cpu(bochs.extra.redolog.catalog);
s->catalog_bitmap = g_malloc(s->catalog_size * 4);
- if (bdrv_pread(bs->file, le32_to_cpu(bochs.header), s->catalog_bitmap,
- s->catalog_size * 4) != s->catalog_size * 4)
- goto fail;
+
+ ret = bdrv_pread(bs->file, le32_to_cpu(bochs.header), s->catalog_bitmap,
+ s->catalog_size * 4);
+ if (ret < 0) {
+ goto fail;
+ }
+
for (i = 0; i < s->catalog_size; i++)
le32_to_cpus(&s->catalog_bitmap[i]);
@@ -153,8 +159,10 @@ static int bochs_open(BlockDriverState *bs, int flags)
qemu_co_mutex_init(&s->lock);
return 0;
- fail:
- return -1;
+
+fail:
+ g_free(s->catalog_bitmap);
+ return ret;
}
static int64_t seek_to_sector(BlockDriverState *bs, int64_t sector_num)
--
1.8.1
- [Qemu-devel] [PULL for-1.4 00/13] Block patches, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 01/13] qemu-iotests: Add regression test for b7ab0fea, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 02/13] block: Fix is_allocated_above with resized files, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 03/13] block: Adds mirroring tests for resized images, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 04/13] vmdk: Allow selecting SCSI adapter in image creation, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 05/13] sheepdog: pass vdi_id to sheep daemon for sd_close(), Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 07/13] cloop: Fix bdrv_open() error handling, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 06/13] bochs: Fix bdrv_open() error handling,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 09/13] dmg: Fix bdrv_open() error handling, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 08/13] vpc: Fix bdrv_open() error handling, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 10/13] dmg: Use g_free instead of free, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 11/13] parallels: Fix bdrv_open() error handling, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 12/13] vmdk: Allow space in file name, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 13/13] block/raw-posix: Build fix for O_ASYNC, Stefan Hajnoczi, 2013/02/01