[Qemu-commits] [qemu/qemu] 55b975: bios-tables-test: Fix "-tpmdev: invalid option"

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 55b9757c7e58092068d6788114b9e347406ed7f9
      
https://github.com/qemu/qemu/commit/55b9757c7e58092068d6788114b9e347406ed7f9
  Author: Eric Auger <eric.auger@redhat.com>
  Date:   2020-06-15 (Mon, 15 Jun 2020)

  Changed paths:
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  bios-tables-test: Fix "-tpmdev: invalid option"

When configure is run with "--disable-tpm", the bios-tables-test
q35/tis test fails with "-tpmdev: invalid option".

Skip the test if CONFIG_TPM is unset.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200615135051.2213-1-eric.auger@redhat.com>
Tested-by: Stefan Berger <stefanb@linux.ibm.com>
Fixes: 5da7c35e25 ("bios-tables-test: Add Q35/TPM-TIS test")
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: d92e1b6d5439e04d2b863113ce714709f40fb84e
      
https://github.com/qemu/qemu/commit/d92e1b6d5439e04d2b863113ce714709f40fb84e
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2020-06-15 (Mon, 15 Jun 2020)

  Changed paths:
    M tests/qtest/fuzz/Makefile.include
    M tests/qtest/fuzz/fuzz.c
    M tests/qtest/fuzz/fuzz.h
    A tests/qtest/fuzz/qtest_wrappers.c

  Log Message:
  -----------
  fuzz: skip QTest serialization

The QTest server usually parses ASCII commands from clients. Since we
fuzz within the QEMU process, skip the QTest serialization and server
for most QTest commands. Leave the option to use the ASCII protocol, to
generate readable traces for crash reproducers.

Inspired-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20200529221450.26673-2-alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 8efebd4e0171a6f11f7ac085898d315fcac0e066
      
https://github.com/qemu/qemu/commit/8efebd4e0171a6f11f7ac085898d315fcac0e066
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2020-06-15 (Mon, 15 Jun 2020)

  Changed paths:
    M tests/qtest/fuzz/fuzz.c

  Log Message:
  -----------
  fuzz: Add support for logging QTest commands

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20200529221450.26673-3-alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 211635b3a2e717a09fc7fdb475c93d9ccab125e7
      
https://github.com/qemu/qemu/commit/211635b3a2e717a09fc7fdb475c93d9ccab125e7
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2020-06-15 (Mon, 15 Jun 2020)

  Changed paths:
    M MAINTAINERS
    A scripts/oss-fuzz/build.sh

  Log Message:
  -----------
  fuzz: add oss-fuzz build-script

It is neater to keep this in the QEMU repo, since any change that
requires an update to the oss-fuzz build configuration, can make the
necessary changes in the same series.

Suggested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-Id: <20200612055145.12101-1-alxndr@bu.edu>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: dc0ad02df963245d2d8aa7437afff6b9e2c55207
      
https://github.com/qemu/qemu/commit/dc0ad02df963245d2d8aa7437afff6b9e2c55207
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-06-15 (Mon, 15 Jun 2020)

  Changed paths:
    M tests/qtest/e1000e-test.c
    M tests/qtest/fuzz/qos_fuzz.c
    M tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
    M tests/qtest/libqos/arm-imx25-pdk-machine.c
    M tests/qtest/libqos/arm-n800-machine.c
    M tests/qtest/libqos/arm-raspi2-machine.c
    M tests/qtest/libqos/arm-sabrelite-machine.c
    M tests/qtest/libqos/arm-smdkc210-machine.c
    M tests/qtest/libqos/arm-virt-machine.c
    M tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
    M tests/qtest/libqos/e1000e.c
    M tests/qtest/libqos/e1000e.h
    M tests/qtest/libqos/ppc64_pseries-machine.c
    M tests/qtest/libqos/qgraph.c
    M tests/qtest/libqos/qgraph.h
    M tests/qtest/libqos/qgraph_internal.h
    M tests/qtest/libqos/qos_external.c
    M tests/qtest/libqos/qos_external.h
    M tests/qtest/libqos/sdhci.c
    M tests/qtest/libqos/sdhci.h
    M tests/qtest/libqos/virtio-9p.c
    M tests/qtest/libqos/virtio-9p.h
    M tests/qtest/libqos/virtio-balloon.c
    M tests/qtest/libqos/virtio-balloon.h
    M tests/qtest/libqos/virtio-blk.c
    M tests/qtest/libqos/virtio-blk.h
    M tests/qtest/libqos/virtio-net.c
    M tests/qtest/libqos/virtio-net.h
    M tests/qtest/libqos/virtio-rng.c
    M tests/qtest/libqos/virtio-rng.h
    M tests/qtest/libqos/virtio-scsi.c
    M tests/qtest/libqos/virtio-scsi.h
    M tests/qtest/libqos/virtio-serial.c
    M tests/qtest/libqos/virtio-serial.h
    M tests/qtest/libqos/x86_64_pc-machine.c
    M tests/qtest/qos-test.c

  Log Message:
  -----------
  tests/qtest: Fix LGPL information in the file headers

It's either "GNU *Library* General Public License version 2" or "GNU
Lesser General Public License version *2.1*", but there was no "version
2.0" of the "Lesser" license. So assume that version 2.1 is meant here.

Message-Id: <20200605100645.6506-1-thuth@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 8662404650f343fa6598608f02eedd013d614ab1
      
https://github.com/qemu/qemu/commit/8662404650f343fa6598608f02eedd013d614ab1
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-06-15 (Mon, 15 Jun 2020)

  Changed paths:
    M .travis.yml
    M tests/acceptance/boot_linux_console.py

  Log Message:
  -----------
  tests/acceptance: Add boot tests for sh4 QEMU advent calendar image

Now that we can select the second serial console in the acceptance tests
(see commit 746f244d9720 "Allow to use other serial consoles than default"),
we can also test the sh4 image from the QEMU advent calendar 2018.

Message-Id: <20200515164337.4899-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 1ef6bfc23144e0ec7c182301d26b114b3610c8c8
      
https://github.com/qemu/qemu/commit/1ef6bfc23144e0ec7c182301d26b114b3610c8c8
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-15 (Mon, 15 Jun 2020)

  Changed paths:
    M .travis.yml
    M configure

  Log Message:
  -----------
  configure: Let SLOF be initialized by ./scripts/git-submodule.sh

The git-submodule.sh script is called by make and initialize the
submodules listed in the GIT_SUBMODULES variable generated by
./configure.

SLOF is required for building the s390-ccw firmware on s390x, since
it is using the libnet code from SLOF for network booting.

Add it to the GIT_SUBMODULES when building the s390-ccw firmware.

Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200615074919.12552-1-f4bug@amsat.org>
[thuth: Tweaked the commit message a little bit]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 72fc7d7f7907cbae2d3265e117ce8a21f24adc81
      
https://github.com/qemu/qemu/commit/72fc7d7f7907cbae2d3265e117ce8a21f24adc81
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-06-16 (Tue, 16 Jun 2020)

  Changed paths:
    M .travis.yml
    M MAINTAINERS
    M configure
    A scripts/oss-fuzz/build.sh
    M tests/acceptance/boot_linux_console.py
    M tests/qtest/bios-tables-test.c
    M tests/qtest/e1000e-test.c
    M tests/qtest/fuzz/Makefile.include
    M tests/qtest/fuzz/fuzz.c
    M tests/qtest/fuzz/fuzz.h
    M tests/qtest/fuzz/qos_fuzz.c
    A tests/qtest/fuzz/qtest_wrappers.c
    M tests/qtest/libqos/aarch64-xlnx-zcu102-machine.c
    M tests/qtest/libqos/arm-imx25-pdk-machine.c
    M tests/qtest/libqos/arm-n800-machine.c
    M tests/qtest/libqos/arm-raspi2-machine.c
    M tests/qtest/libqos/arm-sabrelite-machine.c
    M tests/qtest/libqos/arm-smdkc210-machine.c
    M tests/qtest/libqos/arm-virt-machine.c
    M tests/qtest/libqos/arm-xilinx-zynq-a9-machine.c
    M tests/qtest/libqos/e1000e.c
    M tests/qtest/libqos/e1000e.h
    M tests/qtest/libqos/ppc64_pseries-machine.c
    M tests/qtest/libqos/qgraph.c
    M tests/qtest/libqos/qgraph.h
    M tests/qtest/libqos/qgraph_internal.h
    M tests/qtest/libqos/qos_external.c
    M tests/qtest/libqos/qos_external.h
    M tests/qtest/libqos/sdhci.c
    M tests/qtest/libqos/sdhci.h
    M tests/qtest/libqos/virtio-9p.c
    M tests/qtest/libqos/virtio-9p.h
    M tests/qtest/libqos/virtio-balloon.c
    M tests/qtest/libqos/virtio-balloon.h
    M tests/qtest/libqos/virtio-blk.c
    M tests/qtest/libqos/virtio-blk.h
    M tests/qtest/libqos/virtio-net.c
    M tests/qtest/libqos/virtio-net.h
    M tests/qtest/libqos/virtio-rng.c
    M tests/qtest/libqos/virtio-rng.h
    M tests/qtest/libqos/virtio-scsi.c
    M tests/qtest/libqos/virtio-scsi.h
    M tests/qtest/libqos/virtio-serial.c
    M tests/qtest/libqos/virtio-serial.h
    M tests/qtest/libqos/x86_64_pc-machine.c
    M tests/qtest/qos-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/huth-gitlab/tags/pull-request-2020-06-16' into staging

* Latest fuzzer patches from Alexander
* Fixes for the qtest bios-tables-test
* LGPL information cleanup in qtest code
* sh4 acceptance test
* Improved submodule handling for the s390x CI test

# gpg: Signature made Tue 16 Jun 2020 08:56:10 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2020-06-16:
  configure: Let SLOF be initialized by ./scripts/git-submodule.sh
  tests/acceptance: Add boot tests for sh4 QEMU advent calendar image
  tests/qtest: Fix LGPL information in the file headers
  fuzz: add oss-fuzz build-script
  fuzz: Add support for logging QTest commands
  fuzz: skip QTest serialization
  bios-tables-test: Fix "-tpmdev: invalid option"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/53550e81e2ca...72fc7d7f7907