Commit 0050f997 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-050719-3' into staging 



Various testing fixes:

   - tests/vm updates and clean-ups
   - tests/vm serial autobuild on host (-netbsd v3)
   - ensure MacOS builds do "brew update"
   - ensure we test --static user builds
   - fix hyperv compile failure
   - fix missing var warning for OpenBSD (v2)

This brings my testing back to green on all CI services. Please note
the BSD installs will throw out some warnings during the setup phase.
They shouldn't re-occur once the images are built. NetBSD has been
dropped for now given slow install issues.

# gpg: Signature made Fri 05 Jul 2019 11:15:21 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-next-050719-3:
  migration: move port_attr inside CONFIG_LINUX
  target/i386: fix feature check in hyperv-stub.c
  Makefile: Rename the 'vm-test' target as 'vm-help'
  .travis.yml: force a brew update for MacOS builds
  .travis.yml: default the --disable-system build to --static
  tests/vm: ubuntu.i386: apt proxy setup
  tests/vm: fedora autoinstall, using serial console
  tests/vm: freebsd autoinstall, using serial console
  tests/vm: openbsd autoinstall, using serial console
  tests/vm: serial console support helpers
  tests/vm: add vm-boot-{ssh,serial}-<guest> targets
  tests/vm: proper guest shutdown
  tests/vm: run test builds on snapshot
  tests/vm: use ssh with pty unconditionally
  tests/vm: send proxy environment variables over ssh
  tests/vm: add source repos on ubuntu.i386
  tests/vm: pin ubuntu.i386 image
  tests/vm: avoid image presence check and removal
  tests/vm: avoid extra compressed image copy

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c35d17ca 1f4abd81

.travis.yml

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ addons: 
      - glib

      - pixman

      - gnu-sed

    update: true





# The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
@@ -80,7 +81,7 @@ script: 
matrix:

  include:

    - env:

        - CONFIG="--disable-system"

        - CONFIG="--disable-system --static"





    # we split the system builds as it takes a while to build them all

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ SRC_PATH=. 
UNCHECKED_GOALS := %clean TAGS cscope ctags dist \

    html info pdf txt \

    help check-help print-% \

    docker docker-% vm-test vm-build-%

    docker docker-% vm-help vm-test vm-build-%



print-%:

	@echo '$*=$($*)'
@@ -1153,7 +1153,7 @@ endif 
	@echo  'Test targets:'

	@echo  '  check           - Run all tests (check-help for details)'

	@echo  '  docker          - Help about targets running tests inside Docker containers'

	@echo  '  vm-test         - Help about targets running tests inside VM'

	@echo  '  vm-help         - Help about targets running tests inside VM'

	@echo  ''

	@echo  'Documentation targets:'

	@echo  '  html info pdf txt'

docs/devel/testing.rst

+2 −2
Original line number Diff line number Diff line
@@ -399,12 +399,12 @@ VM testing 


This test suite contains scripts that bootstrap various guest images that have

necessary packages to build QEMU. The basic usage is documented in ``Makefile``

help which is displayed with ``make vm-test``.

help which is displayed with ``make vm-help``.



Quickstart

----------



Run ``make vm-test`` to list available make targets. Invoke a specific make

Run ``make vm-help`` to list available make targets. Invoke a specific make

command to run build test in an image. For example, ``make vm-build-freebsd``

will build the source tree in the FreeBSD image. The command can be executed

from either the source tree or the build dir; if the former, ``./configure`` is

migration/rdma.c

+1 −2
Original line number Diff line number Diff line
@@ -839,10 +839,9 @@ static void qemu_rdma_dump_gid(const char *who, struct rdma_cm_id *id) 
 */

static int qemu_rdma_broken_ipv6_kernel(struct ibv_context *verbs, Error **errp)

{

    struct ibv_port_attr port_attr;



    /* This bug only exists in linux, to our knowledge. */

#ifdef CONFIG_LINUX

    struct ibv_port_attr port_attr;



    /*

     * Verbs are only NULL if management has bound to '[::]'.

target/i386/hyperv-stub.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) 
{

    switch (exit->type) {

    case KVM_EXIT_HYPERV_SYNIC:

        if (!cpu->hyperv_synic) {

        if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) {

            return -1;

        }