[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/25] migration: remove the QEMUFileOps 'close' callback
From: |
Juan Quintela |
Subject: |
[PULL 21/25] migration: remove the QEMUFileOps 'close' callback |
Date: |
Wed, 22 Jun 2022 02:25:43 +0200 |
From: Daniel P. Berrangé <berrange@redhat.com>
This directly implements the close logic using QIOChannel APIs.
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>
---
migration/qemu-file.h | 10 ----------
migration/qemu-file-channel.c | 12 ------------
migration/qemu-file.c | 12 ++++++------
3 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/migration/qemu-file.h b/migration/qemu-file.h
index 7793e765f2..4a3beedb5b 100644
--- a/migration/qemu-file.h
+++ b/migration/qemu-file.h
@@ -37,15 +37,6 @@ typedef ssize_t (QEMUFileGetBufferFunc)(void *opaque,
uint8_t *buf,
int64_t pos, size_t size,
Error **errp);
-/* Close a file
- *
- * Return negative error number on error, 0 or positive value on success.
- *
- * The meaning of return value on success depends on the specific back-end
being
- * used.
- */
-typedef int (QEMUFileCloseFunc)(void *opaque, Error **errp);
-
/*
* This function writes an iovec to file. The handler must write all
* of the data or return a negative errno value.
@@ -87,7 +78,6 @@ typedef QEMUFile *(QEMURetPathFunc)(void *opaque);
typedef struct QEMUFileOps {
QEMUFileGetBufferFunc *get_buffer;
- QEMUFileCloseFunc *close;
QEMUFileWritevBufferFunc *writev_buffer;
QEMURetPathFunc *get_return_path;
} QEMUFileOps;
diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
index 0350d367ec..8ff58e81f9 100644
--- a/migration/qemu-file-channel.c
+++ b/migration/qemu-file-channel.c
@@ -102,16 +102,6 @@ static ssize_t channel_get_buffer(void *opaque,
}
-static int channel_close(void *opaque, Error **errp)
-{
- int ret;
- QIOChannel *ioc = QIO_CHANNEL(opaque);
- ret = qio_channel_close(ioc, errp);
- object_unref(OBJECT(ioc));
- return ret;
-}
-
-
static QEMUFile *channel_get_input_return_path(void *opaque)
{
QIOChannel *ioc = QIO_CHANNEL(opaque);
@@ -128,14 +118,12 @@ static QEMUFile *channel_get_output_return_path(void
*opaque)
static const QEMUFileOps channel_input_ops = {
.get_buffer = channel_get_buffer,
- .close = channel_close,
.get_return_path = channel_get_input_return_path,
};
static const QEMUFileOps channel_output_ops = {
.writev_buffer = channel_writev_buffer,
- .close = channel_close,
.get_return_path = channel_get_output_return_path,
};
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index efbc0a5515..5eb8cf0e28 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -408,16 +408,16 @@ void qemu_file_credit_transfer(QEMUFile *f, size_t size)
*/
int qemu_fclose(QEMUFile *f)
{
- int ret;
+ int ret, ret2;
qemu_fflush(f);
ret = qemu_file_get_error(f);
- if (f->ops->close) {
- int ret2 = f->ops->close(f->ioc, NULL);
- if (ret >= 0) {
- ret = ret2;
- }
+ ret2 = qio_channel_close(f->ioc, NULL);
+ if (ret >= 0) {
+ ret = ret2;
}
+ g_clear_pointer(&f->ioc, object_unref);
+
/* If any error was spotted before closing, we should report it
* instead of the close() return value.
*/
--
2.35.3
- [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred, (continued)
- [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred, Juan Quintela, 2022/06/21
- [PULL 11/25] migration: rename qemu_update_position to qemu_file_credit_transfer, Juan Quintela, 2022/06/21
- [PULL 13/25] migration: introduce a QIOChannel impl for BlockDriverState VMState, Juan Quintela, 2022/06/21
- [PULL 14/25] migration: convert savevm to use QIOChannelBlock for VMState, Juan Quintela, 2022/06/21
- [PULL 15/25] migration: stop passing 'opaque' parameter to QEMUFile hooks, Juan Quintela, 2022/06/21
- [PULL 18/25] migration: remove unused QEMUFileGetFD typedef / qemu_get_fd method, Juan Quintela, 2022/06/21
- [PULL 16/25] migration: hardcode assumption that QEMUFile is backed with QIOChannel, Juan Quintela, 2022/06/21
- [PULL 17/25] migration: introduce new constructors for QEMUFile, Juan Quintela, 2022/06/21
- [PULL 20/25] migration: remove the QEMUFileOps 'set_blocking' callback, Juan Quintela, 2022/06/21
- [PULL 19/25] migration: remove the QEMUFileOps 'shut_down' callback, Juan Quintela, 2022/06/21
- [PULL 21/25] migration: remove the QEMUFileOps 'close' callback,
Juan Quintela <=
- [PULL 22/25] migration: remove the QEMUFileOps 'get_buffer' callback, Juan Quintela, 2022/06/21
- [PULL 23/25] migration: remove the QEMUFileOps 'writev_buffer' callback, Juan Quintela, 2022/06/21
- [PULL 24/25] migration: remove the QEMUFileOps 'get_return_path' callback, Juan Quintela, 2022/06/21
- [PULL 25/25] migration: remove the QEMUFileOps abstraction, Juan Quintela, 2022/06/21
- Re: [PULL 00/25] Migration 20220621 patches, Richard Henderson, 2022/06/21