motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 22:11:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

io: Add flags argument to qio_channel_readv_full_all_eof

Browse source 
We want to pass flags into qio_channel_tls_readv() but
qio_channel_readv_full_all_eof() doesn't take a flags argument.

No functional change.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Fabiano Rosas 2025-02-07 10:46:17 -03:00
parent 0b8a70d70f
commit a25b013019
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/remote/mpqemu-link.c
View file

@ -110,7 +110,7 @@ static ssize_t mpqemu_read(QIOChannel *ioc, void *buf, size_t len, int **fds,
bql_unlock(); bql_unlock();
} }
ret = qio_channel_readv_full_all_eof(ioc, &iov, 1, fds, nfds, errp); ret = qio_channel_readv_full_all_eof(ioc, &iov, 1, fds, nfds, 0, errp);
if (drop_bql && !iothread && !qemu_in_coroutine()) { if (drop_bql && !iothread && !qemu_in_coroutine()) {
bql_lock(); bql_lock();

2
include/io/channel.h
View file

@ -885,6 +885,7 @@ void qio_channel_set_aio_fd_handler(QIOChannel *ioc,
* @niov: the length of the @iov array * @niov: the length of the @iov array
* @fds: an array of file handles to read * @fds: an array of file handles to read
* @nfds: number of file handles in @fds * @nfds: number of file handles in @fds
* @flags: read flags (QIO_CHANNEL_READ_FLAG_*)
* @errp: pointer to a NULL-initialized error object * @errp: pointer to a NULL-initialized error object
* *
* *
@ -903,6 +904,7 @@ int coroutine_mixed_fn qio_channel_readv_full_all_eof(QIOChannel *ioc,
const struct iovec *iov, const struct iovec *iov,
size_t niov, size_t niov,
int **fds, size_t *nfds, int **fds, size_t *nfds,
int flags,
Error **errp); Error **errp);
/** /**

9
io/channel.c
View file

@ -115,7 +115,8 @@ int coroutine_mixed_fn qio_channel_readv_all_eof(QIOChannel *ioc,
size_t niov, size_t niov,
Error **errp) Error **errp)
{ {
return qio_channel_readv_full_all_eof(ioc, iov, niov, NULL, NULL, errp); return qio_channel_readv_full_all_eof(ioc, iov, niov, NULL, NULL, 0,
errp);
} }
int coroutine_mixed_fn qio_channel_readv_all(QIOChannel *ioc, int coroutine_mixed_fn qio_channel_readv_all(QIOChannel *ioc,
@ -130,6 +131,7 @@ int coroutine_mixed_fn qio_channel_readv_full_all_eof(QIOChannel *ioc,
const struct iovec *iov, const struct iovec *iov,
size_t niov, size_t niov,
int **fds, size_t *nfds, int **fds, size_t *nfds,
int flags,
Error **errp) Error **errp)
{ {
int ret = -1; int ret = -1;
@ -155,7 +157,7 @@ int coroutine_mixed_fn qio_channel_readv_full_all_eof(QIOChannel *ioc,
while ((nlocal_iov > 0) || local_fds) { while ((nlocal_iov > 0) || local_fds) {
ssize_t len; ssize_t len;
len = qio_channel_readv_full(ioc, local_iov, nlocal_iov, local_fds, len = qio_channel_readv_full(ioc, local_iov, nlocal_iov, local_fds,
local_nfds, 0, errp); local_nfds, flags, errp);
if (len == QIO_CHANNEL_ERR_BLOCK) { if (len == QIO_CHANNEL_ERR_BLOCK) {
if (qemu_in_coroutine()) { if (qemu_in_coroutine()) {
qio_channel_yield(ioc, G_IO_IN); qio_channel_yield(ioc, G_IO_IN);
@ -222,7 +224,8 @@ int coroutine_mixed_fn qio_channel_readv_full_all(QIOChannel *ioc,
int **fds, size_t *nfds, int **fds, size_t *nfds,
Error **errp) Error **errp)
{ {
int ret = qio_channel_readv_full_all_eof(ioc, iov, niov, fds, nfds, errp); int ret = qio_channel_readv_full_all_eof(ioc, iov, niov, fds, nfds, 0,
errp);
if (ret == 0) { if (ret == 0) {
error_setg(errp, "Unexpected end-of-file before all data were read"); error_setg(errp, "Unexpected end-of-file before all data were read");