On 6/24/21 8:04 PM, Paolo Bonzini wrote: > Similar to other handle_aiocb_* functions, handle_aiocb_ioctl needs to cater > for the possibility that ioctl is interrupted by a signal. Otherwise, the > I/O is incorrectly reported as a failure to the guest. > > Reported-by: Gordon Watson <gwat...@redhat.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > block/file-posix.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/block/file-posix.c b/block/file-posix.c > index 74b8216077..a26eab0ac3 100644 > --- a/block/file-posix.c > +++ b/block/file-posix.c > @@ -1347,7 +1347,9 @@ static int handle_aiocb_ioctl(void *opaque) > RawPosixAIOData *aiocb = opaque; > int ret; > > - ret = ioctl(aiocb->aio_fildes, aiocb->ioctl.cmd, aiocb->ioctl.buf); > + do { > + ret = ioctl(aiocb->aio_fildes, aiocb->ioctl.cmd, aiocb->ioctl.buf); > + } while (ret == -1 && errno == EINTR);
Shouldn't this use the TFR macro instead? > if (ret == -1) { > return -errno; > } >