From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Li Zhijian <lizhijian@fujitsu.com>,
Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>,
Fabiano Rosas <farosas@suse.de>,
Leonardo Bras <leobras@redhat.com>
Subject: [PATCH v2 07/10] qemu-file: Remove QEMUFileHooks
Date: Wed, 4 Oct 2023 14:49:10 +0200 [thread overview]
Message-ID: <20231004124913.16360-8-quintela@redhat.com> (raw)
In-Reply-To: <20231004124913.16360-1-quintela@redhat.com>
The only user was rdma, and its use is gone.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/qemu-file.h | 4 ----
migration/qemu-file.c | 6 ------
migration/rdma.c | 9 ---------
3 files changed, 19 deletions(-)
diff --git a/migration/qemu-file.h b/migration/qemu-file.h
index 60510a2819..0b22d8335f 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/qemu-file.c b/migration/qemu-file.c
index e3514740fb..352bb320a2 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -38,7 +38,6 @@
#define MAX_IOV_SIZE MIN_CONST(IOV_MAX, 64)
struct QEMUFile {
- const QEMUFileHooks *hooks;
QIOChannel *ioc;
bool is_writable;
@@ -133,11 +132,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/rdma.c b/migration/rdma.c
index 7f10bfb81b..bcb6de14e7 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4014,13 +4014,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);
@@ -4072,7 +4065,6 @@ static QEMUFile *rdma_new_input(RDMAContext *rdma)
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;
}
@@ -4084,7 +4076,6 @@ static QEMUFile *rdma_new_output(RDMAContext *rdma)
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);
return rioc->file;
}
--
2.41.0
next prev parent reply other threads:[~2023-10-04 12:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 12:49 [PATCH v2 00/10] Removal of QEMUFileHooks Juan Quintela
2023-10-04 12:49 ` [PATCH v2 01/10] migration: Create migrate_rdma() Juan Quintela
2023-10-04 12:49 ` [PATCH v2 02/10] migration/rdma: Unfold ram_control_before_iterate() Juan Quintela
2023-10-04 17:00 ` Fabiano Rosas
2023-10-04 12:49 ` [PATCH v2 03/10] migration/rdma: Unfold ram_control_after_iterate() Juan Quintela
2023-10-04 12:49 ` [PATCH v2 04/10] migration/rdma: Remove all uses of RAM_CONTROL_HOOK Juan Quintela
2023-10-04 12:49 ` [PATCH v2 05/10] migration/rdma: Unfold hook_ram_load() Juan Quintela
2023-10-04 12:49 ` [PATCH v2 06/10] migration/rdma: Create rdma_control_save_page() Juan Quintela
2023-10-04 12:49 ` Juan Quintela [this message]
2023-10-04 12:49 ` [PATCH v2 08/10] migration/rdma: Move rdma constants from qemu-file.h to rdma.h Juan Quintela
2023-10-04 12:49 ` [PATCH v2 09/10] migration/rdma: Remove qemu_ prefix from exported functions Juan Quintela
2023-10-04 12:49 ` [PATCH v2 10/10] migration/rdma: Check sooner if we are in postcopy for save_page() Juan Quintela
2023-10-04 17:11 ` [PATCH v2 00/10] Removal of QEMUFileHooks Peter Xu
2023-10-04 17:26 ` 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=20231004124913.16360-8-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=farosas@suse.de \
--cc=leobras@redhat.com \
--cc=lizhijian@fujitsu.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).