[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/7] vmdk: byteswap VMDK4Header.desc_offset field
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 4/7] vmdk: byteswap VMDK4Header.desc_offset field |
Date: |
Mon, 17 Jun 2013 18:31:47 +0200 |
From: Stefan Hajnoczi <address@hidden>
Remember to byteswap VMDK4Header.desc_offset on big-endian machines.
Cc: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vmdk.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 608daaf..ee50a73 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -507,8 +507,11 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
if (ret < 0) {
return ret;
}
- if (header.capacity == 0 && header.desc_offset) {
- return vmdk_open_desc_file(bs, flags, header.desc_offset << 9);
+ if (header.capacity == 0) {
+ int64_t desc_offset = le64_to_cpu(header.desc_offset);
+ if (desc_offset) {
+ return vmdk_open_desc_file(bs, flags, desc_offset << 9);
+ }
}
if (le64_to_cpu(header.gd_offset) == VMDK4_GD_AT_END) {
--
1.8.1.4
- [Qemu-devel] [PULL 0/7] Block patches, Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 2/7] sheepdog: support 'qemu-img snapshot -a', Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 1/7] sheepdog: fix snapshot tag initialization, Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 4/7] vmdk: byteswap VMDK4Header.desc_offset field,
Kevin Wolf <=
- [Qemu-devel] [PULL 5/7] curl: Don't set curl options on the handle just before it's going to be deleted., Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 3/7] block/curl.c: Refuse to open the handle for writes., Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 7/7] vmdk: Allow reading variable size descriptor files, Kevin Wolf, 2013/06/17
- [Qemu-devel] [PULL 6/7] NVMe: Initial commit for new storage interface, Kevin Wolf, 2013/06/17
- Re: [Qemu-devel] [PULL 0/7] Block patches, Anthony Liguori, 2013/06/17