motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 07:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-user: create target_structs header to place ipc_perm and shmid_ds

Browse source 
Creating target_structs header in linux-user/$arch/ and making
target_ipc_perm and target_shmid_ds its first inhabitants.
The struct defintions may/should be further fine-tuned by arch maintainers.

Signed-off-by: Petar Jovanovic <petar.jovanovic@imgtec.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Petar Jovanovic 2013-10-30 14:46:31 +01:00 • committed by Riku Voipio
parent 9721cf2cd6
commit 55a2b1631f
20 changed files with 963 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

76
linux-user/syscall.c
View file

@ -2436,21 +2436,6 @@ static struct shm_region {
abi_ulong size;
} shm_regions[N_SHM_REGIONS];
struct target_ipc_perm
{
abi_long __key;
abi_ulong uid;
abi_ulong gid;
abi_ulong cuid;
abi_ulong cgid;
unsigned short int mode;
unsigned short int __pad1;
unsigned short int __seq;
unsigned short int __pad2;
abi_ulong __unused1;
abi_ulong __unused2;
};
struct target_semid_ds
{
struct target_ipc_perm sem_perm;
@ -2472,12 +2457,21 @@ static inline abi_long target_to_host_ipc_perm(struct ipc_perm *host_ip,
if (!lock_user_struct(VERIFY_READ, target_sd, target_addr, 1))
return -TARGET_EFAULT;
target_ip = &(target_sd->sem_perm);
host_ip->__key = tswapal(target_ip->__key);
host_ip->uid = tswapal(target_ip->uid);
host_ip->gid = tswapal(target_ip->gid);
host_ip->cuid = tswapal(target_ip->cuid);
host_ip->cgid = tswapal(target_ip->cgid);
host_ip->__key = tswap32(target_ip->__key);
host_ip->uid = tswap32(target_ip->uid);
host_ip->gid = tswap32(target_ip->gid);
host_ip->cuid = tswap32(target_ip->cuid);
host_ip->cgid = tswap32(target_ip->cgid);
#if defined(TARGET_ALPHA) || defined(TARGET_MIPS) || defined(TARGET_PPC)
host_ip->mode = tswap32(target_ip->mode);
#else
host_ip->mode = tswap16(target_ip->mode);
#endif
#if defined(TARGET_PPC)
host_ip->__seq = tswap32(target_ip->__seq);
#else
host_ip->__seq = tswap16(target_ip->__seq);
#endif
unlock_user_struct(target_sd, target_addr, 0);
return 0;
}
@ -2491,12 +2485,21 @@ static inline abi_long host_to_target_ipc_perm(abi_ulong target_addr,
if (!lock_user_struct(VERIFY_WRITE, target_sd, target_addr, 0))
return -TARGET_EFAULT;
target_ip = &(target_sd->sem_perm);
target_ip->__key = tswapal(host_ip->__key);
target_ip->uid = tswapal(host_ip->uid);
target_ip->gid = tswapal(host_ip->gid);
target_ip->cuid = tswapal(host_ip->cuid);
target_ip->cgid = tswapal(host_ip->cgid);
target_ip->__key = tswap32(host_ip->__key);
target_ip->uid = tswap32(host_ip->uid);
target_ip->gid = tswap32(host_ip->gid);
target_ip->cuid = tswap32(host_ip->cuid);
target_ip->cgid = tswap32(host_ip->cgid);
#if defined(TARGET_ALPHA) || defined(TARGET_MIPS) || defined(TARGET_PPC)
target_ip->mode = tswap32(host_ip->mode);
#else
target_ip->mode = tswap16(host_ip->mode);
#endif
#if defined(TARGET_PPC)
target_ip->__seq = tswap32(host_ip->__seq);
#else
target_ip->__seq = tswap16(host_ip->__seq);
#endif
unlock_user_struct(target_sd, target_addr, 1);
return 0;
}
@ -2927,29 +2930,6 @@ end:
return ret;
}
struct target_shmid_ds
{
struct target_ipc_perm shm_perm;
abi_ulong shm_segsz;
abi_ulong shm_atime;
#if TARGET_ABI_BITS == 32
abi_ulong __unused1;
#endif
abi_ulong shm_dtime;
#if TARGET_ABI_BITS == 32
abi_ulong __unused2;
#endif
abi_ulong shm_ctime;
#if TARGET_ABI_BITS == 32
abi_ulong __unused3;
#endif
int shm_cpid;
int shm_lpid;
abi_ulong shm_nattch;
unsigned long int __unused4;
unsigned long int __unused5;
};
static inline abi_long target_to_host_shmid_ds(struct shmid_ds *host_sd,
abi_ulong target_addr)
{