From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>,
Leonardo Bras <leobras@redhat.com>
Subject: [PATCH 18/19] qemu-file: Remove QEMUFileHooks
Date: Thu, 27 Apr 2023 18:34:48 +0200 [thread overview]
Message-ID: <20230427163449.27473-19-quintela@redhat.com> (raw)
In-Reply-To: <20230427163449.27473-1-quintela@redhat.com>
The only user was rdma, and its use is gone.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/qemu-file.c | 6 ------
migration/qemu-file.h | 4 ----
migration/rdma.c | 9 ---------
3 files changed, 19 deletions(-)
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 8d3f33fe41..c0c2195a6e 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -36,7 +36,6 @@
#define MAX_IOV_SIZE MIN_CONST(IOV_MAX, 64)
struct QEMUFile {
- const QEMUFileHooks *hooks;
QIOChannel *ioc;
bool is_writable;
@@ -160,11 +159,6 @@ QEMUFile *qemu_file_new_input(QIOChannel *ioc)
return qemu_file_new_impl(ioc, false);
}
-void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks)
-{
- f->hooks = hooks;
-}
-
/*
* Get last error for stream f with optional Error*
*
diff --git a/migration/qemu-file.h b/migration/qemu-file.h
index ae3a704772..9c99914b21 100644
--- a/migration/qemu-file.h
+++ b/migration/qemu-file.h
@@ -36,12 +36,8 @@
#define RAM_CONTROL_ROUND 1
#define RAM_CONTROL_FINISH 3
-typedef struct QEMUFileHooks {
-} QEMUFileHooks;
-
QEMUFile *qemu_file_new_input(QIOChannel *ioc);
QEMUFile *qemu_file_new_output(QIOChannel *ioc);
-void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks);
int qemu_fclose(QEMUFile *f);
/*
diff --git a/migration/rdma.c b/migration/rdma.c
index 42ac7fd1e2..63492fd4ac 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4001,13 +4001,6 @@ err:
return ret;
}
-static const QEMUFileHooks rdma_read_hooks = {
-};
-
-static const QEMUFileHooks rdma_write_hooks = {
-};
-
-
static void qio_channel_rdma_finalize(Object *obj)
{
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(obj);
@@ -4066,12 +4059,10 @@ static QEMUFile *qemu_fopen_rdma(RDMAContext *rdma, const char *mode)
rioc->file = qemu_file_new_output(QIO_CHANNEL(rioc));
rioc->rdmaout = rdma;
rioc->rdmain = rdma->return_path;
- qemu_file_set_hooks(rioc->file, &rdma_write_hooks);
} else {
rioc->file = qemu_file_new_input(QIO_CHANNEL(rioc));
rioc->rdmain = rdma;
rioc->rdmaout = rdma->return_path;
- qemu_file_set_hooks(rioc->file, &rdma_read_hooks);
}
return rioc->file;
--
2.40.0
next prev parent reply other threads:[~2023-04-27 16:38 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-27 16:34 [PATCH 00/19] migration: Remove QEMUFileHooks Juan Quintela
2023-04-27 16:34 ` [PATCH 01/19] multifd: We already account for this packet on the multifd thread Juan Quintela
2023-04-27 18:23 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 02/19] migration: Move ram_stats to its own file migration-stats.[ch] Juan Quintela
2023-04-27 18:30 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 03/19] migration: Rename ram_counters to mig_stats Juan Quintela
2023-04-27 18:31 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 04/19] migration: Rename RAMStats to MigrationAtomicStats Juan Quintela
2023-04-27 18:58 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 05/19] migration/rdma: Split the zero page case from acct_update_position Juan Quintela
2023-04-27 18:59 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 06/19] migration/rdma: Unfold last user of acct_update_position() Juan Quintela
2023-04-27 19:01 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 07/19] migration/rdma: Unflod ram_control_before_iterate() Juan Quintela
2023-04-28 9:06 ` Juan Quintela
2023-04-27 16:34 ` [PATCH 08/19] migration/rdma: Unflod ram_control_after_iterate() Juan Quintela
2023-04-27 16:34 ` [PATCH 09/19] migration/rdma: simplify ram_control_load_hook() Juan Quintela
2023-04-27 16:34 ` [PATCH 10/19] migration/rdma: Don't pass the QIOChannelRDMA as an opaque Juan Quintela
2023-04-27 16:34 ` [PATCH 11/19] migration/rdma: We can calculate the rioc from the QEMUFile Juan Quintela
2023-04-27 16:34 ` [PATCH 12/19] migration/rdma: It makes no sense to recive that flag without RDMA Juan Quintela
2023-04-27 16:34 ` [PATCH 13/19] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry Juan Quintela
2023-04-27 16:34 ` [PATCH 14/19] migration/rdma: Remove all uses of RAM_CONTROL_HOOK Juan Quintela
2023-04-27 16:34 ` [PATCH 15/19] migration/rdma: Unfold hook_ram_load() Juan Quintela
2023-04-27 16:34 ` [PATCH 16/19] migration/rdma: Make ram_control_save_page() use exported interfaces Juan Quintela
2023-04-27 16:34 ` [PATCH 17/19] migration/rdma: Create rdma_control_save_page() Juan Quintela
2023-04-27 16:34 ` Juan Quintela [this message]
2023-04-27 16:34 ` [PATCH 19/19] migration/rdma: Move rdma constants from qemu-file.h to rdma.h Juan Quintela
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=20230427163449.27473-19-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=leobras@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).