diff options
| author | Alexander Graf <agraf@suse.de> | 2012-01-31 20:10:20 +0100 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2012-04-06 18:49:58 +0300 |
| commit | edafea1330133eb8f6580a1c4f84fc5ec766eb4c (patch) | |
| tree | 73b9e0259df27defe4732c29d85afab29f6f448f | |
| parent | 6083abd9aa134c9b0804e584f8279f54e6c90a1c (diff) | |
| download | qemu-edafea1330133eb8f6580a1c4f84fc5ec766eb4c.zip qemu-edafea1330133eb8f6580a1c4f84fc5ec766eb4c.tar.gz qemu-edafea1330133eb8f6580a1c4f84fc5ec766eb4c.tar.bz2 | |
linux-user: fix BLK ioctl arguments
Some BLK ioctls passed sizeof(x) into a macro that already did sizeof() on
the passed in argument, rendering the size information inside the ioctl be
the size of the host default integer type.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rw-r--r-- | linux-user/syscall_defs.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index f8f3af3..a79b67d 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -832,9 +832,11 @@ struct target_pollfd { #define TARGET_BLKSECTGET TARGET_IO(0x12,103)/* get max sectors per request (ll_rw_blk.c) */ #define TARGET_BLKSSZGET TARGET_IO(0x12,104)/* get block device sector size */ /* A jump here: 108-111 have been used for various private purposes. */ -#define TARGET_BLKBSZGET TARGET_IOR(0x12,112,sizeof(int)) -#define TARGET_BLKBSZSET TARGET_IOW(0x12,113,sizeof(int)) -#define TARGET_BLKGETSIZE64 TARGET_IOR(0x12,114,sizeof(uint64_t)) /* return device size in bytes (u64 *arg) */ +#define TARGET_BLKBSZGET TARGET_IOR(0x12,112,int) +#define TARGET_BLKBSZSET TARGET_IOW(0x12,113,int) +#define TARGET_BLKGETSIZE64 TARGET_IOR(0x12,114,abi_ulong) + /* return device size in bytes + (u64 *arg) */ #define TARGET_FIBMAP TARGET_IO(0x00,1) /* bmap access */ #define TARGET_FIGETBSZ TARGET_IO(0x00,2) /* get the block size used for bmap */ #define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap) |