ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration/rdma: Remove QEMUFile parameter when not used 

Reviewed-by: Leonardo Bras <leobras@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230515195709.63843-13-quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-05-15 21:57:05 +02:00
parent 19df4f3226
commit e33780351c
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
migration/rdma.c
View File

@ -2027,7 +2027,7 @@ static int qemu_rdma_exchange_recv(RDMAContext *rdma, RDMAControlHeader *head,
* If we're using dynamic registration on the dest-side, we have to * If we're using dynamic registration on the dest-side, we have to
* send a registration command first. * send a registration command first.
*/ */
static int qemu_rdma_write_one(QEMUFile *f, RDMAContext *rdma, static int qemu_rdma_write_one(RDMAContext *rdma,
int current_index, uint64_t current_addr, int current_index, uint64_t current_addr,
uint64_t length) uint64_t length)
{ {
@ -2263,7 +2263,7 @@ retry:
* We support sending out multiple chunks at the same time. * We support sending out multiple chunks at the same time.
* Not all of them need to get signaled in the completion queue. * Not all of them need to get signaled in the completion queue.
*/ */
static int qemu_rdma_write_flush(QEMUFile *f, RDMAContext *rdma) static int qemu_rdma_write_flush(RDMAContext *rdma)
{ {
int ret; int ret;
@ -2271,7 +2271,7 @@ static int qemu_rdma_write_flush(QEMUFile *f, RDMAContext *rdma)
return 0; return 0;
} }
ret = qemu_rdma_write_one(f, rdma, ret = qemu_rdma_write_one(rdma,
rdma->current_index, rdma->current_addr, rdma->current_length); rdma->current_index, rdma->current_addr, rdma->current_length);
if (ret < 0) { if (ret < 0) {
@ -2344,7 +2344,7 @@ static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma,
* and only require that a batch gets acknowledged in the completion * and only require that a batch gets acknowledged in the completion
* queue instead of each individual chunk. * queue instead of each individual chunk.
*/ */
static int qemu_rdma_write(QEMUFile *f, 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)
{ {
@ -2355,7 +2355,7 @@ static int qemu_rdma_write(QEMUFile *f, 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_mergable(rdma, current_addr, len)) { if (!qemu_rdma_buffer_mergable(rdma, current_addr, len)) {
ret = qemu_rdma_write_flush(f, rdma); ret = qemu_rdma_write_flush(rdma);
if (ret) { if (ret) {
return ret; return ret;
} }
@ -2377,7 +2377,7 @@ static int qemu_rdma_write(QEMUFile *f, 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) {
return qemu_rdma_write_flush(f, rdma); return qemu_rdma_write_flush(rdma);
} }
return 0; return 0;
@ -2798,7 +2798,6 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *ioc,
Error **errp) Error **errp)
{ {
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(ioc); QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(ioc);
QEMUFile *f = rioc->file;
RDMAContext *rdma; RDMAContext *rdma;
int ret; int ret;
ssize_t done = 0; ssize_t done = 0;
@ -2819,7 +2818,7 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *ioc,
* Push out any writes that * Push out any writes that
* we're queued up for VM's ram. * we're queued up for VM's ram.
*/ */
ret = qemu_rdma_write_flush(f, rdma); ret = qemu_rdma_write_flush(rdma);
if (ret < 0) { if (ret < 0) {
rdma->error_state = ret; rdma->error_state = ret;
error_setg(errp, "qemu_rdma_write_flush returned %d", ret); error_setg(errp, "qemu_rdma_write_flush returned %d", ret);
@ -2958,11 +2957,11 @@ static ssize_t qio_channel_rdma_readv(QIOChannel *ioc,
/* /*
* Block until all the outstanding chunks have been delivered by the hardware. * Block until all the outstanding chunks have been delivered by the hardware.
*/ */
static int qemu_rdma_drain_cq(QEMUFile *f, RDMAContext *rdma) static int qemu_rdma_drain_cq(RDMAContext *rdma)
{ {
int ret; int ret;
if (qemu_rdma_write_flush(f, rdma) < 0) { if (qemu_rdma_write_flush(rdma) < 0) {
return -EIO; return -EIO;
} }
@ -3273,7 +3272,7 @@ static size_t qemu_rdma_save_page(QEMUFile *f,
* 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(f, rdma, block_offset, offset, size); ret = qemu_rdma_write(rdma, block_offset, offset, size);
if (ret < 0) { if (ret < 0) {
error_report("rdma migration: write error! %d", ret); error_report("rdma migration: write error! %d", ret);
goto err; goto err;
@ -3928,7 +3927,7 @@ static int qemu_rdma_registration_stop(QEMUFile *f,
CHECK_ERROR_STATE(); CHECK_ERROR_STATE();
qemu_fflush(f); qemu_fflush(f);
ret = qemu_rdma_drain_cq(f, rdma); ret = qemu_rdma_drain_cq(rdma);
if (ret < 0) { if (ret < 0) {
goto err; goto err;