david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-user: Support ioctls whose parameter size is not constant

Browse Source 
Some ioctls (for example FS_IOC_FIEMAP) use structures whose size is
not constant. The generic argument conversion code in do_ioctl()
cannot handle this, so add support for implementing a special-case
handler for a particular ioctl which does the conversion itself.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
This commit is contained in:
Peter Maydell 2011-01-06 15:04:17 +00:00 committed by Riku Voipio
parent c727f47d59
commit d2ef05bb44
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
linux-user/syscall.c
View File

@ -2965,13 +2965,19 @@ enum {
#undef STRUCT #undef STRUCT
#undef STRUCT_SPECIAL #undef STRUCT_SPECIAL
typedef struct IOCTLEntry { typedef struct IOCTLEntry IOCTLEntry;
typedef abi_long do_ioctl_fn(const IOCTLEntry *ie, uint8_t *buf_temp,
int fd, abi_long cmd, abi_long arg);
struct IOCTLEntry {
unsigned int target_cmd; unsigned int target_cmd;
unsigned int host_cmd; unsigned int host_cmd;
const char *name; const char *name;
int access; int access;
do_ioctl_fn *do_ioctl;
const argtype arg_type[5]; const argtype arg_type[5];
} IOCTLEntry; };
#define IOC_R 0x0001 #define IOC_R 0x0001
#define IOC_W 0x0002 #define IOC_W 0x0002
@ -2981,7 +2987,9 @@ typedef struct IOCTLEntry {
static IOCTLEntry ioctl_entries[] = { static IOCTLEntry ioctl_entries[] = {
#define IOCTL(cmd, access, ...) \ #define IOCTL(cmd, access, ...) \
{ TARGET_ ## cmd, cmd, #cmd, access, { __VA_ARGS__ } }, { TARGET_ ## cmd, cmd, #cmd, access, 0, { __VA_ARGS__ } },
#define IOCTL_SPECIAL(cmd, access, dofn, ...) \
{ TARGET_ ## cmd, cmd, #cmd, access, dofn, { __VA_ARGS__ } },
#include "ioctls.h" #include "ioctls.h"
{ 0, 0, }, { 0, 0, },
}; };
@ -3011,6 +3019,10 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
#if defined(DEBUG) #if defined(DEBUG)
gemu_log("ioctl: cmd=0x%04lx (%s)\n", (long)cmd, ie->name); gemu_log("ioctl: cmd=0x%04lx (%s)\n", (long)cmd, ie->name);
#endif #endif
if (ie->do_ioctl) {
return ie->do_ioctl(ie, buf_temp, fd, cmd, arg);
}
switch(arg_type[0]) { switch(arg_type[0]) {
case TYPE_NULL: case TYPE_NULL:
/* no argument */ /* no argument */