summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-05-14 12:35:02 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2015-05-22 09:37:33 +0100
commita53f1a95f9605f300fbafbc8b60b8a8c67e9c4b4 (patch)
treeafe27076736dd4f812701052227080572dabcf4e /block
parentab53c44718305d3fde3d9d2251889f1cab694be2 (diff)
downloadhqemu-a53f1a95f9605f300fbafbc8b60b8a8c67e9c4b4.zip
hqemu-a53f1a95f9605f300fbafbc8b60b8a8c67e9c4b4.tar.gz
block: get_block_status: use "else" when testing the opposite condition
A bit of Boolean algebra (and common sense) tells us that the second "if" here is looking for blocks that are not allocated. This is the opposite of the "if" that sets BDRV_BLOCK_ALLOCATED, and thus it can use an "else". Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Message-id: 1431599702-10431-1-git-send-email-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/io.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/block/io.c b/block/io.c
index 284784e..e394d92 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1521,9 +1521,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
if (ret & (BDRV_BLOCK_DATA | BDRV_BLOCK_ZERO)) {
ret |= BDRV_BLOCK_ALLOCATED;
- }
-
- if (!(ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO)) {
+ } else {
if (bdrv_unallocated_blocks_are_zero(bs)) {
ret |= BDRV_BLOCK_ZERO;
} else if (bs->backing_hd) {
OpenPOWER on IntegriCloud