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

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-230719-4' into staging 



Final testing updates:

  - docker sphinx updates
  - windows build re-enabled in CI
  - travis_retry for make check
  - build fixes
  - docker cache fixes

# gpg: Signature made Tue 23 Jul 2019 17:20:16 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-230719-4: (23 commits)
  tests/docker: Refresh APT cache before installing new packages on Debian
  tests/qemu-iotests: Don't use 'seq' in the iotests
  tests/qemu-iotests/group: Remove some more tests from the "auto" group
  tests/qemu-iotests/check: Allow tests without groups
  tests/docker: invoke the DEBUG shell with --noprofile/--norc
  travis: enable travis_retry for check phase
  hw/i386: also turn off VMMOUSE is VMPORT is disabled
  NSIS: Add missing firmware blobs
  tests/docker: Let the test-mingw test generate a NSIS installer
  buildsys: The NSIS Windows build requires qemu-nsis.bmp installed
  buildsys: The NSIS Windows build requires the documentation installed
  tests/docker: Install texinfo in the Fedora image
  tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images
  tests/docker: Install the NSIS tools in the MinGW capable images
  tests/docker: Install Sphinx in the Debian images
  shippable: re-enable the windows cross builds
  tests/dockerfiles: update the win cross builds to stretch
  tests/migration-test: don't spam the logs when we fail
  tests/docker: Install Ubuntu images noninteractively
  tests/docker: Install Sphinx in the Fedora image
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4da6c0f9 98808c3d

.shippable.yml

+4 −5
Original line number Diff line number Diff line
@@ -7,11 +7,10 @@ env: 
  matrix:

    - IMAGE=debian-amd64

      TARGET_LIST=x86_64-softmmu,x86_64-linux-user

    # currently disabled as the mxe.cc repos are down

    # - IMAGE=debian-win32-cross

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

    # - IMAGE=debian-win64-cross

    #   TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu

    - IMAGE=debian-win32-cross

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

    - IMAGE=debian-win64-cross

      TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu

    - IMAGE=debian-armel-cross

      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user

    - IMAGE=debian-armhf-cross

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ before_script: 
  - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}

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

script:

  - make -j3 && ${TEST_CMD}

  - make -j3 && travis_retry ${TEST_CMD}





matrix:

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ 
efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \

efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \

efi-e1000e.rom efi-vmxnet3.rom \

qemu-nsis.bmp \

bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \

multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \

s390-ccw.img s390-netboot.img \
@@ -1077,7 +1078,7 @@ installer: $(INSTALLER) 


INSTDIR=/tmp/qemu-nsis



$(INSTALLER): $(SRC_PATH)/qemu.nsi

$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi

	$(MAKE) install prefix=${INSTDIR}

ifdef SIGNCODE

	(cd ${INSTDIR}; \

hw/i386/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ config I440FX 
    bool

    imply E1000_PCI

    imply VMPORT

    imply VMMOUSE

    select PC_PCI

    select PC_ACPI

    select ACPI_SMBUS
@@ -59,7 +60,6 @@ config I440FX 
    select IDE_PIIX

    select DIMM

    select SMBIOS

    select VMMOUSE

    select FW_CFG_DMA



config ISAPC
@@ -78,6 +78,7 @@ config Q35 
    imply AMD_IOMMU

    imply E1000E_PCI_EXPRESS

    imply VMPORT

    imply VMMOUSE

    select PC_PCI

    select PC_ACPI

    select PCI_EXPRESS_Q35
@@ -85,7 +86,6 @@ config Q35 
    select AHCI_ICH9

    select DIMM

    select SMBIOS

    select VMMOUSE

    select FW_CFG_DMA



config VTD

qemu.nsi

+11 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ RequestExecutionLevel admin 
;--------------------------------



; The stuff to install.

;

; Remember to keep the "Uninstall" section in sync.



Section "${PRODUCT} (required)"



    SectionIn RO
@@ -122,6 +125,10 @@ Section "${PRODUCT} (required)" 
    File "${BINDIR}\*.bmp"

    File "${BINDIR}\*.bin"

    File "${BINDIR}\*.dtb"

    File "${BINDIR}\*.fd"

    File "${BINDIR}\*.img"

    File "${BINDIR}\*.lid"

    File "${BINDIR}\*.ndrv"

    File "${BINDIR}\*.rom"

    File "${BINDIR}\openbios-*"
@@ -210,6 +217,10 @@ Section "Uninstall" 
    Delete "$INSTDIR\*.bin"

    Delete "$INSTDIR\*.dll"

    Delete "$INSTDIR\*.dtb"

    Delete "$INSTDIR\*.fd"

    Delete "$INSTDIR\*.img"

    Delete "$INSTDIR\*.lid"

    Delete "$INSTDIR\*.ndrv"

    Delete "$INSTDIR\*.rom"

    Delete "$INSTDIR\openbios-*"

    Delete "$INSTDIR\qemu-img.exe"