[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/33] migration: remove the QEMUFileOps 'close' callback
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 21/33] migration: remove the QEMUFileOps 'close' callback |
Date: |
Wed, 22 Jun 2022 19:39:05 +0100 |
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>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/qemu-file-channel.c | 12 ------------
migration/qemu-file.c | 12 ++++++------
migration/qemu-file.h | 10 ----------
3 files changed, 6 insertions(+), 28 deletions(-)
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 95d5db9dd6..74f919de67 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.
*/
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;
--
2.36.1
- Re: [PULL 22/33] migration: remove the QEMUFileOps 'get_buffer' callback, (continued)
[PULL 29/33] softmmu/dirtylimit: Implement vCPU dirtyrate calculation periodically, Dr. David Alan Gilbert (git), 2022/06/22
[PULL 31/33] softmmu/dirtylimit: Implement virtual CPU throttle, Dr. David Alan Gilbert (git), 2022/06/22
[PULL 33/33] tests: Add dirty page rate limit test, Dr. David Alan Gilbert (git), 2022/06/22
[PULL 20/33] migration: remove the QEMUFileOps 'set_blocking' callback, Dr. David Alan Gilbert (git), 2022/06/22
[PULL 26/33] accel/kvm/kvm-all: Refactor per-vcpu dirty ring reaping, Dr. David Alan Gilbert (git), 2022/06/22
[PULL 32/33] softmmu/dirtylimit: Implement dirty page rate limit, Dr. David Alan Gilbert (git), 2022/06/22
[PULL 25/33] migration: remove the QEMUFileOps abstraction, Dr. David Alan Gilbert (git), 2022/06/22
[PULL 21/33] migration: remove the QEMUFileOps 'close' callback,
Dr. David Alan Gilbert (git) <=
[PULL 30/33] accel/kvm/kvm-all: Introduce kvm_dirty_ring_size function, Dr. David Alan Gilbert (git), 2022/06/22
[PULL 28/33] migration/dirtyrate: Refactor dirty page rate calculation, Dr. David Alan Gilbert (git), 2022/06/22
[PULL 27/33] cpus: Introduce cpu_list_generation_id, Dr. David Alan Gilbert (git), 2022/06/22
Re: [PULL 00/33] migration queue, Dr. David Alan Gilbert, 2022/06/23
[PULL 00/33] migration queue, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 01/33] migration: Remove RDMA_UNREGISTRATION_EXAMPLE, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 02/33] QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 03/33] QIOChannelSocket: Fix zero-copy send so socket flush works, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 05/33] io: add a QIOChannelNull equivalent to /dev/null, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 06/33] migration: switch to use QIOChannelNull for dummy channel, Dr. David Alan Gilbert (git), 2022/06/23