motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration/rdma: Convert qemu_rdma_write() to Error

Browse source 
Just for consistency with qemu_rdma_write_one() and
qemu_rdma_write_flush(), and for slightly simpler code.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
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-42-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2023-09-28 15:20:07 +02:00 • committed by Juan Quintela
parent 557c34ca60
commit 446e559c43
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
migration/rdma.c
View file

@ -2359,9 +2359,8 @@ static inline bool qemu_rdma_buffer_mergeable(RDMAContext *rdma,
*/ */
static int qemu_rdma_write(RDMAContext *rdma, static int qemu_rdma_write(RDMAContext *rdma,
uint64_t block_offset, uint64_t offset, uint64_t block_offset, uint64_t offset,
uint64_t len) uint64_t len, Error **errp)
{ {
Error *err = NULL;
uint64_t current_addr = block_offset + offset; uint64_t current_addr = block_offset + offset;
uint64_t index = rdma->current_index; uint64_t index = rdma->current_index;
uint64_t chunk = rdma->current_chunk; uint64_t chunk = rdma->current_chunk;
@ -2369,9 +2368,8 @@ static int qemu_rdma_write(RDMAContext *rdma,
/* If we cannot merge it, we flush the current buffer first. */ /* If we cannot merge it, we flush the current buffer first. */
if (!qemu_rdma_buffer_mergeable(rdma, current_addr, len)) { if (!qemu_rdma_buffer_mergeable(rdma, current_addr, len)) {
ret = qemu_rdma_write_flush(rdma, &err); ret = qemu_rdma_write_flush(rdma, errp);
if (ret < 0) { if (ret < 0) {
error_report_err(err);
return -1; return -1;
} }
rdma->current_length = 0; rdma->current_length = 0;
@ -2388,10 +2386,7 @@ static int qemu_rdma_write(RDMAContext *rdma,
/* flush it if buffer is too large */ /* flush it if buffer is too large */
if (rdma->current_length >= RDMA_MERGE_MAX) { if (rdma->current_length >= RDMA_MERGE_MAX) {
if (qemu_rdma_write_flush(rdma, &err) < 0) { return qemu_rdma_write_flush(rdma, errp);
error_report_err(err);
return -1;
}
} }
return 0; return 0;
@ -3290,6 +3285,7 @@ static int qemu_rdma_save_page(QEMUFile *f, ram_addr_t block_offset,
ram_addr_t offset, size_t size) ram_addr_t offset, size_t size)
{ {
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f)); QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
Error *err = NULL;
RDMAContext *rdma; RDMAContext *rdma;
int ret; int ret;
@ -3315,9 +3311,9 @@ static int qemu_rdma_save_page(QEMUFile *f, ram_addr_t block_offset,
* is full, or the page doesn't belong to the current chunk, * is full, or the page doesn't belong to the current chunk,
* an actual RDMA write will occur and a new chunk will be formed. * an actual RDMA write will occur and a new chunk will be formed.
*/ */
ret = qemu_rdma_write(rdma, block_offset, offset, size); ret = qemu_rdma_write(rdma, block_offset, offset, size, &err);
if (ret < 0) { if (ret < 0) {
error_report("rdma migration: write error"); error_report_err(err);
goto err; goto err;
} }