|
 |
9ae3a8 |
From 39a68fd720126dd9c53af4f7fdeeecc0eeacc1ce Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <39a68fd720126dd9c53af4f7fdeeecc0eeacc1ce.1418766606.git.jen@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com>
|
|
|
9ae3a8 |
References: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com>
|
|
|
9ae3a8 |
From: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 4 Dec 2014 00:05:08 -0600
|
|
|
9ae3a8 |
Subject: [CHANGE 14/31] vmdk: correctly propagate errors
|
|
|
9ae3a8 |
To: rhvirt-patches@redhat.com,
|
|
|
9ae3a8 |
jen@redhat.com
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1417651524-18041-15-git-send-email-famz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 62687
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH v5 14/30] vmdk: correctly propagate errors
|
|
|
9ae3a8 |
Bugzilla: 1134251
|
|
|
9ae3a8 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Now that we can return the "right" errors, use the Error** parameter
|
|
|
9ae3a8 |
to pass them back instead of just printing them.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 89ac8480a8c7f73dd943dcb1313d6bd984f9a870)
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Jeff E. Nelson <jen@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/vmdk.c | 11 ++++++-----
|
|
|
9ae3a8 |
tests/qemu-iotests/059.out | 6 ++----
|
|
|
9ae3a8 |
2 files changed, 8 insertions(+), 9 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
|
9ae3a8 |
index 94f7dae..c7b930f 100644
|
|
|
9ae3a8 |
--- a/block/vmdk.c
|
|
|
9ae3a8 |
+++ b/block/vmdk.c
|
|
|
9ae3a8 |
@@ -572,6 +572,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
|
|
|
9ae3a8 |
error_setg_errno(errp, -ret,
|
|
|
9ae3a8 |
"Could not read header from file '%s'",
|
|
|
9ae3a8 |
file->filename);
|
|
|
9ae3a8 |
+ return -EINVAL;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
if (header.capacity == 0) {
|
|
|
9ae3a8 |
uint64_t desc_offset = le64_to_cpu(header.desc_offset);
|
|
|
9ae3a8 |
@@ -641,8 +642,8 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
|
|
|
9ae3a8 |
char buf[64];
|
|
|
9ae3a8 |
snprintf(buf, sizeof(buf), "VMDK version %d",
|
|
|
9ae3a8 |
le32_to_cpu(header.version));
|
|
|
9ae3a8 |
- qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
|
|
|
9ae3a8 |
- bs->device_name, "vmdk", buf);
|
|
|
9ae3a8 |
+ error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
|
|
|
9ae3a8 |
+ bs->device_name, "vmdk", buf);
|
|
|
9ae3a8 |
return -ENOTSUP;
|
|
|
9ae3a8 |
} else if (le32_to_cpu(header.version) == 3 && (flags & BDRV_O_RDWR)) {
|
|
|
9ae3a8 |
/* VMware KB 2064959 explains that version 3 added support for
|
|
|
9ae3a8 |
@@ -654,7 +655,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (le32_to_cpu(header.num_gtes_per_gt) > 512) {
|
|
|
9ae3a8 |
- error_report("L2 table size too big");
|
|
|
9ae3a8 |
+ error_setg(errp, "L2 table size too big");
|
|
|
9ae3a8 |
return -EINVAL;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -670,8 +671,8 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
if (bdrv_getlength(file) <
|
|
|
9ae3a8 |
le64_to_cpu(header.grain_offset) * BDRV_SECTOR_SIZE) {
|
|
|
9ae3a8 |
- error_report("File truncated, expecting at least %lld bytes",
|
|
|
9ae3a8 |
- le64_to_cpu(header.grain_offset) * BDRV_SECTOR_SIZE);
|
|
|
9ae3a8 |
+ error_setg(errp, "File truncated, expecting at least %lld bytes",
|
|
|
9ae3a8 |
+ le64_to_cpu(header.grain_offset) * BDRV_SECTOR_SIZE);
|
|
|
9ae3a8 |
return -EINVAL;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
|
|
|
9ae3a8 |
index 0220774..7c9ef90 100644
|
|
|
9ae3a8 |
--- a/tests/qemu-iotests/059.out
|
|
|
9ae3a8 |
+++ b/tests/qemu-iotests/059.out
|
|
|
9ae3a8 |
@@ -7,8 +7,7 @@ no file open, try 'help open'
|
|
|
9ae3a8 |
=== Testing too big L2 table size ===
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
9ae3a8 |
-L2 table size too big
|
|
|
9ae3a8 |
-qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Invalid argument
|
|
|
9ae3a8 |
+qemu-io: can't open device TEST_DIR/t.vmdk: L2 table size too big
|
|
|
9ae3a8 |
no file open, try 'help open'
|
|
|
9ae3a8 |
=== Testing too big L1 table size ===
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -2045,8 +2044,7 @@ RW 12582912 VMFS "dummy.IMGFMT" 1
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
=== Testing truncated sparse ===
|
|
|
9ae3a8 |
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400
|
|
|
9ae3a8 |
-qemu-img: File truncated, expecting at least 13172736 bytes
|
|
|
9ae3a8 |
-qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'TEST_DIR/t.IMGFMT': Invalid argument
|
|
|
9ae3a8 |
+qemu-img: Could not open 'TEST_DIR/t.IMGFMT': File truncated, expecting at least 13172736 bytes
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
=== Testing version 3 ===
|
|
|
9ae3a8 |
image: TEST_DIR/iotest-version3.IMGFMT
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
2.1.0
|
|
|
9ae3a8 |
|