[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 16/21] migration: remove the QEMUFileOps 'set_blocking' callba
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v2 16/21] migration: remove the QEMUFileOps 'set_blocking' callback |
Date: |
Mon, 20 Jun 2022 12:02:00 +0100 |
This directly implements the set_blocking logic using QIOChannel APIs.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
migration/qemu-file-channel.c | 14 --------------
migration/qemu-file.c | 4 +---
migration/qemu-file.h | 5 -----
3 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
index 80f05dc371..0350d367ec 100644
--- a/migration/qemu-file-channel.c
+++ b/migration/qemu-file-channel.c
@@ -112,18 +112,6 @@ static int channel_close(void *opaque, Error **errp)
}
-static int channel_set_blocking(void *opaque,
- bool enabled,
- Error **errp)
-{
- QIOChannel *ioc = QIO_CHANNEL(opaque);
-
- if (qio_channel_set_blocking(ioc, enabled, errp) < 0) {
- return -1;
- }
- return 0;
-}
-
static QEMUFile *channel_get_input_return_path(void *opaque)
{
QIOChannel *ioc = QIO_CHANNEL(opaque);
@@ -141,7 +129,6 @@ static QEMUFile *channel_get_output_return_path(void
*opaque)
static const QEMUFileOps channel_input_ops = {
.get_buffer = channel_get_buffer,
.close = channel_close,
- .set_blocking = channel_set_blocking,
.get_return_path = channel_get_input_return_path,
};
@@ -149,7 +136,6 @@ static const QEMUFileOps channel_input_ops = {
static const QEMUFileOps channel_output_ops = {
.writev_buffer = channel_writev_buffer,
.close = channel_close,
- .set_blocking = channel_set_blocking,
.get_return_path = channel_get_output_return_path,
};
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 6e79de1404..efbc0a5515 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -879,9 +879,7 @@ void qemu_put_counted_string(QEMUFile *f, const char *str)
*/
void qemu_file_set_blocking(QEMUFile *f, bool block)
{
- if (f->ops->set_blocking) {
- f->ops->set_blocking(f->ioc, block, NULL);
- }
+ qio_channel_set_blocking(f->ioc, block, NULL);
}
/*
diff --git a/migration/qemu-file.h b/migration/qemu-file.h
index 9fa92c1998..7793e765f2 100644
--- a/migration/qemu-file.h
+++ b/migration/qemu-file.h
@@ -46,10 +46,6 @@ typedef ssize_t (QEMUFileGetBufferFunc)(void *opaque,
uint8_t *buf,
*/
typedef int (QEMUFileCloseFunc)(void *opaque, Error **errp);
-/* Called to change the blocking mode of the file
- */
-typedef int (QEMUFileSetBlocking)(void *opaque, bool enabled, Error **errp);
-
/*
* This function writes an iovec to file. The handler must write all
* of the data or return a negative errno value.
@@ -92,7 +88,6 @@ typedef QEMUFile *(QEMURetPathFunc)(void *opaque);
typedef struct QEMUFileOps {
QEMUFileGetBufferFunc *get_buffer;
QEMUFileCloseFunc *close;
- QEMUFileSetBlocking *set_blocking;
QEMUFileWritevBufferFunc *writev_buffer;
QEMURetPathFunc *get_return_path;
} QEMUFileOps;
--
2.36.1
- Re: [PATCH v2 15/21] migration: remove the QEMUFileOps 'shut_down' callback, (continued)
- [PATCH v2 09/21] migration: introduce a QIOChannel impl for BlockDriverState VMState, Daniel P . Berrangé, 2022/06/20
- [PATCH v2 14/21] migration: remove unused QEMUFileGetFD typedef / qemu_get_fd method, Daniel P . Berrangé, 2022/06/20
- [PATCH v2 18/21] migration: remove the QEMUFileOps 'get_buffer' callback, Daniel P . Berrangé, 2022/06/20
- [PATCH v2 16/21] migration: remove the QEMUFileOps 'set_blocking' callback,
Daniel P . Berrangé <=
- [PATCH v2 19/21] migration: remove the QEMUFileOps 'writev_buffer' callback, Daniel P . Berrangé, 2022/06/20
- [PATCH v2 20/21] migration: remove the QEMUFileOps 'get_return_path' callback, Daniel P . Berrangé, 2022/06/20
- [PATCH v2 21/21] migration: remove the QEMUFileOps abstraction, Daniel P . Berrangé, 2022/06/20
- [PATCH v2 08/21] migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limit, Daniel P . Berrangé, 2022/06/20