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

migration: stop passing 'opaque' parameter to QEMUFile hooks 

The only user of the hooks is RDMA which provides a QIOChannel backed
impl of QEMUFile. It can thus use the qemu_file_get_ioc() method.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2022-06-20 12:01:55 +01:00 committed by Dr. David Alan Gilbert
parent 67bdabe2af
commit 365c0463db
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/qemu-file.c
View File

@ -266,7 +266,7 @@ void ram_control_before_iterate(QEMUFile *f, uint64_t flags)
int ret = 0; int ret = 0;
if (f->hooks && f->hooks->before_ram_iterate) { if (f->hooks && f->hooks->before_ram_iterate) {
ret = f->hooks->before_ram_iterate(f, f->opaque, flags, NULL); ret = f->hooks->before_ram_iterate(f, flags, NULL);
if (ret < 0) { if (ret < 0) {
qemu_file_set_error(f, ret); qemu_file_set_error(f, ret);
} }
@ -278,7 +278,7 @@ void ram_control_after_iterate(QEMUFile *f, uint64_t flags)
int ret = 0; int ret = 0;
if (f->hooks && f->hooks->after_ram_iterate) { if (f->hooks && f->hooks->after_ram_iterate) {
ret = f->hooks->after_ram_iterate(f, f->opaque, flags, NULL); ret = f->hooks->after_ram_iterate(f, flags, NULL);
if (ret < 0) { if (ret < 0) {
qemu_file_set_error(f, ret); qemu_file_set_error(f, ret);
} }
@ -290,7 +290,7 @@ void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data)
int ret = -EINVAL; int ret = -EINVAL;
if (f->hooks && f->hooks->hook_ram_load) { if (f->hooks && f->hooks->hook_ram_load) {
ret = f->hooks->hook_ram_load(f, f->opaque, flags, data); ret = f->hooks->hook_ram_load(f, flags, data);
if (ret < 0) { if (ret < 0) {
qemu_file_set_error(f, ret); qemu_file_set_error(f, ret);
} }
@ -310,7 +310,7 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset,
uint64_t *bytes_sent) uint64_t *bytes_sent)
{ {
if (f->hooks && f->hooks->save_page) { if (f->hooks && f->hooks->save_page) {
int ret = f->hooks->save_page(f, f->opaque, block_offset, int ret = f->hooks->save_page(f, block_offset,
offset, size, bytes_sent); offset, size, bytes_sent);
if (ret != RAM_SAVE_CONTROL_NOT_SUPP) { if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
f->rate_limit_used += size; f->rate_limit_used += size;

14
migration/qemu-file.h
View File

@ -65,11 +65,9 @@ typedef ssize_t (QEMUFileWritevBufferFunc)(void *opaque, struct iovec *iov,
/* /*
* This function provides hooks around different * This function provides hooks around different
* stages of RAM migration. * stages of RAM migration.
* 'opaque' is the backend specific data in QEMUFile
* 'data' is call specific data associated with the 'flags' value * 'data' is call specific data associated with the 'flags' value
*/ */
typedef int (QEMURamHookFunc)(QEMUFile *f, void *opaque, uint64_t flags, typedef int (QEMURamHookFunc)(QEMUFile *f, uint64_t flags, void *data);
void *data);
/* /*
* Constants used by ram_control_* hooks * Constants used by ram_control_* hooks
@ -84,11 +82,11 @@ typedef int (QEMURamHookFunc)(QEMUFile *f, void *opaque, uint64_t flags,
* This function allows override of where the RAM page * This function allows override of where the RAM page
* is saved (such as RDMA, for example.) * is saved (such as RDMA, for example.)
*/ */
typedef size_t (QEMURamSaveFunc)(QEMUFile *f, void *opaque, typedef size_t (QEMURamSaveFunc)(QEMUFile *f,
ram_addr_t block_offset, ram_addr_t block_offset,
ram_addr_t offset, ram_addr_t offset,
size_t size, size_t size,
uint64_t *bytes_sent); uint64_t *bytes_sent);
/* /*
* Return a QEMUFile for comms in the opposite direction * Return a QEMUFile for comms in the opposite direction

19
migration/rdma.c
View File

@ -3215,11 +3215,11 @@ qio_channel_rdma_shutdown(QIOChannel *ioc,
* sent. Usually, this will not be more than a few bytes of * sent. Usually, this will not be more than a few bytes of
* the protocol because most transfers are sent asynchronously. * the protocol because most transfers are sent asynchronously.
*/ */
static size_t qemu_rdma_save_page(QEMUFile *f, void *opaque, static size_t qemu_rdma_save_page(QEMUFile *f,
ram_addr_t block_offset, ram_addr_t offset, ram_addr_t block_offset, ram_addr_t offset,
size_t size, uint64_t *bytes_sent) size_t size, uint64_t *bytes_sent)
{ {
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(opaque); QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
RDMAContext *rdma; RDMAContext *rdma;
int ret; int ret;
@ -3831,14 +3831,15 @@ rdma_block_notification_handle(QIOChannelRDMA *rioc, const char *name)
return 0; return 0;
} }
static int rdma_load_hook(QEMUFile *f, void *opaque, uint64_t flags, void *data) static int rdma_load_hook(QEMUFile *f, uint64_t flags, void *data)
{ {
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
switch (flags) { switch (flags) {
case RAM_CONTROL_BLOCK_REG: case RAM_CONTROL_BLOCK_REG:
return rdma_block_notification_handle(opaque, data); return rdma_block_notification_handle(rioc, data);
case RAM_CONTROL_HOOK: case RAM_CONTROL_HOOK:
return qemu_rdma_registration_handle(f, opaque); return qemu_rdma_registration_handle(f, rioc);
default: default:
/* Shouldn't be called with any other values */ /* Shouldn't be called with any other values */
@ -3846,10 +3847,10 @@ static int rdma_load_hook(QEMUFile *f, void *opaque, uint64_t flags, void *data)
} }
} }
static int qemu_rdma_registration_start(QEMUFile *f, void *opaque, static int qemu_rdma_registration_start(QEMUFile *f,
uint64_t flags, void *data) uint64_t flags, void *data)
{ {
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(opaque); QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
RDMAContext *rdma; RDMAContext *rdma;
RCU_READ_LOCK_GUARD(); RCU_READ_LOCK_GUARD();
@ -3875,10 +3876,10 @@ static int qemu_rdma_registration_start(QEMUFile *f, void *opaque,
* Inform dest that dynamic registrations are done for now. * Inform dest that dynamic registrations are done for now.
* First, flush writes, if any. * First, flush writes, if any.
*/ */
static int qemu_rdma_registration_stop(QEMUFile *f, void *opaque, static int qemu_rdma_registration_stop(QEMUFile *f,
uint64_t flags, void *data) uint64_t flags, void *data)
{ {
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(opaque); QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
RDMAContext *rdma; RDMAContext *rdma;
RDMAControlHeader head = { .len = 0, .repeat = 1 }; RDMAControlHeader head = { .len = 0, .repeat = 1 };
int ret = 0; int ret = 0;