diff options
| author | Kevin Wolf | 2013-03-26 17:49:57 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2013-03-28 11:52:43 +0100 |
| commit | d9d74f4177af59bec23baa480d640709f56df0aa (patch) | |
| tree | 6449b4dbf64d71238416e1a1ce2a2ca28c51caaa /block | |
| parent | qcow2: Handle dependencies earlier (diff) | |
| download | qemu-d9d74f4177af59bec23baa480d640709f56df0aa.tar.gz qemu-d9d74f4177af59bec23baa480d640709f56df0aa.tar.xz qemu-d9d74f4177af59bec23baa480d640709f56df0aa.zip | |
qcow2: Improve check for overlapping allocations
The old code detected an overlapping allocation even when the
allocations didn't actually overlap, but were only adjacent.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2-cluster.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 71e027adc9..7f4f73eaca 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -773,7 +773,7 @@ static int handle_dependencies(BlockDriverState *bs, uint64_t guest_offset, uint64_t old_start = old_alloc->offset >> s->cluster_bits; uint64_t old_end = old_start + old_alloc->nb_clusters; - if (end < old_start || start > old_end) { + if (end <= old_start || start >= old_end) { /* No intersection */ } else { if (start < old_start) { |