vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration/rdma: Replace dangerous macro CHECK_ERROR_STATE() 

Hiding return statements in macros is a bad idea.  Use a function
instead, and open code the return part.

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-20-armbru@redhat.com>
master
Markus Armbruster 2023-09-28 15:19:45 +02:00 committed by Juan Quintela
parent 8e262e0b3d
commit de3e05e8b9
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
migration/rdma.c
View File

@ -85,18 +85,6 @@
*/
static uint32_t known_capabilities = RDMA_CAPABILITY_PIN_ALL;
#define CHECK_ERROR_STATE() \
do { \
if (rdma->error_state) { \
if (!rdma->error_reported) { \
error_report("RDMA is in an error state waiting migration" \
" to abort!"); \
rdma->error_reported = true; \
} \
return rdma->error_state; \
} \
} while (0)
/*
* A work request ID is 64-bits and we split up these bits
* into 3 parts:
@ -451,6 +439,16 @@ typedef struct QEMU_PACKED {
uint64_t chunks; /* how many sequential chunks to register */
} RDMARegister;
static int check_error_state(RDMAContext *rdma)
{
if (rdma->error_state && !rdma->error_reported) {
error_report("RDMA is in an error state waiting migration"
" to abort!");
rdma->error_reported = true;
}
return rdma->error_state;
}
static void register_to_network(RDMAContext *rdma, RDMARegister *reg)
{
RDMALocalBlock *local_block;
@ -3268,7 +3266,10 @@ static int qemu_rdma_save_page(QEMUFile *f, ram_addr_t block_offset,
return -EIO;
}
CHECK_ERROR_STATE();
ret = check_error_state(rdma);
if (ret) {
return ret;
}
qemu_fflush(f);
@ -3574,7 +3575,10 @@ static int qemu_rdma_registration_handle(QEMUFile *f)
return -EIO;
}
CHECK_ERROR_STATE();
ret = check_error_state(rdma);
if (ret) {
return ret;
}
local = &rdma->local_ram_blocks;
do {
@ -3878,6 +3882,7 @@ static int qemu_rdma_registration_start(QEMUFile *f,
{
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
RDMAContext *rdma;
int ret;
if (migration_in_postcopy()) {
return 0;
@ -3889,7 +3894,10 @@ static int qemu_rdma_registration_start(QEMUFile *f,
return -EIO;
}
CHECK_ERROR_STATE();
ret = check_error_state(rdma);
if (ret) {
return ret;
}
trace_qemu_rdma_registration_start(flags);
qemu_put_be64(f, RAM_SAVE_FLAG_HOOK);
@ -3920,7 +3928,10 @@ static int qemu_rdma_registration_stop(QEMUFile *f,
return -EIO;
}
CHECK_ERROR_STATE();
ret = check_error_state(rdma);
if (ret) {
return ret;
}
qemu_fflush(f);
ret = qemu_rdma_drain_cq(rdma);