|
 |
0a122b |
From 25ed81be92c2171ceae075daa9823e01d7f90da3 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Jeffrey Cody <jcody@redhat.com>
|
|
|
0a122b |
Date: Wed, 20 Nov 2013 19:44:04 +0100
|
|
|
0a122b |
Subject: [PATCH 21/25] block: vhdx - fix comment typos in header, fix incorrect struct fields
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Jeffrey Cody <jcody@redhat.com>
|
|
|
0a122b |
Message-id: <65dd76628b4fc349d4a5f58f433e2e682881e85f.1384975172.git.jcody@redhat.com>
|
|
|
0a122b |
Patchwork-id: 55813
|
|
|
0a122b |
O-Subject: [RHEL7 qemu-kvm PATCH 21/26] block: vhdx - fix comment typos in header, fix incorrect struct fields
|
|
|
0a122b |
Bugzilla: 879234
|
|
|
0a122b |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
VHDXPage83Data and VHDXParentLocatorHeader both incorrectly had their
|
|
|
0a122b |
MSGUID fields set as arrays of 16. This is incorrect (it stems from
|
|
|
0a122b |
an early version where those fields were uint_8 arrays). Those fields
|
|
|
0a122b |
were, up to this patch, unused.
|
|
|
0a122b |
|
|
|
0a122b |
Also, there were a couple of typos and incorrect wording in comments,
|
|
|
0a122b |
and those have been fixed up as well.
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
0a122b |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
0a122b |
(cherry picked from commit 61c02e5687dcc581c9d3413b61040b023adeaa9c)
|
|
|
0a122b |
---
|
|
|
0a122b |
block/vhdx.h | 10 +++++-----
|
|
|
0a122b |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
block/vhdx.h | 10 +++++-----
|
|
|
0a122b |
1 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/block/vhdx.h b/block/vhdx.h
|
|
|
0a122b |
index 0acad37..245547b 100644
|
|
|
0a122b |
--- a/block/vhdx.h
|
|
|
0a122b |
+++ b/block/vhdx.h
|
|
|
0a122b |
@@ -58,7 +58,7 @@
|
|
|
0a122b |
typedef struct VHDXFileIdentifier {
|
|
|
0a122b |
uint64_t signature; /* "vhdxfile" in ASCII */
|
|
|
0a122b |
uint16_t creator[256]; /* optional; utf-16 string to identify
|
|
|
0a122b |
- the vhdx file creator. Diagnotistic
|
|
|
0a122b |
+ the vhdx file creator. Diagnostic
|
|
|
0a122b |
only */
|
|
|
0a122b |
} VHDXFileIdentifier;
|
|
|
0a122b |
|
|
|
0a122b |
@@ -114,8 +114,8 @@ typedef struct QEMU_PACKED VHDXHeader {
|
|
|
0a122b |
there is no valid log. If non-zero,
|
|
|
0a122b |
log entries with this guid are
|
|
|
0a122b |
valid. */
|
|
|
0a122b |
- uint16_t log_version; /* version of the log format. Mustn't be
|
|
|
0a122b |
- zero, unless log_guid is also zero */
|
|
|
0a122b |
+ uint16_t log_version; /* version of the log format. Must be
|
|
|
0a122b |
+ set to zero */
|
|
|
0a122b |
uint16_t version; /* version of the vhdx file. Currently,
|
|
|
0a122b |
only supported version is "1" */
|
|
|
0a122b |
uint32_t log_length; /* length of the log. Must be multiple
|
|
|
0a122b |
@@ -281,7 +281,7 @@ typedef struct QEMU_PACKED VHDXVirtualDiskSize {
|
|
|
0a122b |
} VHDXVirtualDiskSize;
|
|
|
0a122b |
|
|
|
0a122b |
typedef struct QEMU_PACKED VHDXPage83Data {
|
|
|
0a122b |
- MSGUID page_83_data[16]; /* unique id for scsi devices that
|
|
|
0a122b |
+ MSGUID page_83_data; /* unique id for scsi devices that
|
|
|
0a122b |
support page 0x83 */
|
|
|
0a122b |
} VHDXPage83Data;
|
|
|
0a122b |
|
|
|
0a122b |
@@ -296,7 +296,7 @@ typedef struct QEMU_PACKED VHDXVirtualDiskPhysicalSectorSize {
|
|
|
0a122b |
} VHDXVirtualDiskPhysicalSectorSize;
|
|
|
0a122b |
|
|
|
0a122b |
typedef struct QEMU_PACKED VHDXParentLocatorHeader {
|
|
|
0a122b |
- MSGUID locator_type[16]; /* type of the parent virtual disk. */
|
|
|
0a122b |
+ MSGUID locator_type; /* type of the parent virtual disk. */
|
|
|
0a122b |
uint16_t reserved;
|
|
|
0a122b |
uint16_t key_value_count; /* number of key/value pairs for this
|
|
|
0a122b |
locator */
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|