Skip to content

Commit

Permalink
migration/rdma: Make qemu_rdma_buffer_mergeable() return bool
Browse files Browse the repository at this point in the history
qemu_rdma_buffer_mergeable() is semantically a predicate.  It returns
int 0 or 1.  Return bool instead, and fix the function name's
spelling.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230928132019.2544702-15-armbru@redhat.com>
  • Loading branch information
Markus Armbruster authored and Juan Quintela committed Oct 11, 2023
1 parent 87e6bda commit 6a3792d
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions migration/rdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -2264,49 +2264,49 @@ static int qemu_rdma_write_flush(RDMAContext *rdma)
return 0;
}

static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma,
static inline bool qemu_rdma_buffer_mergeable(RDMAContext *rdma,
uint64_t offset, uint64_t len)
{
RDMALocalBlock *block;
uint8_t *host_addr;
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]);
host_addr = block->local_host_addr + (offset - block->offset);
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;
}

/*
Expand All @@ -2329,7 +2329,7 @@ static int qemu_rdma_write(RDMAContext *rdma,
int ret;

/* If we cannot merge it, we flush the current buffer first. */
if (!qemu_rdma_buffer_mergable(rdma, current_addr, len)) {
if (!qemu_rdma_buffer_mergeable(rdma, current_addr, len)) {
ret = qemu_rdma_write_flush(rdma);
if (ret) {
return ret;
Expand Down

0 comments on commit 6a3792d

Please sign in to comment.