aboutsummaryrefslogtreecommitdiff
path: root/migration/qemu-file-channel.c
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2022-06-20 12:02:03 +0100
committerDr. David Alan Gilbert <dgilbert@redhat.com>2022-06-23 10:18:13 +0100
commitec2135eec80dc0bd4089d8af2db28c386fadc558 (patch)
treee43bfb1fb524c216a2d7ed49d76074a9291eee41 /migration/qemu-file-channel.c
parentf759d7050bd0ec34f45bc0d91800625a6938e203 (diff)
downloadqemu-ec2135eec80dc0bd4089d8af2db28c386fadc558.zip
qemu-ec2135eec80dc0bd4089d8af2db28c386fadc558.tar.gz
qemu-ec2135eec80dc0bd4089d8af2db28c386fadc558.tar.bz2
migration: remove the QEMUFileOps 'writev_buffer' callback
This directly implements the writev_buffer 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>
Diffstat (limited to 'migration/qemu-file-channel.c')
-rw-r--r--migration/qemu-file-channel.c43
1 files changed, 0 insertions, 43 deletions
diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
index 7b32831..2e139f7 100644
--- a/migration/qemu-file-channel.c
+++ b/migration/qemu-file-channel.c
@@ -32,48 +32,6 @@
#include "yank_functions.h"
-static ssize_t channel_writev_buffer(void *opaque,
- struct iovec *iov,
- int iovcnt,
- int64_t pos,
- Error **errp)
-{
- QIOChannel *ioc = QIO_CHANNEL(opaque);
- ssize_t done = 0;
- struct iovec *local_iov = g_new(struct iovec, iovcnt);
- struct iovec *local_iov_head = local_iov;
- unsigned int nlocal_iov = iovcnt;
-
- nlocal_iov = iov_copy(local_iov, nlocal_iov,
- iov, iovcnt,
- 0, iov_size(iov, iovcnt));
-
- while (nlocal_iov > 0) {
- ssize_t len;
- len = qio_channel_writev(ioc, local_iov, nlocal_iov, errp);
- if (len == QIO_CHANNEL_ERR_BLOCK) {
- if (qemu_in_coroutine()) {
- qio_channel_yield(ioc, G_IO_OUT);
- } else {
- qio_channel_wait(ioc, G_IO_OUT);
- }
- continue;
- }
- if (len < 0) {
- done = -EIO;
- goto cleanup;
- }
-
- iov_discard_front(&local_iov, &nlocal_iov, len);
- done += len;
- }
-
- cleanup:
- g_free(local_iov_head);
- return done;
-}
-
-
static QEMUFile *channel_get_input_return_path(void *opaque)
{
QIOChannel *ioc = QIO_CHANNEL(opaque);
@@ -94,7 +52,6 @@ static const QEMUFileOps channel_input_ops = {
static const QEMUFileOps channel_output_ops = {
- .writev_buffer = channel_writev_buffer,
.get_return_path = channel_get_output_return_path,
};