From: Paolo Bonzini Date: Thu, 10 Jan 2013 14:28:35 +0000 (+0100) Subject: raw-posix: fix bdrv_aio_ioctl X-Git-Tag: qemu-xen-4.3.0~6^2~9 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=204dd38c2da72687848d1a6fd2a81a8eaac6bf78;p=qemu-upstream-4.5-testing.git raw-posix: fix bdrv_aio_ioctl When the raw-posix aio=thread code was moved from posix-aio-compat.c to block/raw-posix.c, there was an unintended change to the ioctl code. The code used to return the ioctl command, which posix_aio_read() would later morph into a zero. This hack is not necessary anymore, and in fact breaks scsi-generic (which expects a zero return code). Remove it. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf (cherry picked from commit b608c8dc02c78ee95455a0989bdf1b41c768b2ef) Signed-off-by: Michael Roth --- diff --git a/block/raw-posix.c b/block/raw-posix.c index 550c81f22..5c6c564b5 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -456,15 +456,7 @@ static ssize_t handle_aiocb_ioctl(RawPosixAIOData *aiocb) return -errno; } - /* - * This looks weird, but the aio code only considers a request - * successful if it has written the full number of bytes. - * - * Now we overload aio_nbytes as aio_ioctl_cmd for the ioctl command, - * so in fact we return the ioctl command here to make posix_aio_read() - * happy.. - */ - return aiocb->aio_nbytes; + return 0; } static ssize_t handle_aiocb_flush(RawPosixAIOData *aiocb)