mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: add struct old_dev_t compat

Browse Source 
The compat LOOP_SET_STATUS ioctl uses struct old_dev_t in its passed
struct. That variable type is vastly different between different
architectures. Implement wrapping around it so we can use it.

This fixes running arm kpartx on an x86_64 host for me.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Alexander Graf 2012-01-31 19:44:41 +01:00 committed by Riku Voipio
parent 56e904ecb2
commit 6083abd9aa
3 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-user/syscall_types.h
View File

@ -83,9 +83,9 @@ STRUCT(mixer_info,
/* loop device ioctls */ /* loop device ioctls */
STRUCT(loop_info, STRUCT(loop_info,
TYPE_INT, /* lo_number */ TYPE_INT, /* lo_number */
TYPE_SHORT, /* lo_device */ TYPE_OLDDEVT, /* lo_device */
TYPE_ULONG, /* lo_inode */ TYPE_ULONG, /* lo_inode */
TYPE_SHORT, /* lo_rdevice */ TYPE_OLDDEVT, /* lo_rdevice */
TYPE_INT, /* lo_offset */ TYPE_INT, /* lo_offset */
TYPE_INT, /* lo_encrypt_type */ TYPE_INT, /* lo_encrypt_type */
TYPE_INT, /* lo_encrypt_key_size */ TYPE_INT, /* lo_encrypt_key_size */

28
thunk.c
View File

@ -46,6 +46,7 @@ static inline const argtype *thunk_type_next(const argtype *type_ptr)
case TYPE_LONG: case TYPE_LONG:
case TYPE_ULONG: case TYPE_ULONG:
case TYPE_PTRVOID: case TYPE_PTRVOID:
case TYPE_OLDDEVT:
return type_ptr; return type_ptr;
case TYPE_PTR: case TYPE_PTR:
return thunk_type_next_ptr(type_ptr); return thunk_type_next_ptr(type_ptr);
@ -188,6 +189,33 @@ const argtype *thunk_convert(void *dst, const void *src,
#else #else
#warning unsupported conversion #warning unsupported conversion
#endif #endif
case TYPE_OLDDEVT:
{
uint64_t val = 0;
switch (thunk_type_size(type_ptr - 1, !to_host)) {
case 2:
val = *(uint16_t *)src;
break;
case 4:
val = *(uint32_t *)src;
break;
case 8:
val = *(uint64_t *)src;
break;
}
switch (thunk_type_size(type_ptr - 1, to_host)) {
case 2:
*(uint16_t *)dst = tswap16(val);
break;
case 4:
*(uint32_t *)dst = tswap32(val);
break;
case 8:
*(uint64_t *)dst = tswap64(val);
break;
}
break;
}
case TYPE_ARRAY: case TYPE_ARRAY:
{ {
int array_length, i, dst_size, src_size; int array_length, i, dst_size, src_size;

28
thunk.h
View File

@ -37,6 +37,7 @@ typedef enum argtype {
TYPE_PTR, TYPE_PTR,
TYPE_ARRAY, TYPE_ARRAY,
TYPE_STRUCT, TYPE_STRUCT,
TYPE_OLDDEVT,
} argtype; } argtype;
#define MK_PTR(type) TYPE_PTR, type #define MK_PTR(type) TYPE_PTR, type
@ -104,6 +105,31 @@ static inline int thunk_type_size(const argtype *type_ptr, int is_host)
return TARGET_ABI_BITS / 8; return TARGET_ABI_BITS / 8;
} }
break; break;
case TYPE_OLDDEVT:
if (is_host) {
#if defined(HOST_X86_64)
return 8;
#elif defined(HOST_ALPHA) || defined(HOST_IA64) || defined(HOST_MIPS) || \
defined(HOST_PARISC) || defined(HOST_SPARC64)
return 4;
#elif defined(HOST_PPC)
return HOST_LONG_SIZE;
#else
return 2;
#endif
} else {
#if defined(TARGET_X86_64)
return 8;
#elif defined(TARGET_ALPHA) || defined(TARGET_IA64) || defined(TARGET_MIPS) || \
defined(TARGET_PARISC) || defined(TARGET_SPARC64)
return 4;
#elif defined(TARGET_PPC)
return TARGET_ABI_BITS / 8;
#else
return 2;
#endif
}
break;
case TYPE_ARRAY: case TYPE_ARRAY:
size = type_ptr[1]; size = type_ptr[1];
return size * thunk_type_size_array(type_ptr + 2, is_host); return size * thunk_type_size_array(type_ptr + 2, is_host);
@ -141,6 +167,8 @@ static inline int thunk_type_align(const argtype *type_ptr, int is_host)
return TARGET_ABI_BITS / 8; return TARGET_ABI_BITS / 8;
} }
break; break;
case TYPE_OLDDEVT:
return thunk_type_size(type_ptr, is_host);
case TYPE_ARRAY: case TYPE_ARRAY:
return thunk_type_align_array(type_ptr + 2, is_host); return thunk_type_align_array(type_ptr + 2, is_host);
case TYPE_STRUCT: case TYPE_STRUCT: