{"id":810525,"url":"http://patchwork.ozlabs.org/api/patches/810525/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-2-quintela@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906115143.27451-2-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-06T11:51:22","name":"[v7,01/22] Revert \"io: add new qio_channel_{readv, writev, read, write}_all functions\"","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"14cebe853f72bf3901eba19a6fd308dc5eca23f2","submitter":{"id":2643,"url":"http://patchwork.ozlabs.org/api/people/2643/?format=json","name":"Juan Quintela","email":"quintela@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-2-quintela@redhat.com/mbox/","series":[{"id":1773,"url":"http://patchwork.ozlabs.org/api/series/1773/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1773","date":"2017-09-06T11:51:21","name":"Multifd","version":7,"mbox":"http://patchwork.ozlabs.org/series/1773/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810525/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810525/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=quintela@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnMQV4k5Kz9sBW\n\tfor ;\n\tWed, 6 Sep 2017 21:52:34 +1000 (AEST)","from localhost ([::1]:35575 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpYsi-0007EM-NB\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 07:52:32 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60111)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYs7-0007Dr-Fd\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:51:57 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYs5-0007tu-MS\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:51:55 -0400","from mx1.redhat.com ([209.132.183.28]:47398)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYs5-0007s3-Dh\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:51:53 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 6A0D45F723\n\tfor ; Wed, 6 Sep 2017 11:51:52 +0000 (UTC)","from secure.mitica (ovpn-117-188.ams2.redhat.com [10.36.117.188])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 16B505B818;\n\tWed, 6 Sep 2017 11:51:50 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 6A0D45F723","From":"Juan Quintela ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 13:51:22 +0200","Message-Id":"<20170906115143.27451-2-quintela@redhat.com>","In-Reply-To":"<20170906115143.27451-1-quintela@redhat.com>","References":"<20170906115143.27451-1-quintela@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tWed, 06 Sep 2017 11:51:52 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v7 01/22] Revert \"io: add new\n\tqio_channel_{readv, writev, read, write}_all functions\"","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This reverts commit d4622e55883211072621958d39ddaa73483d201e.\n\nSigned-off-by: Juan Quintela \n---\n include/io/channel.h | 90 ---------------------------------------\n io/channel.c | 94 -----------------------------------------\n tests/io-channel-helpers.c | 102 +++++++++++++++++++++++++++++++++++++++++----\n 3 files changed, 93 insertions(+), 193 deletions(-)","diff":"diff --git a/include/io/channel.h b/include/io/channel.h\nindex 8f25893c45..54f3dc252f 100644\n--- a/include/io/channel.h\n+++ b/include/io/channel.h\n@@ -269,58 +269,6 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc,\n Error **errp);\n \n /**\n- * qio_channel_readv_all:\n- * @ioc: the channel object\n- * @iov: the array of memory regions to read data into\n- * @niov: the length of the @iov array\n- * @errp: pointer to a NULL-initialized error object\n- *\n- * Read data from the IO channel, storing it in the\n- * memory regions referenced by @iov. Each element\n- * in the @iov will be fully populated with data\n- * before the next one is used. The @niov parameter\n- * specifies the total number of elements in @iov.\n- *\n- * The function will wait for all requested data\n- * to be read, yielding from the current coroutine\n- * if required.\n- *\n- * If end-of-file occurs before all requested data\n- * has been read, an error will be reported.\n- *\n- * Returns: 0 if all bytes were read, or -1 on error\n- */\n-int qio_channel_readv_all(QIOChannel *ioc,\n- const struct iovec *iov,\n- size_t niov,\n- Error **errp);\n-\n-\n-/**\n- * qio_channel_writev_all:\n- * @ioc: the channel object\n- * @iov: the array of memory regions to write data from\n- * @niov: the length of the @iov array\n- * @errp: pointer to a NULL-initialized error object\n- *\n- * Write data to the IO channel, reading it from the\n- * memory regions referenced by @iov. Each element\n- * in the @iov will be fully sent, before the next\n- * one is used. The @niov parameter specifies the\n- * total number of elements in @iov.\n- *\n- * The function will wait for all requested data\n- * to be written, yielding from the current coroutine\n- * if required.\n- *\n- * Returns: 0 if all bytes were written, or -1 on error\n- */\n-int qio_channel_writev_all(QIOChannel *ioc,\n- const struct iovec *iov,\n- size_t niov,\n- Error **erp);\n-\n-/**\n * qio_channel_readv:\n * @ioc: the channel object\n * @iov: the array of memory regions to read data into\n@@ -383,44 +331,6 @@ ssize_t qio_channel_write(QIOChannel *ioc,\n Error **errp);\n \n /**\n- * qio_channel_read_all:\n- * @ioc: the channel object\n- * @buf: the memory region to read data into\n- * @buflen: the number of bytes to @buf\n- * @errp: pointer to a NULL-initialized error object\n- *\n- * Reads @buflen bytes into @buf, possibly blocking or (if the\n- * channel is non-blocking) yielding from the current coroutine\n- * multiple times until the entire content is read. If end-of-file\n- * occurs it will return an error rather than a short-read. Otherwise\n- * behaves as qio_channel_read().\n- *\n- * Returns: 0 if all bytes were read, or -1 on error\n- */\n-int qio_channel_read_all(QIOChannel *ioc,\n- char *buf,\n- size_t buflen,\n- Error **errp);\n-/**\n- * qio_channel_write_all:\n- * @ioc: the channel object\n- * @buf: the memory region to write data into\n- * @buflen: the number of bytes to @buf\n- * @errp: pointer to a NULL-initialized error object\n- *\n- * Writes @buflen bytes from @buf, possibly blocking or (if the\n- * channel is non-blocking) yielding from the current coroutine\n- * multiple times until the entire content is written. Otherwise\n- * behaves as qio_channel_write().\n- *\n- * Returns: 0 if all bytes were written, or -1 on error\n- */\n-int qio_channel_write_all(QIOChannel *ioc,\n- const char *buf,\n- size_t buflen,\n- Error **errp);\n-\n-/**\n * qio_channel_set_blocking:\n * @ioc: the channel object\n * @enabled: the blocking flag state\ndiff --git a/io/channel.c b/io/channel.c\nindex 5e8c2f0a91..1cfb8b33a2 100644\n--- a/io/channel.c\n+++ b/io/channel.c\n@@ -22,7 +22,6 @@\n #include \"io/channel.h\"\n #include \"qapi/error.h\"\n #include \"qemu/main-loop.h\"\n-#include \"qemu/iov.h\"\n \n bool qio_channel_has_feature(QIOChannel *ioc,\n QIOChannelFeature feature)\n@@ -86,79 +85,6 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc,\n }\n \n \n-\n-int qio_channel_readv_all(QIOChannel *ioc,\n- const struct iovec *iov,\n- size_t niov,\n- Error **errp)\n-{\n- int ret = -1;\n- struct iovec *local_iov = g_new(struct iovec, niov);\n- struct iovec *local_iov_head = local_iov;\n- unsigned int nlocal_iov = niov;\n-\n- nlocal_iov = iov_copy(local_iov, nlocal_iov,\n- iov, niov,\n- 0, iov_size(iov, niov));\n-\n- while (nlocal_iov > 0) {\n- ssize_t len;\n- len = qio_channel_readv(ioc, local_iov, nlocal_iov, errp);\n- if (len == QIO_CHANNEL_ERR_BLOCK) {\n- qio_channel_wait(ioc, G_IO_IN);\n- continue;\n- } else if (len < 0) {\n- goto cleanup;\n- } else if (len == 0) {\n- error_setg(errp,\n- \"Unexpected end-of-file before all bytes were read\");\n- goto cleanup;\n- }\n-\n- iov_discard_front(&local_iov, &nlocal_iov, len);\n- }\n-\n- ret = 0;\n-\n- cleanup:\n- g_free(local_iov_head);\n- return ret;\n-}\n-\n-int qio_channel_writev_all(QIOChannel *ioc,\n- const struct iovec *iov,\n- size_t niov,\n- Error **errp)\n-{\n- int ret = -1;\n- struct iovec *local_iov = g_new(struct iovec, niov);\n- struct iovec *local_iov_head = local_iov;\n- unsigned int nlocal_iov = niov;\n-\n- nlocal_iov = iov_copy(local_iov, nlocal_iov,\n- iov, niov,\n- 0, iov_size(iov, niov));\n-\n- while (nlocal_iov > 0) {\n- ssize_t len;\n- len = qio_channel_writev(ioc, local_iov, nlocal_iov, errp);\n- if (len == QIO_CHANNEL_ERR_BLOCK) {\n- qio_channel_wait(ioc, G_IO_OUT);\n- continue;\n- }\n- if (len < 0) {\n- goto cleanup;\n- }\n-\n- iov_discard_front(&local_iov, &nlocal_iov, len);\n- }\n-\n- ret = 0;\n- cleanup:\n- g_free(local_iov_head);\n- return ret;\n-}\n-\n ssize_t qio_channel_readv(QIOChannel *ioc,\n const struct iovec *iov,\n size_t niov,\n@@ -197,26 +123,6 @@ ssize_t qio_channel_write(QIOChannel *ioc,\n }\n \n \n-int qio_channel_read_all(QIOChannel *ioc,\n- char *buf,\n- size_t buflen,\n- Error **errp)\n-{\n- struct iovec iov = { .iov_base = buf, .iov_len = buflen };\n- return qio_channel_readv_all(ioc, &iov, 1, errp);\n-}\n-\n-\n-int qio_channel_write_all(QIOChannel *ioc,\n- const char *buf,\n- size_t buflen,\n- Error **errp)\n-{\n- struct iovec iov = { .iov_base = (char *)buf, .iov_len = buflen };\n- return qio_channel_writev_all(ioc, &iov, 1, errp);\n-}\n-\n-\n int qio_channel_set_blocking(QIOChannel *ioc,\n bool enabled,\n Error **errp)\ndiff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c\nindex 5430e1389d..05e5579cf8 100644\n--- a/tests/io-channel-helpers.c\n+++ b/tests/io-channel-helpers.c\n@@ -21,7 +21,6 @@\n #include \"qemu/osdep.h\"\n #include \"io-channel-helpers.h\"\n #include \"qapi/error.h\"\n-#include \"qemu/iov.h\"\n \n struct QIOChannelTest {\n QIOChannel *src;\n@@ -38,17 +37,77 @@ struct QIOChannelTest {\n };\n \n \n+static void test_skip_iovec(struct iovec **iov,\n+ size_t *niov,\n+ size_t skip,\n+ struct iovec *old)\n+{\n+ size_t offset = 0;\n+ size_t i;\n+\n+ for (i = 0; i < *niov; i++) {\n+ if (skip < (*iov)[i].iov_len) {\n+ old->iov_len = (*iov)[i].iov_len;\n+ old->iov_base = (*iov)[i].iov_base;\n+\n+ (*iov)[i].iov_len -= skip;\n+ (*iov)[i].iov_base += skip;\n+ break;\n+ } else {\n+ skip -= (*iov)[i].iov_len;\n+\n+ if (i == 0 && old->iov_base) {\n+ (*iov)[i].iov_len = old->iov_len;\n+ (*iov)[i].iov_base = old->iov_base;\n+ old->iov_len = 0;\n+ old->iov_base = NULL;\n+ }\n+\n+ offset++;\n+ }\n+ }\n+\n+ *iov = *iov + offset;\n+ *niov -= offset;\n+}\n+\n+\n /* This thread sends all data using iovecs */\n static gpointer test_io_thread_writer(gpointer opaque)\n {\n QIOChannelTest *data = opaque;\n+ struct iovec *iov = data->inputv;\n+ size_t niov = data->niov;\n+ struct iovec old = { 0 };\n \n qio_channel_set_blocking(data->src, data->blocking, NULL);\n \n- qio_channel_writev_all(data->src,\n- data->inputv,\n- data->niov,\n- &data->writeerr);\n+ while (niov) {\n+ ssize_t ret;\n+ ret = qio_channel_writev(data->src,\n+ iov,\n+ niov,\n+ &data->writeerr);\n+ if (ret == QIO_CHANNEL_ERR_BLOCK) {\n+ if (data->blocking) {\n+ error_setg(&data->writeerr,\n+ \"Unexpected I/O blocking\");\n+ break;\n+ } else {\n+ qio_channel_wait(data->src,\n+ G_IO_OUT);\n+ continue;\n+ }\n+ } else if (ret < 0) {\n+ break;\n+ } else if (ret == 0) {\n+ error_setg(&data->writeerr,\n+ \"Unexpected zero length write\");\n+ break;\n+ }\n+\n+ test_skip_iovec(&iov, &niov, ret, &old);\n+ }\n \n return NULL;\n }\n@@ -58,13 +117,38 @@ static gpointer test_io_thread_writer(gpointer opaque)\n static gpointer test_io_thread_reader(gpointer opaque)\n {\n QIOChannelTest *data = opaque;\n+ struct iovec *iov = data->outputv;\n+ size_t niov = data->niov;\n+ struct iovec old = { 0 };\n \n qio_channel_set_blocking(data->dst, data->blocking, NULL);\n \n- qio_channel_readv_all(data->dst,\n- data->outputv,\n- data->niov,\n- &data->readerr);\n+ while (niov) {\n+ ssize_t ret;\n+\n+ ret = qio_channel_readv(data->dst,\n+ iov,\n+ niov,\n+ &data->readerr);\n+\n+ if (ret == QIO_CHANNEL_ERR_BLOCK) {\n+ if (data->blocking) {\n+ error_setg(&data->readerr,\n+ \"Unexpected I/O blocking\");\n+ break;\n+ } else {\n+ qio_channel_wait(data->dst,\n+ G_IO_IN);\n+ continue;\n+ }\n+ } else if (ret < 0) {\n+ break;\n+ } else if (ret == 0) {\n+ break;\n+ }\n+\n+ test_skip_iovec(&iov, &niov, ret, &old);\n+ }\n \n return NULL;\n }\n","prefixes":["v7","01/22"]}