qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eric Blake" <eblake@redhat.com>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"John Snow" <jsnow@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	qemu-block@nongnu.org, "Leonardo Bras" <leobras@redhat.com>,
	"Fam Zheng" <fam@euphon.net>, "Peter Xu" <peterx@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 02/16] migration/rdma: Don't pass the QIOChannelRDMA as an opaque
Date: Fri,  5 May 2023 02:47:58 +0200	[thread overview]
Message-ID: <20230505004812.31583-3-quintela@redhat.com> (raw)
In-Reply-To: <20230505004812.31583-1-quintela@redhat.com>

We can calculate it from the QEMUFile like the caller.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230503131847.11603-6-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/rdma.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/migration/rdma.c b/migration/rdma.c
index 7e747b2595..5b82085bd7 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -3527,7 +3527,7 @@ static int dest_ram_sort_func(const void *a, const void *b)
  *
  * Keep doing this until the source tells us to stop.
  */
-static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
+static int qemu_rdma_registration_handle(QEMUFile *f)
 {
     RDMAControlHeader reg_resp = { .len = sizeof(RDMARegisterResult),
                                .type = RDMA_CONTROL_REGISTER_RESULT,
@@ -3539,7 +3539,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
                              };
     RDMAControlHeader blocks = { .type = RDMA_CONTROL_RAM_BLOCKS_RESULT,
                                  .repeat = 1 };
-    QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(opaque);
+    QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
     RDMAContext *rdma;
     RDMALocalBlocks *local;
     RDMAControlHeader head;
@@ -3852,7 +3852,7 @@ static int rdma_load_hook(QEMUFile *f, uint64_t flags, void *data)
         return rdma_block_notification_handle(rioc, data);
 
     case RAM_CONTROL_HOOK:
-        return qemu_rdma_registration_handle(f, rioc);
+        return qemu_rdma_registration_handle(f);
 
     default:
         /* Shouldn't be called with any other values */
-- 
2.40.0



  parent reply	other threads:[~2023-05-05  0:49 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-05  0:47 [PULL 00/16] Migration 20230505 patches Juan Quintela
2023-05-05  0:47 ` [PULL 01/16] migration: Fix block_bitmap_mapping migration Juan Quintela
2023-05-05  0:47 ` Juan Quintela [this message]
2023-05-05  0:47 ` [PULL 03/16] migration: Document all migration_stats Juan Quintela
2023-05-05  0:48 ` [PULL 04/16] migration: Put zero_pages in alphabetical order Juan Quintela
2023-05-05  0:48 ` [PULL 05/16] migration: Rename xbzrle_enabled xbzrle_started Juan Quintela
2023-05-05  0:48 ` [PULL 06/16] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry Juan Quintela
2023-05-05  0:48 ` [PULL 07/16] migration/rdma: simplify ram_control_load_hook() Juan Quintela
2023-05-05  0:48 ` [PULL 08/16] migration/rdma: We can calculate the rioc from the QEMUFile Juan Quintela
2023-05-05  0:48 ` [PULL 09/16] migration/rdma: It makes no sense to recive that flag without RDMA Juan Quintela
2023-05-05  0:48 ` [PULL 10/16] migration/rdma: Check for postcopy sooner Juan Quintela
2023-05-05  0:48 ` [PULL 11/16] migration: max_postcopy_bandwidth is a size parameter Juan Quintela
2023-05-05  0:48 ` [PULL 12/16] migration: qemu_file_total_transferred() function is monotonic Juan Quintela
2023-05-05  0:48 ` [PULL 13/16] qemu-file: No need to check for shutdown in qemu_file_rate_limit Juan Quintela
2023-05-05  0:48 ` [PULL 14/16] qemu-file: remove shutdown member Juan Quintela
2023-05-05  0:48 ` [PULL 15/16] qemu-file: Make total_transferred an uint64_t Juan Quintela
2023-05-05  0:48 ` [PULL 16/16] qemu-file: Make ram_control_save_page() use accessors for rate_limit Juan Quintela
2023-05-05 21:18 ` [PULL 00/16] Migration 20230505 patches Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230505004812.31583-3-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=berrange@redhat.com \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=jsnow@redhat.com \
    --cc=leobras@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=vsementsov@yandex-team.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).