Commit 49ee1155 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



linux-user pull request 20200605-v2

Implement F_OFD_ fcntl() command, /proc/cpuinfo for hppa
Fix socket(), prnctl() error codes, underflow in target_mremap,
    epoll_create() strace, oldumount for alpha
User-mode build dependencies improvement

# gpg: Signature made Sat 06 Jun 2020 14:15:36 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# 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-5.1-pull-request:
  stubs: Restrict ui/win32-kbd-hook to system-mode
  hw/core: Restrict CpuClass::get_crash_info() to system-mode
  target/s390x: Restrict CpuClass::get_crash_info() to system-mode
  target/i386: Restrict CpuClass::get_crash_info() to system-mode
  arch_init: Remove unused 'qapi-commands-misc.h' include
  exec: Assert CPU migration is not used on user-only build
  target/riscv/cpu: Restrict CPU migration to system-mode
  stubs/Makefile: Reduce the user-mode object list
  util/Makefile: Reduce the user-mode object list
  tests/Makefile: Restrict some softmmu-only tests
  tests/Makefile: Only display TCG-related tests when TCG is available
  configure: Avoid building TCG when not needed
  Makefile: Only build virtiofsd if system-mode is enabled
  linux-user: implement OFD locks
  linux-user/mmap.c: fix integer underflow in target_mremap
  linux-user/strace.list: fix epoll_create{,1} -strace output
  linux-user: Add support for /proc/cpuinfo on hppa platform
  linux-user: return target error codes for socket() and prctl()
  linux-user, alpha: fix oldumount syscall

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5a922419 95722b27

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ HELPERS-y += vhost-user-gpu$(EXESUF) 
vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json

endif



ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)

ifeq ($(CONFIG_SOFTMMU)$(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyyy)

HELPERS-y += virtiofsd$(EXESUF)

vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json

endif

arch_init.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include "sysemu/arch_init.h"

#include "hw/pci/pci.h"

#include "hw/audio/soundhw.h"

#include "qapi/qapi-commands-misc.h"

#include "qapi/error.h"

#include "qemu/config-file.h"

#include "qemu/error-report.h"

configure

+4 −0
Original line number Diff line number Diff line
@@ -1663,6 +1663,10 @@ if [ "$ARCH" = "unknown" ]; then 
  linux_user="no"

fi



if [ "$bsd_user" = "no" -a "$linux_user" = "no" -a "$softmmu" = "no" ] ; then

  tcg="no"

fi



default_target_list=""



mak_wilds=""

exec.c

+3 −1
Original line number Diff line number Diff line
@@ -946,7 +946,9 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) 


    qemu_plugin_vcpu_init_hook(cpu);



#ifndef CONFIG_USER_ONLY

#ifdef CONFIG_USER_ONLY

    assert(cc->vmsd == NULL);

#else /* !CONFIG_USER_ONLY */

    if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {

        vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu);

    }

hw/core/cpu.c

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static bool cpu_common_exec_interrupt(CPUState *cpu, int int_req) 
    return false;

}



#if !defined(CONFIG_USER_ONLY)

GuestPanicInformation *cpu_get_crash_info(CPUState *cpu)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);
@@ -219,6 +220,7 @@ GuestPanicInformation *cpu_get_crash_info(CPUState *cpu) 
    }

    return res;

}

#endif



void cpu_dump_state(CPUState *cpu, FILE *f, int flags)

{