From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, armbru@redhat.com, fam@euphon.net,
stefanha@redhat.com, eblake@redhat.com, hreitz@redhat.com,
kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com
Subject: [PATCH v6 07/16] block/reqlist: reqlist_find_conflict(): use ranges_overlap()
Date: Thu, 3 Mar 2022 20:43:40 +0100 [thread overview]
Message-ID: <20220303194349.2304213-8-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20220303194349.2304213-1-vsementsov@virtuozzo.com>
Let's reuse convenient helper.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
block/reqlist.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/reqlist.c b/block/reqlist.c
index 5e320ba649..09fecbd48c 100644
--- a/block/reqlist.c
+++ b/block/reqlist.c
@@ -13,6 +13,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/range.h"
#include "block/reqlist.h"
@@ -35,7 +36,7 @@ BlockReq *reqlist_find_conflict(BlockReqList *reqs, int64_t offset,
BlockReq *r;
QLIST_FOREACH(r, reqs, list) {
- if (offset + bytes > r->offset && offset < r->offset + r->bytes) {
+ if (ranges_overlap(offset, bytes, r->offset, r->bytes)) {
return r;
}
}
--
2.31.1
next prev parent reply other threads:[~2022-03-03 19:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-03 19:43 [PATCH v6 00/16] Make image fleecing more usable Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 01/16] block/block-copy: move copy_bitmap initialization to block_copy_state_new() Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 02/16] block/dirty-bitmap: bdrv_merge_dirty_bitmap(): add return value Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 03/16] block/block-copy: block_copy_state_new(): add bitmap parameter Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 04/16] block/copy-before-write: add bitmap open parameter Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 05/16] block/block-copy: add block_copy_reset() Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 06/16] block: intoduce reqlist Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` Vladimir Sementsov-Ogievskiy [this message]
2022-03-03 19:43 ` [PATCH v6 08/16] block/dirty-bitmap: introduce bdrv_dirty_bitmap_status() Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 09/16] block/reqlist: add reqlist_wait_all() Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 10/16] block/io: introduce block driver snapshot-access API Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 11/16] block: introduce snapshot-access block driver Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 12/16] block: copy-before-write: realize snapshot-access API Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 13/16] iotests/image-fleecing: add test-case for fleecing format node Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 14/16] iotests.py: add qemu_io_pipe_and_status() Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 15/16] iotests/image-fleecing: add test case with bitmap Vladimir Sementsov-Ogievskiy
2022-03-03 19:43 ` [PATCH v6 16/16] iotests/image-fleecing: test push backup with fleecing Vladimir Sementsov-Ogievskiy
2022-03-04 10:20 ` [PATCH v6 00/16] Make image fleecing more usable Hanna Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220303194349.2304213-8-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).