From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: "Daniel P. Berrange" <berrange@redhat.com>
Cc: Amit Shah <amit.shah@redhat.com>,
qemu-devel@nongnu.org, Juan Quintela <quintela@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v1 17/22] migration: delete QEMUFile sockets implementation
Date: Wed, 3 Feb 2016 09:56:26 +0000 [thread overview]
Message-ID: <20160203095625.GD2376@work-vm> (raw)
In-Reply-To: <1452599056-27357-18-git-send-email-berrange@redhat.com>
* Daniel P. Berrange (berrange@redhat.com) wrote:
> Now that the tcp, unix and fd migration backends have converted
> to use the QIOChannel based QEMUFile, there is no user remaining
> for the sockets based QEMUFile impl and it can be deleted.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> include/migration/qemu-file.h | 2 -
> migration/Makefile.objs | 2 +-
> migration/qemu-file-unix.c | 324 ------------------------------------------
> 3 files changed, 1 insertion(+), 327 deletions(-)
> delete mode 100644 migration/qemu-file-unix.c
>
> diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
> index da67931..dc4b7ab 100644
> --- a/include/migration/qemu-file.h
> +++ b/include/migration/qemu-file.h
> @@ -129,8 +129,6 @@ typedef struct QEMUFileHooks {
>
> QEMUFile *qemu_fopen_ops(void *opaque, const QEMUFileOps *ops);
> QEMUFile *qemu_fopen(const char *filename, const char *mode);
> -QEMUFile *qemu_fdopen(int fd, const char *mode);
> -QEMUFile *qemu_fopen_socket(int fd, const char *mode);
> QEMUFile *qemu_fopen_channel_input(QIOChannel *ioc);
> QEMUFile *qemu_fopen_channel_output(QIOChannel *ioc);
> QEMUFile *qemu_popen_cmd(const char *command, const char *mode);
> diff --git a/migration/Makefile.objs b/migration/Makefile.objs
> index 8ecb941..2c71056 100644
> --- a/migration/Makefile.objs
> +++ b/migration/Makefile.objs
> @@ -1,6 +1,6 @@
> common-obj-y += migration.o tcp.o unix.o fd.o exec.o
> common-obj-y += vmstate.o
> -common-obj-y += qemu-file.o qemu-file-unix.o qemu-file-stdio.o
> +common-obj-y += qemu-file.o qemu-file-stdio.o
> common-obj-y += qemu-file-channel.o
> common-obj-y += xbzrle.o postcopy-ram.o
>
> diff --git a/migration/qemu-file-unix.c b/migration/qemu-file-unix.c
> deleted file mode 100644
> index 6ca53e7..0000000
> --- a/migration/qemu-file-unix.c
> +++ /dev/null
> @@ -1,324 +0,0 @@
> -/*
> - * QEMU System Emulator
> - *
> - * Copyright (c) 2003-2008 Fabrice Bellard
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a copy
> - * of this software and associated documentation files (the "Software"), to deal
> - * in the Software without restriction, including without limitation the rights
> - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> - * copies of the Software, and to permit persons to whom the Software is
> - * furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> - * THE SOFTWARE.
> - */
> -#include "qemu-common.h"
> -#include "qemu/error-report.h"
> -#include "qemu/iov.h"
> -#include "qemu/sockets.h"
> -#include "qemu/coroutine.h"
> -#include "migration/qemu-file.h"
> -#include "migration/qemu-file-internal.h"
> -
> -typedef struct QEMUFileSocket {
> - int fd;
> - QEMUFile *file;
> -} QEMUFileSocket;
> -
> -static ssize_t socket_writev_buffer(void *opaque, struct iovec *iov, int iovcnt,
> - int64_t pos)
> -{
> - QEMUFileSocket *s = opaque;
> - ssize_t len;
> - ssize_t size = iov_size(iov, iovcnt);
> - ssize_t offset = 0;
> - int err;
> -
> - while (size > 0) {
> - len = iov_send(s->fd, iov, iovcnt, offset, size);
> -
> - if (len > 0) {
> - size -= len;
> - offset += len;
> - }
> -
> - if (size > 0) {
> - err = socket_error();
> -
> - if (err != EAGAIN && err != EWOULDBLOCK) {
> - error_report("socket_writev_buffer: Got err=%d for (%zu/%zu)",
> - err, (size_t)size, (size_t)len);
> - /*
> - * If I've already sent some but only just got the error, I
> - * could return the amount validly sent so far and wait for the
> - * next call to report the error, but I'd rather flag the error
> - * immediately.
> - */
> - return -err;
> - }
> -
> - /* Emulate blocking */
> - GPollFD pfd;
> -
> - pfd.fd = s->fd;
> - pfd.events = G_IO_OUT | G_IO_ERR;
> - pfd.revents = 0;
> - TFR(err = g_poll(&pfd, 1, -1 /* no timeout */));
> - /* Errors other than EINTR intentionally ignored */
> - }
> - }
> -
> - return offset;
> -}
> -
> -static int socket_get_fd(void *opaque)
> -{
> - QEMUFileSocket *s = opaque;
> -
> - return s->fd;
> -}
> -
> -static ssize_t socket_get_buffer(void *opaque, uint8_t *buf, int64_t pos,
> - size_t size)
> -{
> - QEMUFileSocket *s = opaque;
> - ssize_t len;
> -
> - for (;;) {
> - len = qemu_recv(s->fd, buf, size, 0);
> - if (len != -1) {
> - break;
> - }
> - if (socket_error() == EAGAIN) {
> - yield_until_fd_readable(s->fd);
> - } else if (socket_error() != EINTR) {
> - break;
> - }
> - }
> -
> - if (len == -1) {
> - len = -socket_error();
> - }
> - return len;
> -}
> -
> -static int socket_close(void *opaque)
> -{
> - QEMUFileSocket *s = opaque;
> - closesocket(s->fd);
> - g_free(s);
> - return 0;
> -}
> -
> -static int socket_shutdown(void *opaque, bool rd, bool wr)
> -{
> - QEMUFileSocket *s = opaque;
> -
> - if (shutdown(s->fd, rd ? (wr ? SHUT_RDWR : SHUT_RD) : SHUT_WR)) {
> - return -errno;
> - } else {
> - return 0;
> - }
> -}
> -
> -static int socket_return_close(void *opaque)
> -{
> - QEMUFileSocket *s = opaque;
> - /*
> - * Note: We don't close the socket, that should be done by the forward
> - * path.
> - */
> - g_free(s);
> - return 0;
> -}
> -
> -static const QEMUFileOps socket_return_read_ops = {
> - .get_fd = socket_get_fd,
> - .get_buffer = socket_get_buffer,
> - .close = socket_return_close,
> - .shut_down = socket_shutdown,
> -};
> -
> -static const QEMUFileOps socket_return_write_ops = {
> - .get_fd = socket_get_fd,
> - .writev_buffer = socket_writev_buffer,
> - .close = socket_return_close,
> - .shut_down = socket_shutdown,
> -};
> -
> -/*
> - * Give a QEMUFile* off the same socket but data in the opposite
> - * direction.
> - */
> -static QEMUFile *socket_get_return_path(void *opaque)
> -{
> - QEMUFileSocket *forward = opaque;
> - QEMUFileSocket *reverse;
> -
> - if (qemu_file_get_error(forward->file)) {
> - /* If the forward file is in error, don't try and open a return */
> - return NULL;
> - }
> -
> - reverse = g_malloc0(sizeof(QEMUFileSocket));
> - reverse->fd = forward->fd;
> - /* I don't think there's a better way to tell which direction 'this' is */
> - if (forward->file->ops->get_buffer != NULL) {
> - /* being called from the read side, so we need to be able to write */
> - return qemu_fopen_ops(reverse, &socket_return_write_ops);
> - } else {
> - return qemu_fopen_ops(reverse, &socket_return_read_ops);
> - }
> -}
> -
> -static ssize_t unix_writev_buffer(void *opaque, struct iovec *iov, int iovcnt,
> - int64_t pos)
> -{
> - QEMUFileSocket *s = opaque;
> - ssize_t len, offset;
> - ssize_t size = iov_size(iov, iovcnt);
> - ssize_t total = 0;
> -
> - assert(iovcnt > 0);
> - offset = 0;
> - while (size > 0) {
> - /* Find the next start position; skip all full-sized vector elements */
> - while (offset >= iov[0].iov_len) {
> - offset -= iov[0].iov_len;
> - iov++, iovcnt--;
> - }
> -
> - /* skip `offset' bytes from the (now) first element, undo it on exit */
> - assert(iovcnt > 0);
> - iov[0].iov_base += offset;
> - iov[0].iov_len -= offset;
> -
> - do {
> - len = writev(s->fd, iov, iovcnt);
> - } while (len == -1 && errno == EINTR);
> - if (len == -1) {
> - return -errno;
> - }
> -
> - /* Undo the changes above */
> - iov[0].iov_base -= offset;
> - iov[0].iov_len += offset;
> -
> - /* Prepare for the next iteration */
> - offset += len;
> - total += len;
> - size -= len;
> - }
> -
> - return total;
> -}
> -
> -static ssize_t unix_get_buffer(void *opaque, uint8_t *buf, int64_t pos,
> - size_t size)
> -{
> - QEMUFileSocket *s = opaque;
> - ssize_t len;
> -
> - for (;;) {
> - len = read(s->fd, buf, size);
> - if (len != -1) {
> - break;
> - }
> - if (errno == EAGAIN) {
> - yield_until_fd_readable(s->fd);
> - } else if (errno != EINTR) {
> - break;
> - }
> - }
> -
> - if (len == -1) {
> - len = -errno;
> - }
> - return len;
> -}
> -
> -static int unix_close(void *opaque)
> -{
> - QEMUFileSocket *s = opaque;
> - close(s->fd);
> - g_free(s);
> - return 0;
> -}
> -
> -static const QEMUFileOps unix_read_ops = {
> - .get_fd = socket_get_fd,
> - .get_buffer = unix_get_buffer,
> - .close = unix_close
> -};
> -
> -static const QEMUFileOps unix_write_ops = {
> - .get_fd = socket_get_fd,
> - .writev_buffer = unix_writev_buffer,
> - .close = unix_close
> -};
> -
> -QEMUFile *qemu_fdopen(int fd, const char *mode)
> -{
> - QEMUFileSocket *s;
> -
> - if (mode == NULL ||
> - (mode[0] != 'r' && mode[0] != 'w') ||
> - mode[1] != 'b' || mode[2] != 0) {
> - fprintf(stderr, "qemu_fdopen: Argument validity check failed\n");
> - return NULL;
> - }
> -
> - s = g_new0(QEMUFileSocket, 1);
> - s->fd = fd;
> -
> - if (mode[0] == 'r') {
> - s->file = qemu_fopen_ops(s, &unix_read_ops);
> - } else {
> - s->file = qemu_fopen_ops(s, &unix_write_ops);
> - }
> - return s->file;
> -}
> -
> -static const QEMUFileOps socket_read_ops = {
> - .get_fd = socket_get_fd,
> - .get_buffer = socket_get_buffer,
> - .close = socket_close,
> - .shut_down = socket_shutdown,
> - .get_return_path = socket_get_return_path
> -};
> -
> -static const QEMUFileOps socket_write_ops = {
> - .get_fd = socket_get_fd,
> - .writev_buffer = socket_writev_buffer,
> - .close = socket_close,
> - .shut_down = socket_shutdown,
> - .get_return_path = socket_get_return_path
> -};
> -
> -QEMUFile *qemu_fopen_socket(int fd, const char *mode)
> -{
> - QEMUFileSocket *s;
> -
> - if (qemu_file_mode_is_not_valid(mode)) {
> - return NULL;
> - }
> -
> - s = g_new0(QEMUFileSocket, 1);
> - s->fd = fd;
> - if (mode[0] == 'w') {
> - qemu_set_block(s->fd);
> - s->file = qemu_fopen_ops(s, &socket_write_ops);
> - } else {
> - s->file = qemu_fopen_ops(s, &socket_read_ops);
> - }
> - return s->file;
> -}
> --
> 2.5.0
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2016-02-03 9:56 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 11:43 [Qemu-devel] [PATCH v1 00/22] Convert migration to QIOChannel & support TLS Daniel P. Berrange
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 01/22] s390: use FILE instead of QEMUFile for creating text file Daniel P. Berrange
2016-01-12 11:58 ` Cornelia Huck
2016-01-12 12:01 ` Daniel P. Berrange
2016-01-12 12:05 ` Cornelia Huck
2016-02-12 17:19 ` Dr. David Alan Gilbert
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 02/22] migration: remove use of qemu_bufopen from vmstate tests Daniel P. Berrange
2016-01-28 17:45 ` Dr. David Alan Gilbert
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 03/22] migration: ensure qemu_fflush() always writes full data amount Daniel P. Berrange
2016-01-28 17:53 ` Dr. David Alan Gilbert
2016-02-03 13:31 ` Daniel P. Berrange
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 04/22] migration: split migration hooks out of QEMUFileOps Daniel P. Berrange
2016-01-28 17:57 ` Dr. David Alan Gilbert
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 05/22] migration: introduce set_blocking function in QEMUFileOps Daniel P. Berrange
2016-01-28 18:00 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 06/22] migration: force QEMUFile to blocking mode for outgoing migration Daniel P. Berrange
2016-01-28 18:17 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 07/22] migration: introduce a new QEMUFile impl based on QIOChannel Daniel P. Berrange
2016-02-02 17:06 ` Dr. David Alan Gilbert
2016-02-03 13:37 ` Daniel P. Berrange
2016-02-12 17:16 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 08/22] migration: convert post-copy to use QIOChannelBuffer Daniel P. Berrange
2016-01-25 19:38 ` Dr. David Alan Gilbert
2016-01-25 22:15 ` Daniel P. Berrange
2016-01-26 18:59 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 09/22] migration: convert unix socket protocol to use QIOChannel Daniel P. Berrange
2016-02-02 18:02 ` Dr. David Alan Gilbert
2016-02-03 11:25 ` Daniel P. Berrange
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 10/22] migration: convert tcp " Daniel P. Berrange
2016-02-02 18:19 ` Dr. David Alan Gilbert
2016-02-03 10:02 ` Daniel P. Berrange
2016-02-03 10:33 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 11/22] migration: convert fd " Daniel P. Berrange
2016-02-02 18:46 ` Dr. David Alan Gilbert
2016-02-03 10:05 ` Daniel P. Berrange
2016-02-03 10:29 ` Dr. David Alan Gilbert
2016-02-03 10:39 ` Daniel P. Berrange
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 12/22] migration: convert exec " Daniel P. Berrange
2016-02-02 18:53 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 13/22] migration: convert RDMA to use QIOChannel interface Daniel P. Berrange
2016-02-02 20:01 ` Dr. David Alan Gilbert
2016-02-03 11:37 ` Daniel P. Berrange
2016-02-03 13:23 ` Dr. David Alan Gilbert
2016-02-03 13:25 ` Daniel P. Berrange
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 14/22] migration: convert savevm to use QIOChannel for writing to files Daniel P. Berrange
2016-02-03 9:52 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 15/22] migration: delete QEMUFile buffer implementation Daniel P. Berrange
2016-02-03 9:54 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 16/22] migration: delete QEMUSizedBuffer struct Daniel P. Berrange
2016-02-03 9:55 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 17/22] migration: delete QEMUFile sockets implementation Daniel P. Berrange
2016-02-03 9:56 ` Dr. David Alan Gilbert [this message]
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 18/22] migration: delete QEMUFile stdio implementation Daniel P. Berrange
2016-02-03 9:58 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 19/22] migration: move definition of struct QEMUFile back into qemu-file.c Daniel P. Berrange
2016-02-05 18:32 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 20/22] migration: support TLS encryption with TCP migration backend Daniel P. Berrange
2016-02-12 17:09 ` Dr. David Alan Gilbert
2016-02-12 17:25 ` Daniel P. Berrange
2016-02-15 11:00 ` Daniel P. Berrange
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 21/22] migration: remove support for non-iovec based write handlers Daniel P. Berrange
2016-02-12 15:48 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 22/22] migration: remove qemu_get_fd method from QEMUFile Daniel P. Berrange
2016-02-12 15:51 ` Dr. David Alan Gilbert
2016-01-12 11:59 ` [Qemu-devel] [PATCH v1 00/22] Convert migration to QIOChannel & support TLS Daniel P. Berrange
2016-01-20 18:01 ` Daniel P. Berrange
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160203095625.GD2376@work-vm \
--to=dgilbert@redhat.com \
--cc=amit.shah@redhat.com \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).