[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.6 6/7] block/vpc: set errp in vpc_open
From: |
Jeff Cody |
Subject: |
[Qemu-devel] [PATCH for-2.6 6/7] block/vpc: set errp in vpc_open |
Date: |
Tue, 22 Mar 2016 23:33:43 -0400 |
Add more useful error information to failure paths in vpc_open
Signed-off-by: Jeff Cody <address@hidden>
---
block/vpc.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/block/vpc.c b/block/vpc.c
index 67ab376..5dd9950 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -237,6 +237,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;
}
@@ -245,9 +246,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;
}
@@ -326,12 +329,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;
}
@@ -347,12 +352,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;
}
@@ -369,6 +376,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;
}
@@ -378,6 +386,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.9.3
- [Qemu-devel] [PATCH for-2.6 0/7] block: VHD format fixes, Jeff Cody, 2016/03/22
- [Qemu-devel] [PATCH for-2.6 4/7] block/vpc: Use the correct max sector count for VHD images, Jeff Cody, 2016/03/22
- [Qemu-devel] [PATCH for-2.6 1/7] block/vpc: fix VPC 'qemu-img create' regression, Jeff Cody, 2016/03/22
- [Qemu-devel] [PATCH for-2.6 2/7] vpc: use current_size field for XenServer VHD images, Jeff Cody, 2016/03/22
- [Qemu-devel] [PATCH for-2.6 3/7] block/vpc: use current_size field for XenConverter VHD images, Jeff Cody, 2016/03/22
- [Qemu-devel] [PATCH for-2.6 5/7] block/vpc: make checks on max table size a bit more lax, Jeff Cody, 2016/03/22
- [Qemu-devel] [PATCH for-2.6 7/7] block/vpc: update comments to be compliant w/coding guidelines, Jeff Cody, 2016/03/22
- [Qemu-devel] [PATCH for-2.6 6/7] block/vpc: set errp in vpc_open,
Jeff Cody <=
- Re: [Qemu-devel] [PATCH for-2.6 0/7] block: VHD format fixes, Stefan Hajnoczi, 2016/03/23