On 03/04/2015 13:01, Bogdan Purcareata wrote:
> This fixes ioctl behavior on powerpc e6500 platforms with 64bit kernel and
> 32bit
> userspace. The current type cast has no effect there and the value passed to
> the
> kernel is still 0. Probably an issue related to the compiler, since I'm
> assuming
> the same configuration works on a similar setup on x86.
>
> Also ensure consistency with previous type cast in TRACE message.
>
> Signed-off-by: Bogdan Purcareata <bogdan.purcare...@freescale.com>
> ---
> nbd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/nbd.c b/nbd.c
> index 91b7d56..da81a5b 100644
> --- a/nbd.c
> +++ b/nbd.c
> @@ -681,7 +681,7 @@ int nbd_init(int fd, int csock, uint32_t flags, off_t
> size)
>
> TRACE("Setting size to %zd block(s)", (size_t)(size / BDRV_SECTOR_SIZE));
>
> - if (ioctl(fd, NBD_SET_SIZE_BLOCKS, size / (size_t)BDRV_SECTOR_SIZE) < 0)
> {
> + if (ioctl(fd, NBD_SET_SIZE_BLOCKS, (size_t)(size / BDRV_SECTOR_SIZE) <
> 0)) {
> int serrno = errno;
> LOG("Failed setting size (in blocks)");
> return -serrno;
>
Thanks, queued for 2.4.
Cc: qemu-sta...@nongnu.org
