From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjsRC-00009s-N1 for qemu-devel@nongnu.org; Sat, 15 Dec 2012 09:10:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TjsR9-0003QB-Ss for qemu-devel@nongnu.org; Sat, 15 Dec 2012 09:09:58 -0500 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:44110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjsR9-0003Q4-IE for qemu-devel@nongnu.org; Sat, 15 Dec 2012 09:09:55 -0500 From: Stefan Weil Date: Sat, 15 Dec 2012 15:09:32 +0100 Message-Id: <1355580573-19323-4-git-send-email-sw@weilnetz.de> In-Reply-To: <1355580573-19323-1-git-send-email-sw@weilnetz.de> References: <1355580573-19323-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH 3/4] block: Use new error code for wrong format in selected block drivers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi , Kevin Wolf Cc: Stefan Weil , qemu-devel@nongnu.org This improves error reports for bochs, cow, qcow, qcow2, qed and vmdk when a file with the wrong format is selected. Signed-off-by: Stefan Weil --- block/bochs.c | 2 +- block/cow.c | 2 +- block/qcow.c | 2 +- block/qcow2.c | 2 +- block/qed.c | 2 +- block/vmdk.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/block/bochs.c b/block/bochs.c index ab7944d..063dc3f 100644 --- a/block/bochs.c +++ b/block/bochs.c @@ -126,7 +126,7 @@ static int bochs_open(BlockDriverState *bs, int flags) strcmp(bochs.subtype, GROWING_TYPE) || ((le32_to_cpu(bochs.version) != HEADER_VERSION) && (le32_to_cpu(bochs.version) != HEADER_V1))) { - goto fail; + return BDRV_WRONG_FORMAT; } if (le32_to_cpu(bochs.version) == HEADER_V1) { diff --git a/block/cow.c b/block/cow.c index a5a00eb..7ae5ddc 100644 --- a/block/cow.c +++ b/block/cow.c @@ -73,7 +73,7 @@ static int cow_open(BlockDriverState *bs, int flags) } if (be32_to_cpu(cow_header.magic) != COW_MAGIC) { - ret = -EINVAL; + ret = BDRV_WRONG_FORMAT; goto fail; } diff --git a/block/qcow.c b/block/qcow.c index b239c82..d1be009 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -112,7 +112,7 @@ static int qcow_open(BlockDriverState *bs, int flags) be64_to_cpus(&header.l1_table_offset); if (header.magic != QCOW_MAGIC) { - ret = -EINVAL; + ret = BDRV_WRONG_FORMAT; goto fail; } if (header.version != QCOW_VERSION) { diff --git a/block/qcow2.c b/block/qcow2.c index 8520bda..f22e387 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -311,7 +311,7 @@ static int qcow2_open(BlockDriverState *bs, int flags) be32_to_cpus(&header.nb_snapshots); if (header.magic != QCOW_MAGIC) { - ret = -EINVAL; + ret = BDRV_WRONG_FORMAT; goto fail; } if (header.version < 2 || header.version > 3) { diff --git a/block/qed.c b/block/qed.c index 0b5374a..58bd35c 100644 --- a/block/qed.c +++ b/block/qed.c @@ -390,7 +390,7 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) qed_header_le_to_cpu(&le_header, &s->header); if (s->header.magic != QED_MAGIC) { - return -EINVAL; + return BDRV_WRONG_FORMAT; } if (s->header.features & ~QED_FEATURE_MASK) { /* image uses unsupported feature bits */ diff --git a/block/vmdk.c b/block/vmdk.c index 51398c0..931ffbc 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -616,7 +616,7 @@ static int vmdk_open_sparse(BlockDriverState *bs, return vmdk_open_vmdk4(bs, file, flags); break; default: - return -EINVAL; + return BDRV_WRONG_FORMAT; break; } } @@ -718,7 +718,7 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags, } buf[2047] = '\0'; if (vmdk_parse_description(buf, "createType", ct, sizeof(ct))) { - return -EINVAL; + return BDRV_WRONG_FORMAT; } if (strcmp(ct, "monolithicFlat") && strcmp(ct, "twoGbMaxExtentSparse") && -- 1.7.10.4