diff mbox series

[13/52] migration/rdma: Make qemu_rdma_buffer_mergable() return bool

Message ID 20230918144206.560120-14-armbru@redhat.com
State New
Headers show
Series migration/rdma: Error handling fixes | expand

Commit Message

Markus Armbruster Sept. 18, 2023, 2:41 p.m. UTC 
qemu_rdma_buffer_mergable() is semantically a predicate.  It returns
int 0 or 1.  Return bool instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 migration/rdma.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Fabiano Rosas Sept. 18, 2023, 5:36 p.m. UTC | #1 
Markus Armbruster <armbru@redhat.com> writes:

> qemu_rdma_buffer_mergable() is semantically a predicate.  It returns
> int 0 or 1.  Return bool instead.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Li Zhijian Sept. 22, 2023, 7:51 a.m. UTC | #2 
On 18/09/2023 22:41, Markus Armbruster wrote:
> qemu_rdma_buffer_mergable() is semantically a predicate.  It returns
> int 0 or 1.  Return bool instead.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Eric Blake Sept. 27, 2023, 4:26 p.m. UTC | #3 
On Mon, Sep 18, 2023 at 04:41:27PM +0200, Markus Armbruster wrote:
> qemu_rdma_buffer_mergable() is semantically a predicate.  It returns
> int 0 or 1.  Return bool instead.

While at it, this would be a perfect time to s/mergable/mergeable/g

> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  migration/rdma.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
Markus Armbruster Sept. 27, 2023, 7:04 p.m. UTC | #4 
Eric Blake <eblake@redhat.com> writes:

> On Mon, Sep 18, 2023 at 04:41:27PM +0200, Markus Armbruster wrote:
>> qemu_rdma_buffer_mergable() is semantically a predicate.  It returns
>> int 0 or 1.  Return bool instead.
>
> While at it, this would be a perfect time to s/mergable/mergeable/g

Will do, thanks!
diff mbox series

Patch

diff --git a/migration/rdma.c b/migration/rdma.c
index 98520a42b4..97715dbd78 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -2246,7 +2246,7 @@  static int qemu_rdma_write_flush(QEMUFile *f, RDMAContext *rdma)
     return 0;
 }
 
-static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma,
+static inline bool qemu_rdma_buffer_mergable(RDMAContext *rdma,
                     uint64_t offset, uint64_t len)
 {
     RDMALocalBlock *block;
@@ -2254,11 +2254,11 @@  static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma,
     uint8_t *chunk_end;
 
     if (rdma->current_index < 0) {
-        return 0;
+        return false;
     }
 
     if (rdma->current_chunk < 0) {
-        return 0;
+        return false;
     }
 
     block = &(rdma->local_ram_blocks.block[rdma->current_index]);
@@ -2266,29 +2266,29 @@  static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma,
     chunk_end = ram_chunk_end(block, rdma->current_chunk);
 
     if (rdma->current_length == 0) {
-        return 0;
+        return false;
     }
 
     /*
      * Only merge into chunk sequentially.
      */
     if (offset != (rdma->current_addr + rdma->current_length)) {
-        return 0;
+        return false;
     }
 
     if (offset < block->offset) {
-        return 0;
+        return false;
     }
 
     if ((offset + len) > (block->offset + block->length)) {
-        return 0;
+        return false;
     }
 
     if ((host_addr + len) > chunk_end) {
-        return 0;
+        return false;
     }
 
-    return 1;
+    return true;
 }
 
 /*