qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Jeff Cody <jcody@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PULL 18/36] block: vhdx - minor comments and typo correction.
Date: Thu,  7 Nov 2013 14:12:26 +0100	[thread overview]
Message-ID: <1383829964-32364-19-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1383829964-32364-1-git-send-email-stefanha@redhat.com>

From: Jeff Cody <jcody@redhat.com>

Just a couple of minor comments to help note where allocated
buffers are freed, and a typo fix.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/vhdx.c | 6 ++++--
 block/vhdx.h | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/block/vhdx.c b/block/vhdx.c
index 6cb0412..b497c27 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -6,9 +6,9 @@
  * Authors:
  *  Jeff Cody <jcody@redhat.com>
  *
- *  This is based on the "VHDX Format Specification v0.95", published 4/12/2012
+ *  This is based on the "VHDX Format Specification v1.00", published 8/25/2012
  *  by Microsoft:
- *      https://www.microsoft.com/en-us/download/details.aspx?id=29681
+ *      https://www.microsoft.com/en-us/download/details.aspx?id=34750
  *
  * This work is licensed under the terms of the GNU LGPL, version 2 or later.
  * See the COPYING.LIB file in the top-level directory.
@@ -264,6 +264,7 @@ static int vhdx_parse_header(BlockDriverState *bs, BDRVVHDXState *s)
     uint64_t h2_seq = 0;
     uint8_t *buffer;
 
+    /* header1 & header2 are freed in vhdx_close() */
     header1 = qemu_blockalign(bs, sizeof(VHDXHeader));
     header2 = qemu_blockalign(bs, sizeof(VHDXHeader));
 
@@ -790,6 +791,7 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,
         goto fail;
     }
 
+    /* s->bat is freed in vhdx_close() */
     s->bat = qemu_blockalign(bs, s->bat_rt.length);
 
     ret = bdrv_pread(bs->file, s->bat_offset, s->bat, s->bat_rt.length);
diff --git a/block/vhdx.h b/block/vhdx.h
index fb687ed..9eb6b97 100644
--- a/block/vhdx.h
+++ b/block/vhdx.h
@@ -6,9 +6,9 @@
  * Authors:
  *  Jeff Cody <jcody@redhat.com>
  *
- *  This is based on the "VHDX Format Specification v0.95", published 4/12/2012
+ *  This is based on the "VHDX Format Specification v1.00", published 8/25/2012
  *  by Microsoft:
- *      https://www.microsoft.com/en-us/download/details.aspx?id=29681
+ *      https://www.microsoft.com/en-us/download/details.aspx?id=34750
  *
  * This work is licensed under the terms of the GNU LGPL, version 2 or later.
  * See the COPYING.LIB file in the top-level directory.
@@ -116,7 +116,7 @@ typedef struct QEMU_PACKED VHDXHeader {
                                            valid. */
     uint16_t    log_version;            /* version of the log format. Mustn't be
                                            zero, unless log_guid is also zero */
-    uint16_t    version;                /* version of th evhdx file.  Currently,
+    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
                                            of 1MB */
-- 
1.8.3.1

  parent reply	other threads:[~2013-11-07 13:14 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-07 13:12 [Qemu-devel] [PULL for-1.7 00/36] Block patches Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 01/36] qapi: Fix comment for create-type to match code Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 02/36] qemu-iotests: Filter out actual image size in 067 Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 03/36] block/raw-posix: fix FreeBSD compilation Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 04/36] block: qemu-iotests, add quotes to $TEST_IMG usage io pattern tests Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 05/36] block: qemu-iotests, fix _make_test_img() to work with spaced pathnames Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 06/36] block: qemu-iotests, add quotes to $TEST_IMG.base usage in 017 Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 07/36] block: qemu-iotests, add quotes to $TEST_IMG usage in 019 Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 08/36] block: qemu-iotests, removes duplicate double quotes in 039 Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 09/36] block: qemu-iotests, add quotes to $TEST_IMG usage for 051 Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 10/36] block: qemu-iotests, add quotes to $TEST_IMG usage in 061 Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 11/36] blockdev: fix drive_init() opts and bs_opts leaks Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 12/36] libqtest: rename qmp() to qmp_discard_response() Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 13/36] libqtest: add qmp(fmt, ...) -> QDict* function Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 14/36] blockdev-test: add test case for drive_add duplicate IDs Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 15/36] qdev-monitor-test: add device_add leak test cases Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 16/36] block: Save errno before error_setg_errno Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 17/36] block/vpc: fix virtual size for images created with disk2vhd Stefan Hajnoczi
2013-11-07 13:12 ` Stefan Hajnoczi [this message]
2013-11-07 13:12 ` [Qemu-devel] [PULL 19/36] block: vhdx - add header update capability Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 20/36] block: vhdx code movement - VHDXMetadataEntries and BDRVVHDXState to header Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 21/36] block: vhdx - log support struct and defines Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 22/36] block: vhdx - break endian translation functions out Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 23/36] block: vhdx - update log guid in header, and first write tracker Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 24/36] block: vhdx code movement - move vhdx_close() above vhdx_open() Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 25/36] block: vhdx - log parsing, replay, and flush support Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 26/36] block: vhdx - add region overlap detection for image files Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 27/36] block: vhdx - add log write support Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 28/36] block: vhdx " Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 29/36] block: vhdx - remove BAT file offset bit shifting Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 30/36] block: vhdx - move more endian translations to vhdx-endian.c Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 31/36] block: vhdx - break out code operations to functions Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 32/36] block: vhdx - fix comment typos in header, fix incorrect struct fields Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 33/36] block: vhdx - add .bdrv_create() support Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 34/36] block: vhdx - update _make_test_img() to filter out vhdx options Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 35/36] block: qemu-iotests for vhdx, add write test support Stefan Hajnoczi
2013-11-07 13:12 ` [Qemu-devel] [PULL 36/36] block: vhdx qemu-iotest - log replay of data sector Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1383829964-32364-19-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=jcody@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).