2012-02-01 00:51:53 +01:00
|
|
|
From 8563ceced36263dbc91af9d6941e18626bd9f488 Mon Sep 17 00:00:00 2001
|
2012-02-01 00:10:40 +01:00
|
|
|
From: Alexander Graf <agraf@suse.de>
|
|
|
|
|
Date: Tue, 31 Jan 2012 20:10:20 +0100
|
|
|
|
|
Subject: [PATCH] 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>
|
|
|
|
|
---
|
|
|
|
|
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 c8b57c9..21b054c 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)
|
|
|
|
|
--
|
|
|
|
|
1.6.0.2
|
|
|
|
|
|
