diff options
author | Max Reitz <mreitz@redhat.com> | 2013-10-10 11:09:23 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2013-10-11 16:50:00 +0200 |
commit | 231bb267644ee3a9ebfd9c7f42d5d41610194b45 (patch) | |
tree | 5778398902494b84ce570a4901c9893cf36ed664 /block/qcow2-cache.c | |
parent | 8f94a6e40e46cbc8e8014da825d25824b1803b34 (diff) | |
download | qemu-231bb267644ee3a9ebfd9c7f42d5d41610194b45.zip qemu-231bb267644ee3a9ebfd9c7f42d5d41610194b45.tar.gz qemu-231bb267644ee3a9ebfd9c7f42d5d41610194b45.tar.bz2 |
qcow2: Use negated overflow check mask
In qcow2_check_metadata_overlap and qcow2_pre_write_overlap_check,
change the parameter signifying the checks to perform from its current
positive form to a negative one, i.e., it will no longer explicitly
specify every check to perform but rather a mask of checks not to
perform.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/qcow2-cache.c')
-rw-r--r-- | block/qcow2-cache.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c index 40a5a3f..8ecbb5b 100644 --- a/block/qcow2-cache.c +++ b/block/qcow2-cache.c @@ -115,15 +115,13 @@ static int qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i) } if (c == s->refcount_block_cache) { - ret = qcow2_pre_write_overlap_check(bs, - QCOW2_OL_DEFAULT & ~QCOW2_OL_REFCOUNT_BLOCK, + ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_REFCOUNT_BLOCK, c->entries[i].offset, s->cluster_size); } else if (c == s->l2_table_cache) { - ret = qcow2_pre_write_overlap_check(bs, - QCOW2_OL_DEFAULT & ~QCOW2_OL_ACTIVE_L2, + ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_ACTIVE_L2, c->entries[i].offset, s->cluster_size); } else { - ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT, + ret = qcow2_pre_write_overlap_check(bs, 0, c->entries[i].offset, s->cluster_size); } |