[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/10] qcow2: Check qcow2_alloc_clusters_at() return
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 06/10] qcow2: Check qcow2_alloc_clusters_at() return value |
Date: |
Fri, 25 May 2012 19:38:50 +0200 |
When using qcow2_alloc_clusters_at(), the cluster allocation code
checked the wrong variable for an error code.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-cluster.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 10c22fe..4b3345b 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -762,7 +762,6 @@ static int do_alloc_cluster_offset(BlockDriverState *bs,
uint64_t guest_offset,
uint64_t *host_offset, unsigned int *nb_clusters)
{
BDRVQcowState *s = bs->opaque;
- int64_t cluster_offset;
QCowL2Meta *old_alloc;
trace_qcow2_do_alloc_clusters_offset(qemu_coroutine_self(), guest_offset,
@@ -808,17 +807,21 @@ static int do_alloc_cluster_offset(BlockDriverState *bs,
uint64_t guest_offset,
/* Allocate new clusters */
trace_qcow2_cluster_alloc_phys(qemu_coroutine_self());
if (*host_offset == 0) {
- cluster_offset = qcow2_alloc_clusters(bs, *nb_clusters *
s->cluster_size);
+ int64_t cluster_offset =
+ qcow2_alloc_clusters(bs, *nb_clusters * s->cluster_size);
+ if (cluster_offset < 0) {
+ return cluster_offset;
+ }
+ *host_offset = cluster_offset;
+ return 0;
} else {
- cluster_offset = *host_offset;
- *nb_clusters = qcow2_alloc_clusters_at(bs, cluster_offset,
*nb_clusters);
- }
-
- if (cluster_offset < 0) {
- return cluster_offset;
+ int ret = qcow2_alloc_clusters_at(bs, *host_offset, *nb_clusters);
+ if (ret < 0) {
+ return ret;
+ }
+ *nb_clusters = ret;
+ return 0;
}
- *host_offset = cluster_offset;
- return 0;
}
/*
--
1.7.6.5
- [Qemu-devel] [PULL 00/10] Block patches for 1.1, Kevin Wolf, 2012/05/25
- [Qemu-devel] [PATCH 01/10] qcow2: don't leak buffer for unexpected qcow_version in header, Kevin Wolf, 2012/05/25
- [Qemu-devel] [PATCH 02/10] qemu-img: Explain how rebase operation can be used to perform a 'diff' operation., Kevin Wolf, 2012/05/25
- [Qemu-devel] [PATCH 03/10] sheepdog: mark image as snapshot when tag is specified, Kevin Wolf, 2012/05/25
- [Qemu-devel] [PATCH 04/10] sheepdog: return -errno on error, Kevin Wolf, 2012/05/25
- [Qemu-devel] [PATCH 06/10] qcow2: Check qcow2_alloc_clusters_at() return value,
Kevin Wolf <=
- [Qemu-devel] [PATCH 05/10] sheepdog: use heap instead of stack for BDRVSheepdogState, Kevin Wolf, 2012/05/25
- [Qemu-devel] [PATCH 09/10] fdc: fix media detection, Kevin Wolf, 2012/05/25
- [Qemu-devel] [PATCH 08/10] fdc: floppy drive should be visible after start without media, Kevin Wolf, 2012/05/25
- [Qemu-devel] [PATCH 07/10] qemu-iotests: mark 035 qcow2-only, Kevin Wolf, 2012/05/25
- [Qemu-devel] [PATCH 10/10] fdc-test: introduced qtest no_media_on_start and cmos qtest for floppy, Kevin Wolf, 2012/05/25
- Re: [Qemu-devel] [PULL 00/10] Block patches for 1.1, Anthony Liguori, 2012/05/29