Commit c4e0780e authored by Peter Maydell's avatar Peter Maydell
Browse files

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



- Update netlink types to linux v5.0
- fix accept4/getpeername/getsockname/recvfrom/recvmsg/read
- add/fix ELF_PLATFORM ofr aarch64 and arm
- fix "may be used uninitialized" warnings
- Fix breakpoint support in Nios
- Nicer strace output of chroot() syscall

# gpg: Signature made Thu 07 Mar 2019 10:06:16 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-4.0-pull-request:
  linux-user: add new netlink types
  linux-user: Nicer strace output of chroot() syscall
  linux-user: fix "may be used uninitialized" warnings
  linux-user: don't short-circuit read with zero length
  Fix breakpoint support in Nios II user-mode emulation.
  linux-user: fix emulation of accept4/getpeername/getsockname/recvfrom syscalls
  linux-user: Fix ELF_PLATFORM for aarch64_be-linux-user
  linux-user: Add ELF_PLATFORM for arm
  linux-user: fix recvmsg emulation

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6cb4f6db 61b463fb

linux-user/elfload.c

+36 −1
Original line number Diff line number Diff line
@@ -500,13 +500,48 @@ static uint32_t get_elf_hwcap2(void) 
#undef GET_FEATURE

#undef GET_FEATURE_ID



#define ELF_PLATFORM get_elf_platform()



static const char *get_elf_platform(void)

{

    CPUARMState *env = thread_cpu->env_ptr;



#ifdef TARGET_WORDS_BIGENDIAN

# define END  "b"

#else

# define END  "l"

#endif



    if (arm_feature(env, ARM_FEATURE_V8)) {

        return "v8" END;

    } else if (arm_feature(env, ARM_FEATURE_V7)) {

        if (arm_feature(env, ARM_FEATURE_M)) {

            return "v7m" END;

        } else {

            return "v7" END;

        }

    } else if (arm_feature(env, ARM_FEATURE_V6)) {

        return "v6" END;

    } else if (arm_feature(env, ARM_FEATURE_V5)) {

        return "v5" END;

    } else {

        return "v4" END;

    }



#undef END

}



#else

/* 64 bit ARM definitions */

#define ELF_START_MMAP 0x80000000



#define ELF_ARCH        EM_AARCH64

#define ELF_CLASS       ELFCLASS64

#ifdef TARGET_WORDS_BIGENDIAN

# define ELF_PLATFORM    "aarch64_be"

#else

# define ELF_PLATFORM    "aarch64"

#endif



static inline void init_thread(struct target_pt_regs *regs,

                               struct image_info *infop)

linux-user/fd-trans.c

+9 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ enum { 
    QEMU_IFLA_BR_MCAST_STATS_ENABLED,

    QEMU_IFLA_BR_MCAST_IGMP_VERSION,

    QEMU_IFLA_BR_MCAST_MLD_VERSION,

    QEMU_IFLA_BR_VLAN_STATS_PER_PORT,

    QEMU_IFLA_BR_MULTI_BOOLOPT,

    QEMU___IFLA_BR_MAX,

};
@@ -438,6 +440,7 @@ static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr, 
    case QEMU_IFLA_BR_MCAST_STATS_ENABLED:

    case QEMU_IFLA_BR_MCAST_IGMP_VERSION:

    case QEMU_IFLA_BR_MCAST_MLD_VERSION:

    case QEMU_IFLA_BR_VLAN_STATS_PER_PORT:

        break;

    /* uint16_t */

    case QEMU_IFLA_BR_PRIORITY:
@@ -543,6 +546,12 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, 
    case QEMU_IFLA_BRPORT_ROOT_ID:

    case QEMU_IFLA_BRPORT_BRIDGE_ID:

        break;

    /* br_boolopt_multi { uint32_t, uint32_t } */

    case QEMU_IFLA_BR_MULTI_BOOLOPT:

        u32 = NLA_DATA(nlattr);

        u32[0] = tswap32(u32[0]); /* optval */

        u32[1] = tswap32(u32[1]); /* optmask */

        break;

    default:

        gemu_log("Unknown QEMU_IFLA_BRPORT type %d\n", nlattr->nla_type);

        break;

linux-user/nios2/cpu_loop.c

+6 −0
Original line number Diff line number Diff line
@@ -73,6 +73,12 @@ void cpu_loop(CPUNios2State *env) 
                queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

                break;

            }

        case EXCP_DEBUG:

            info.si_signo = TARGET_SIGTRAP;

            info.si_errno = 0;

            info.si_code = TARGET_TRAP_BRKPT;

            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            break;

        case 0xaa:

            switch (env->regs[R_PC]) {

            /*case 0x1000:*/  /* TODO:__kuser_helper_version */

linux-user/strace.c

+12 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,18 @@ print_chdir(const struct syscallname *name, 
}

#endif



#ifdef TARGET_NR_chroot

static void

print_chroot(const struct syscallname *name,

    abi_long arg0, abi_long arg1, abi_long arg2,

    abi_long arg3, abi_long arg4, abi_long arg5)

{

    print_syscall_prologue(name);

    print_string(arg0, 1);

    print_syscall_epilogue(name);

}

#endif



#ifdef TARGET_NR_chmod

static void

print_chmod(const struct syscallname *name,

linux-user/strace.list

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
{ TARGET_NR_chown32, "chown32" , NULL, NULL, NULL },

#endif

#ifdef TARGET_NR_chroot

{ TARGET_NR_chroot, "chroot" , NULL, NULL, NULL },

{ TARGET_NR_chroot, "chroot" , NULL, print_chroot, NULL },

#endif

#ifdef TARGET_NR_clock_adjtime

{ TARGET_NR_clock_adjtime, "clock_adjtime" , NULL, print_clock_adjtime, NULL },