The target_semid_ds structure is not correct for all architectures: the padding fields should only exist for: * 32-bit ABIs * x86 It is also misnamed, since it is following the kernel semid64_ds structure (QEMU doesn't support the legacy semid_ds structure at all). Rename the struct, provide a correct generic definition and allow the oddball x86 architecture to provide its own version. This fixes broken SYSV semaphores for all our 64-bit architectures except x86 and ppc. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
		
			
				
	
	
		
			74 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * X86-64 specific structures for linux-user
 | 
						|
 *
 | 
						|
 * Copyright (c) 2013 Fabrice Bellard
 | 
						|
 *
 | 
						|
 * This library is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU Lesser General Public
 | 
						|
 * License as published by the Free Software Foundation; either
 | 
						|
 * version 2 of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This library is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * Lesser General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU Lesser General Public
 | 
						|
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 | 
						|
 */
 | 
						|
#ifndef X86_64_TARGET_STRUCTS_H
 | 
						|
#define X86_64_TARGET_STRUCTS_H
 | 
						|
 | 
						|
struct target_ipc_perm {
 | 
						|
    abi_int __key;                      /* Key.  */
 | 
						|
    abi_uint uid;                       /* Owner's user ID.  */
 | 
						|
    abi_uint gid;                       /* Owner's group ID.  */
 | 
						|
    abi_uint cuid;                      /* Creator's user ID.  */
 | 
						|
    abi_uint cgid;                      /* Creator's group ID.  */
 | 
						|
    abi_ushort mode;                    /* Read/write permission.  */
 | 
						|
    abi_ushort __pad1;
 | 
						|
    abi_ushort __seq;                   /* Sequence number.  */
 | 
						|
    abi_ushort __pad2;
 | 
						|
    abi_ulong __unused1;
 | 
						|
    abi_ulong __unused2;
 | 
						|
};
 | 
						|
 | 
						|
struct target_shmid_ds {
 | 
						|
    struct target_ipc_perm shm_perm;    /* operation permission struct */
 | 
						|
    abi_long shm_segsz;                 /* size of segment in bytes */
 | 
						|
    abi_ulong shm_atime;                /* time of last shmat() */
 | 
						|
#if TARGET_ABI_BITS == 32
 | 
						|
    abi_ulong __unused1;
 | 
						|
#endif
 | 
						|
    abi_ulong shm_dtime;                /* time of last shmdt() */
 | 
						|
#if TARGET_ABI_BITS == 32
 | 
						|
    abi_ulong __unused2;
 | 
						|
#endif
 | 
						|
    abi_ulong shm_ctime;                /* time of last change by shmctl() */
 | 
						|
#if TARGET_ABI_BITS == 32
 | 
						|
    abi_ulong __unused3;
 | 
						|
#endif
 | 
						|
    abi_int shm_cpid;                   /* pid of creator */
 | 
						|
    abi_int shm_lpid;                   /* pid of last shmop */
 | 
						|
    abi_ulong shm_nattch;               /* number of current attaches */
 | 
						|
    abi_ulong __unused4;
 | 
						|
    abi_ulong __unused5;
 | 
						|
};
 | 
						|
 | 
						|
/* The x86 definition differs from the generic one in that the
 | 
						|
 * two padding fields exist whether the ABI is 32 bits or 64 bits.
 | 
						|
 */
 | 
						|
#define TARGET_SEMID64_DS
 | 
						|
struct target_semid64_ds {
 | 
						|
    struct target_ipc_perm sem_perm;
 | 
						|
    abi_ulong sem_otime;
 | 
						|
    abi_ulong __unused1;
 | 
						|
    abi_ulong sem_ctime;
 | 
						|
    abi_ulong __unused2;
 | 
						|
    abi_ulong sem_nsems;
 | 
						|
    abi_ulong __unused3;
 | 
						|
    abi_ulong __unused4;
 | 
						|
};
 | 
						|
 | 
						|
#endif
 |