Commit 7a37b59f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch... 


Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-upstream-pull-request' into staging

# gpg: Signature made Thu 16 Feb 2017 14:35:46 GMT
# gpg:                using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-upstream-pull-request:
  linux-user: Add FICLONE and FICLONERANGE ioctls
  linux-user: Use correct types in load_symbols()
  linux-user: fill target sigcontext struct accordingly
  linux-user: fix tcg/mmap test
  linux-user: fix settime old value location
  linux-user: Update m68k syscall definitions to match Linux 4.6
  linux-user: Update sh4 syscall definitions to match Linux 4.8
  linux-user: manage two new IFLA host message types
  linux-user: Fix mq_open
  linux-user: Fix readahead
  linux-user: Fix inotify_init1 support
  linux-user: Fix s390x safe-syscall for z900
  linux-user: drop __cygwin__ ifdef
  linux-user: remove ifdef __USER_MISC

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ca5266de 21992cb6

linux-user/elfload.c

+15 −7
Original line number Diff line number Diff line
@@ -2262,6 +2262,7 @@ static int symcmp(const void *s0, const void *s1) 
static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias)

{

    int i, shnum, nsyms, sym_idx = 0, str_idx = 0;

    uint64_t segsz;

    struct elf_shdr *shdr;

    char *strings = NULL;

    struct syminfo *s = NULL;
@@ -2293,19 +2294,26 @@ static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias) 
        goto give_up;

    }



    i = shdr[str_idx].sh_size;

    s->disas_strtab = strings = g_try_malloc(i);

    if (!strings || pread(fd, strings, i, shdr[str_idx].sh_offset) != i) {

    segsz = shdr[str_idx].sh_size;

    s->disas_strtab = strings = g_try_malloc(segsz);

    if (!strings ||

        pread(fd, strings, segsz, shdr[str_idx].sh_offset) != segsz) {

        goto give_up;

    }



    i = shdr[sym_idx].sh_size;

    syms = g_try_malloc(i);

    if (!syms || pread(fd, syms, i, shdr[sym_idx].sh_offset) != i) {

    segsz = shdr[sym_idx].sh_size;

    syms = g_try_malloc(segsz);

    if (!syms || pread(fd, syms, segsz, shdr[sym_idx].sh_offset) != segsz) {

        goto give_up;

    }



    nsyms = i / sizeof(struct elf_sym);

    if (segsz / sizeof(struct elf_sym) > INT_MAX) {

        /* Implausibly large symbol table: give up rather than ploughing

         * on with the number of symbols calculation overflowing

         */

        goto give_up;

    }

    nsyms = segsz / sizeof(struct elf_sym);

    for (i = 0; i < nsyms; ) {

        bswap_sym(syms + i);

        /* Throw away entries which we do not need.  */

linux-user/host/s390x/safe-syscall.inc.S

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ safe_syscall_base: 
	 */

safe_syscall_start:

	/* if signal_pending is non-zero, don't do the call */

	lt	%r0,0(%r8)

	icm	%r0,15,0(%r8)

	jne	2f

	svc	0

safe_syscall_end:

linux-user/ioctls.h

+5 −0
Original line number Diff line number Diff line
@@ -112,6 +112,11 @@ 
#ifdef FIBMAP

     IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG))

#endif

#ifdef FICLONE

     IOCTL(FICLONE, IOC_W, TYPE_INT)

     IOCTL(FICLONERANGE, IOC_W, MK_PTR(MK_STRUCT(STRUCT_file_clone_range)))

#endif



#ifdef FIGETBSZ

     IOCTL(FIGETBSZ, IOC_R, MK_PTR(TYPE_LONG))

#endif

linux-user/m68k/syscall_nr.h

+3 −0
Original line number Diff line number Diff line
@@ -376,3 +376,6 @@ 
#define TARGET_NR_userfaultfd           373

#define TARGET_NR_membarrier            374

#define TARGET_NR_mlock2                375

#define TARGET_NR_copy_file_range       376

#define TARGET_NR_preadv2               377

#define TARGET_NR_pwritev2              378

linux-user/mmap.c

+3 −6
Original line number Diff line number Diff line
@@ -193,9 +193,6 @@ static int mmap_frag(abi_ulong real_start, 


#if HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 64

# define TASK_UNMAPPED_BASE  (1ul << 38)

#elif defined(__CYGWIN__)

/* Cygwin doesn't have a whole lot of address space.  */

# define TASK_UNMAPPED_BASE  0x18000000

#else

# define TASK_UNMAPPED_BASE  0x40000000

#endif
@@ -429,8 +426,8 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, 
       may need to truncate file maps at EOF and add extra anonymous pages

       up to the targets page boundary.  */



    if ((qemu_real_host_page_size < TARGET_PAGE_SIZE)

        && !(flags & MAP_ANONYMOUS)) {

    if ((qemu_real_host_page_size < qemu_host_page_size) &&

        !(flags & MAP_ANONYMOUS)) {

        struct stat sb;



       if (fstat (fd, &sb) == -1)