qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Leonardo Bras <leobras@redhat.com>,
	Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>
Subject: [PATCH v3 07/10] qemu-file: Remove QEMUFileHooks
Date: Tue,  9 May 2023 14:06:57 +0200	[thread overview]
Message-ID: <20230509120700.78359-8-quintela@redhat.com> (raw)
In-Reply-To: <20230509120700.78359-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 a222daeaab..c94b667726 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;
 
@@ -147,11 +146,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 c43c410168..c7c832d200 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 f22ba89eaf..d39dc4db29 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4011,13 +4011,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);
@@ -4076,12 +4069,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



  parent reply	other threads:[~2023-05-09 12:09 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-09 12:06 [PATCH v3 00/10] migration: Remove QEMUFileHooks Juan Quintela
2023-05-09 12:06 ` [PATCH v3 01/10] migration: Create migrate_rdma() Juan Quintela
2023-05-09 12:06 ` [PATCH v3 02/10] migration/rdma: Unfold ram_control_before_iterate() Juan Quintela
2023-05-09 12:06 ` [PATCH v3 03/10] migration/rdma: Unfold ram_control_after_iterate() Juan Quintela
2023-05-09 12:06 ` [PATCH v3 04/10] migration/rdma: Remove all uses of RAM_CONTROL_HOOK Juan Quintela
2023-05-09 12:06 ` [PATCH v3 05/10] migration/rdma: Unfold hook_ram_load() Juan Quintela
2023-05-09 12:06 ` [PATCH v3 06/10] migration/rdma: Create rdma_control_save_page() Juan Quintela
2023-05-09 12:06 ` Juan Quintela [this message]
2023-05-09 12:06 ` [PATCH v3 08/10] migration/rdma: Move rdma constants from qemu-file.h to rdma.h Juan Quintela
2023-05-09 12:06 ` [PATCH v3 09/10] migration/rdma: Remove qemu_ prefix from exported functions Juan Quintela
2023-05-09 12:07 ` [PATCH v3 10/10] migration/rdma: Check sooner if we are in postcopy for save_page() Juan Quintela
2023-05-26 21:41 ` [PATCH v3 00/10] migration: Remove QEMUFileHooks Peter Xu

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=20230509120700.78359-8-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).