[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/19] block/vpc: set errp in vpc_open
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 08/19] block/vpc: set errp in vpc_open |
Date: |
Fri, 15 Apr 2016 19:02:11 +0200 |
From: Jeff Cody <address@hidden>
Add more useful error information to failure paths in vpc_open
Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vpc.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/block/vpc.c b/block/vpc.c
index 0eef099..9475efb 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -238,6 +238,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options,
int flags,
ret = bdrv_pread(bs->file->bs, 0, s->footer_buf, HEADER_SIZE);
if (ret < 0) {
+ error_setg(errp, "Unable to read VHD header");
goto fail;
}
@@ -246,9 +247,11 @@ static int vpc_open(BlockDriverState *bs, QDict *options,
int flags,
int64_t offset = bdrv_getlength(bs->file->bs);
if (offset < 0) {
ret = offset;
+ error_setg(errp, "Invalid file size");
goto fail;
} else if (offset < HEADER_SIZE) {
ret = -EINVAL;
+ error_setg(errp, "File too small for a VHD header");
goto fail;
}
@@ -327,12 +330,14 @@ static int vpc_open(BlockDriverState *bs, QDict *options,
int flags,
ret = bdrv_pread(bs->file->bs, be64_to_cpu(footer->data_offset), buf,
HEADER_SIZE);
if (ret < 0) {
+ error_setg(errp, "Error reading dynamic VHD header");
goto fail;
}
dyndisk_header = (VHDDynDiskHeader *) buf;
if (strncmp(dyndisk_header->magic, "cxsparse", 8)) {
+ error_setg(errp, "Invalid header magic");
ret = -EINVAL;
goto fail;
}
@@ -348,12 +353,14 @@ static int vpc_open(BlockDriverState *bs, QDict *options,
int flags,
s->max_table_entries = be32_to_cpu(dyndisk_header->max_table_entries);
if ((bs->total_sectors * 512) / s->block_size > 0xffffffffU) {
+ error_setg(errp, "Too many blocks");
ret = -EINVAL;
goto fail;
}
computed_size = (uint64_t) s->max_table_entries * s->block_size;
if (computed_size < bs->total_sectors * 512) {
+ error_setg(errp, "Page table too small");
ret = -EINVAL;
goto fail;
}
@@ -370,6 +377,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options,
int flags,
s->pagetable = qemu_try_blockalign(bs->file->bs, pagetable_size);
if (s->pagetable == NULL) {
+ error_setg(errp, "Unable to allocate memory for page table");
ret = -ENOMEM;
goto fail;
}
@@ -379,6 +387,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options,
int flags,
ret = bdrv_pread(bs->file->bs, s->bat_offset, s->pagetable,
pagetable_size);
if (ret < 0) {
+ error_setg(errp, "Error reading pagetable");
goto fail;
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/19] Block layer patches for 2.6.0-rc3, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 02/19] block: Fix blk_aio_write_zeroes(), Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 03/19] block/vpc: set errp in vpc_create, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 06/19] block/vpc: Use the correct max sector count for VHD images, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 07/19] block/vpc: make checks on max table size a bit more lax, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 04/19] vpc: use current_size field for XenServer VHD images, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 01/19] qemu-io: Support 'aio_write -z', Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 08/19] block/vpc: set errp in vpc_open,
Kevin Wolf <=
- [Qemu-devel] [PULL 05/19] block/vpc: use current_size field for XenConverter VHD images, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 10/19] block: Don't ignore flags in blk_{, co, aio}_write_zeroes(), Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 11/19] Fix pflash migration, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 12/19] qemu-iotests: drop unused _within_tolerance() filter, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 13/19] qemu-iotests: common.rc: drop unused _do(), Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 09/19] block/vpc: update comments to be compliant w/coding guidelines, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 19/19] nbd: Don't kill server on client that doesn't request TLS, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 16/19] qemu-iotests: 041: More robust assertion on quorum node, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 14/19] qemu-iotests: tests: do not set unused tmp variable, Kevin Wolf, 2016/04/15
- [Qemu-devel] [PULL 15/19] qemu-iotests: place valgrind log file in scratch dir, Kevin Wolf, 2016/04/15