[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/13] qemu-file: Remove QEMUFileHooks
From: |
Juan Quintela |
Subject: |
[PATCH v3 07/13] qemu-file: Remove QEMUFileHooks |
Date: |
Wed, 11 Oct 2023 22:35:21 +0200 |
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 745eaf7a5b..3fb25148d1 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 bf16990f91..ca2a15be99 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4004,13 +4004,6 @@ err:
return -1;
}
-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);
@@ -4062,7 +4055,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;
}
@@ -4074,7 +4066,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
- [PATCH v3 01/13] migration: Create migrate_rdma(), (continued)
- [PATCH v3 01/13] migration: Create migrate_rdma(), Juan Quintela, 2023/10/11
- [PATCH v3 03/13] migration/rdma: Unfold ram_control_after_iterate(), Juan Quintela, 2023/10/11
- [PATCH v3 04/13] migration/rdma: Remove all uses of RAM_CONTROL_HOOK, Juan Quintela, 2023/10/11
- [PATCH v3 05/13] migration/rdma: Unfold hook_ram_load(), Juan Quintela, 2023/10/11
- [PATCH v3 06/13] migration/rdma: Create rdma_control_save_page(), Juan Quintela, 2023/10/11
- [PATCH v3 07/13] qemu-file: Remove QEMUFileHooks,
Juan Quintela <=
- [PATCH v3 09/13] migration/rdma: Remove qemu_ prefix from exported functions, Juan Quintela, 2023/10/11
- [PATCH v3 02/13] migration/rdma: Unfold ram_control_before_iterate(), Juan Quintela, 2023/10/11
- [PATCH v3 08/13] migration/rdma: Move rdma constants from qemu-file.h to rdma.h, Juan Quintela, 2023/10/11
- [PATCH v3 11/13] migration/rdma: Use i as for index instead of idx, Juan Quintela, 2023/10/11