summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini2021-06-15 08:34:52 +0200
committerPaolo Bonzini2021-06-25 10:54:13 +0200
commitbd80936a4f18075e0e407df180801a9743ce290c (patch)
treee95f933bef92578b036057d5ad14efeef46545e2
parentblock: detect DKIOCGETBLOCKCOUNT/SIZE before use (diff)
downloadqemu-bd80936a4f18075e0e407df180801a9743ce290c.tar.gz
qemu-bd80936a4f18075e0e407df180801a9743ce290c.tar.xz
qemu-bd80936a4f18075e0e407df180801a9743ce290c.zip
file-posix: handle EINTR during ioctl
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 <gwatson@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--block/file-posix.c4
1 files changed, 3 insertions, 1 deletions
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);
if (ret == -1) {
return -errno;
}