diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2011-02-09 11:11:07 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-02-10 13:23:56 +0100 |
| commit | e8cdcec123facf0ed273d941caeeeb9b08f14955 (patch) | |
| tree | f32fc9017ea043c01b554724210ed85861f56414 /block | |
| parent | f54e3641122e51c6343d587805422642f307462e (diff) | |
| download | qemu-e8cdcec123facf0ed273d941caeeeb9b08f14955.zip qemu-e8cdcec123facf0ed273d941caeeeb9b08f14955.tar.gz qemu-e8cdcec123facf0ed273d941caeeeb9b08f14955.tar.bz2 | |
qcow2: Report error for version > 2
The qcow2 driver is now declared responsible for any QCOW image that has
version 2 or greater (before this, version 3 would be detected as raw).
For everything newer than version 2, an error is reported.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 551b3c2..75b8bec 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -28,6 +28,7 @@ #include "aes.h" #include "block/qcow2.h" #include "qemu-error.h" +#include "qerror.h" /* Differences with QCOW: @@ -59,7 +60,7 @@ static int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename) if (buf_size >= sizeof(QCowHeader) && be32_to_cpu(cow_header->magic) == QCOW_MAGIC && - be32_to_cpu(cow_header->version) == QCOW_VERSION) + be32_to_cpu(cow_header->version) >= QCOW_VERSION) return 100; else return 0; @@ -163,10 +164,18 @@ static int qcow2_open(BlockDriverState *bs, int flags) be64_to_cpus(&header.snapshots_offset); be32_to_cpus(&header.nb_snapshots); - if (header.magic != QCOW_MAGIC || header.version != QCOW_VERSION) { + if (header.magic != QCOW_MAGIC) { ret = -EINVAL; goto fail; } + if (header.version != QCOW_VERSION) { + char version[64]; + snprintf(version, sizeof(version), "QCOW version %d", header.version); + qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, + bs->device_name, "qcow2", version); + ret = -ENOTSUP; + goto fail; + } if (header.cluster_bits < MIN_CLUSTER_BITS || header.cluster_bits > MAX_CLUSTER_BITS) { ret = -EINVAL; |