Message ID | 1363881940-27505-3-git-send-email-owasserm@redhat.com |
---|---|
State | New |
Headers | show |
Orit Wasserman <owasserm@redhat.com> wrote: D> Signed-off-by: Orit Wasserman <owasserm@redhat.com> > --- > savevm.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/savevm.c b/savevm.c > index 35c8d1e..baa45ae 100644 > --- a/savevm.c > +++ b/savevm.c > @@ -39,6 +39,7 @@ > #include "qmp-commands.h" > #include "trace.h" > #include "qemu/bitops.h" > +#include "qemu/iov.h" > > #define SELF_ANNOUNCE_ROUNDS 5 > > @@ -171,6 +172,18 @@ static void coroutine_fn yield_until_fd_readable(int fd) > qemu_coroutine_yield(); > } > > +static int socket_writev_buffer(void *opaque, struct iovec *iov, int iovcnt) > +{ > + QEMUFileSocket *s = opaque; > + ssize_t len; > + > + len = iov_send(s->fd, iov, iovcnt, 0, iov_size(iov, iovcnt)); > + if (len < iov_size(iov, iovcnt)) { Not the more expensive operation ever, but we can factor iov_size(iov, iovcnt) value into one variable. > + len = -socket_error(); > + } > + return len; > +} > + > static int socket_get_fd(void *opaque) > { > QEMUFileSocket *s = opaque; > @@ -387,6 +400,7 @@ static const QEMUFileOps socket_read_ops = { > static const QEMUFileOps socket_write_ops = { > .get_fd = socket_get_fd, > .put_buffer = socket_put_buffer, > + .writev_buffer = socket_writev_buffer, > .close = socket_close > };
diff --git a/savevm.c b/savevm.c index 35c8d1e..baa45ae 100644 --- a/savevm.c +++ b/savevm.c @@ -39,6 +39,7 @@ #include "qmp-commands.h" #include "trace.h" #include "qemu/bitops.h" +#include "qemu/iov.h" #define SELF_ANNOUNCE_ROUNDS 5 @@ -171,6 +172,18 @@ static void coroutine_fn yield_until_fd_readable(int fd) qemu_coroutine_yield(); } +static int socket_writev_buffer(void *opaque, struct iovec *iov, int iovcnt) +{ + QEMUFileSocket *s = opaque; + ssize_t len; + + len = iov_send(s->fd, iov, iovcnt, 0, iov_size(iov, iovcnt)); + if (len < iov_size(iov, iovcnt)) { + len = -socket_error(); + } + return len; +} + static int socket_get_fd(void *opaque) { QEMUFileSocket *s = opaque; @@ -387,6 +400,7 @@ static const QEMUFileOps socket_read_ops = { static const QEMUFileOps socket_write_ops = { .get_fd = socket_get_fd, .put_buffer = socket_put_buffer, + .writev_buffer = socket_writev_buffer, .close = socket_close };
Signed-off-by: Orit Wasserman <owasserm@redhat.com> --- savevm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)