From 8ef90e5001089e8a914a05c9192298a8865ef892 Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Thu, 10 Jul 2014 23:24:26 +0200 Subject: [PATCH 26/44] block: vhdx - fix comment typos in header, fix incorrect struct fields RH-Author: Jeffrey Cody Message-id: <88c26e6d87ef8bf7596f96923efea7a493c94fd5.1405033137.git.jcody@redhat.com> Patchwork-id: 59762 O-Subject: [RHEL6-6 qemu-kvm PATCH v2 17/24] block: vhdx - fix comment typos in header, fix incorrect struct fields Bugzilla: 1063559 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Fam Zheng RH-Acked-by: Markus Armbruster VHDXPage83Data and VHDXParentLocatorHeader both incorrectly had their MSGUID fields set as arrays of 16. This is incorrect (it stems from an early version where those fields were uint_8 arrays). Those fields were, up to this patch, unused. Also, there were a couple of typos and incorrect wording in comments, and those have been fixed up as well. Signed-off-by: Jeff Cody Signed-off-by: Stefan Hajnoczi (cherry picked from commit 61c02e5687dcc581c9d3413b61040b023adeaa9c) --- block/vhdx.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Signed-off-by: Miroslav Rezanina --- block/vhdx.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block/vhdx.h b/block/vhdx.h index f608672..184cdac 100644 --- a/block/vhdx.h +++ b/block/vhdx.h @@ -63,7 +63,7 @@ typedef struct VHDXFileIdentifier { uint64_t signature; /* "vhdxfile" in ASCII */ uint16_t creator[256]; /* optional; utf-16 string to identify - the vhdx file creator. Diagnotistic + the vhdx file creator. Diagnostic only */ } VHDXFileIdentifier; @@ -119,8 +119,8 @@ typedef struct QEMU_PACKED VHDXHeader { there is no valid log. If non-zero, log entries with this guid are valid. */ - uint16_t log_version; /* version of the log format. Mustn't be - zero, unless log_guid is also zero */ + uint16_t log_version; /* version of the log format. Must be + set to zero */ uint16_t version; /* version of the vhdx file. Currently, only supported version is "1" */ uint32_t log_length; /* length of the log. Must be multiple @@ -288,7 +288,7 @@ typedef struct QEMU_PACKED VHDXVirtualDiskSize { } VHDXVirtualDiskSize; typedef struct QEMU_PACKED VHDXPage83Data { - MSGUID page_83_data[16]; /* unique id for scsi devices that + MSGUID page_83_data; /* unique id for scsi devices that support page 0x83 */ } VHDXPage83Data; @@ -303,7 +303,7 @@ typedef struct QEMU_PACKED VHDXVirtualDiskPhysicalSectorSize { } VHDXVirtualDiskPhysicalSectorSize; typedef struct QEMU_PACKED VHDXParentLocatorHeader { - MSGUID locator_type[16]; /* type of the parent virtual disk. */ + MSGUID locator_type; /* type of the parent virtual disk. */ uint16_t reserved; uint16_t key_value_count; /* number of key/value pairs for this locator */ -- 1.7.1