diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2015-12-02 18:34:39 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-01-20 13:36:23 +0100 |
| commit | b527c9b392a87abff698ca435da0dfa2bd6324a2 (patch) | |
| tree | a87643da38636b9561b0509a77d7625f3978e0ae /block/qcow2.c | |
| parent | 1a4828c7934f592c146bc3dc979e78df430545cf (diff) | |
qcow2: Write full header on image creation
When creating a qcow2 image, we didn't necessarily call
qcow2_update_header(), but could end up with the basic header that
qcow2_create2() created manually. One thing that this basic header
lacks is the feature table. Let's make sure that it's always present.
This requires a few updates to test cases as well.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 20e4057ca2..037afbf528 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2239,6 +2239,13 @@ static int qcow2_create2(const char *filename, int64_t total_size, abort(); } + /* Create a full header (including things like feature table) */ + ret = qcow2_update_header(bs); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not update qcow2 header"); + goto out; + } + /* Okay, now that we have a valid image, let's give it the right size */ ret = bdrv_truncate(bs, total_size); if (ret < 0) { |