Commit 9e7f1469 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-misc-080620-1' into staging 



Various testing and misc fixes:

  - header cleanups for plugins
  - support wider watchpoints
  - tweaks for unreliable and broken CI
  - docker image fixes and verion bumps
  - linux-user guest_base fixes
  - remove flex/bison from various test images

# gpg: Signature made Mon 08 Jun 2020 17:16:19 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-and-misc-080620-1:
  scripts/coverity-scan: Remove flex/bison packages
  cirrus-ci: Remove flex/bison packages
  tests/vm: Remove flex/bison packages
  tests/docker: Remove flex/bison packages
  linux-user: detect overflow of MAP_FIXED mmap
  tests/tcg: add simple commpage test case
  linux-user: deal with address wrap for ARM_COMMPAGE on 32 bit
  linux-user: provide fallback pgd_find_hole for bare chroots
  hw/virtio/vhost: re-factor vhost-section and allow DIRTY_MEMORY_CODE
  docker: update Ubuntu to 20.04
  tests/docker: fix pre-requisite for debian-tricore-cross
  .shippable: temporaily disable some cross builds
  .travis.yml: allow failure for unreliable hosts
  exec: flush the whole TLB if a watchpoint crosses a page boundary
  tests/plugin: correctly honour io_count
  scripts/clean-includes: Mark 'qemu/qemu-plugin.h' as special header
  qemu-plugin.h: add missing include <stddef.h> to define size_t

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 31d321c2 a5b04ccd

.cirrus.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ freebsd_12_task: 
    cpu: 8

    memory: 8G

  install_script: ASSUME_ALWAYS_YES=yes pkg bootstrap -f ; pkg install -y

    bash bison curl cyrus-sasl git glib gmake gnutls gsed

    bash curl cyrus-sasl git glib gmake gnutls gsed

    nettle perl5 pixman pkgconf png usbredir

  script:

    - mkdir build

.shippable.yml

+6 −6
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ env: 
  global:

    - LC_ALL=C

  matrix:

    - IMAGE=debian-amd64

      TARGET_LIST=x86_64-softmmu,x86_64-linux-user

    # - IMAGE=debian-amd64

    #   TARGET_LIST=x86_64-softmmu,x86_64-linux-user

    - IMAGE=debian-win32-cross

      TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu

    - IMAGE=debian-win64-cross
@@ -19,10 +19,10 @@ env: 
      TARGET_LIST=aarch64-softmmu,aarch64-linux-user

    - IMAGE=debian-s390x-cross

      TARGET_LIST=s390x-softmmu,s390x-linux-user

    - IMAGE=debian-mips-cross

      TARGET_LIST=mips-softmmu,mipsel-linux-user

    - IMAGE=debian-mips64el-cross

      TARGET_LIST=mips64el-softmmu,mips64el-linux-user

    # - IMAGE=debian-mips-cross

    #   TARGET_LIST=mips-softmmu,mipsel-linux-user

    # - IMAGE=debian-mips64el-cross

    #   TARGET_LIST=mips64el-softmmu,mips64el-linux-user

    - IMAGE=debian-ppc64el-cross

      TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user

build:

.travis.yml

+5 −0
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ jobs: 
      env:

        - TEST_CMD="make check check-tcg V=1"

        - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS}"

        - UNRELIABLE=true



    - name: "[ppc64] GCC check-tcg"

      arch: ppc64le
@@ -493,6 +494,7 @@ jobs: 
      env:

        - TEST_CMD="make check check-tcg V=1"

        - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"

        - UNRELIABLE=true

      script:

        - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF )

        - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
@@ -535,6 +537,7 @@ jobs: 
        - TEST_CMD="make check-unit"

        - CONFIG="--disable-containers --disable-tcg --enable-kvm

                  --disable-tools --host-cc=clang --cxx=clang++"

        - UNRELIABLE=true



    # Release builds

    # The make-release script expect a QEMU version, so our tag must start with a 'v'.
@@ -556,3 +559,5 @@ jobs: 
        - mkdir -p release-build && cd release-build

        - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }

        - make install

  allow_failures:

    - env: UNRELIABLE=true

exec.c

+7 −1
Original line number Diff line number Diff line
@@ -1038,6 +1038,7 @@ int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len, 
                          int flags, CPUWatchpoint **watchpoint)

{

    CPUWatchpoint *wp;

    vaddr in_page;



    /* forbid ranges which are empty or run off the end of the address space */

    if (len == 0 || (addr + len - 1) < addr) {
@@ -1058,7 +1059,12 @@ int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len, 
        QTAILQ_INSERT_TAIL(&cpu->watchpoints, wp, entry);

    }



    in_page = -(addr | TARGET_PAGE_MASK);

    if (len <= in_page) {

        tlb_flush_page(cpu, addr);

    } else {

        tlb_flush(cpu);

    }



    if (watchpoint)

        *watchpoint = wp;

hw/virtio/trace-events

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ vhost_commit(bool started, bool changed) "Started: %d Changed: %d" 
vhost_region_add_section(const char *name, uint64_t gpa, uint64_t size, uint64_t host) "%s: 0x%"PRIx64"+0x%"PRIx64" @ 0x%"PRIx64

vhost_region_add_section_merge(const char *name, uint64_t new_size, uint64_t gpa, uint64_t owr) "%s: size: 0x%"PRIx64 " gpa: 0x%"PRIx64 " owr: 0x%"PRIx64

vhost_region_add_section_aligned(const char *name, uint64_t gpa, uint64_t size, uint64_t host) "%s: 0x%"PRIx64"+0x%"PRIx64" @ 0x%"PRIx64

vhost_section(const char *name, int r) "%s:%d"

vhost_section(const char *name) "%s"

vhost_reject_section(const char *name, int d) "%s:%d"

vhost_iotlb_miss(void *dev, int step) "%p step %d"



# vhost-user.c