[Qemu-commits] [qemu/qemu] a27265: tests/migration: Do not use functions anymore that...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a2726593884338fa0e8e50869c4f9811d1b43e05
      
https://github.com/qemu/qemu/commit/a2726593884338fa0e8e50869c4f9811d1b43e05
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M tests/migration-test.c

  Log Message:
  -----------
  tests/migration: Do not use functions anymore that rely on global_qtest

The migration tests deal with multiple test states, so we really should
not use functions here that rely on the single global_qtest variable.
Switch from qtest_start() to qtest_init() to make sure that global_qtest
is not set anymore. This also revealed a regression in the migrate()
function: It has once been converted to use the qtest_qmp() function,
but commit b5bbd3f315d686bd511 ("Clean up string interpolation into QMP,
part 2") accidentally reverted it back to qmp().

Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 4d81d77efdce7096e8bbdc18a06cf9b3d376c3cb
      
https://github.com/qemu/qemu/commit/4d81d77efdce7096e8bbdc18a06cf9b3d376c3cb
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M tests/libqos/e1000e.c

  Log Message:
  -----------
  tests/libqos/e1000e: Make e1000e libqos functions independent from 
global_qtest

libqos library functions should never depend on functions (like memread(),
memwrite() or clock_step()) that require global_qtest to be set, since
library functions might get used in qtests that track multiple states, too.
Thus let's replace the global_qtest-related functions with their independent
counterparts.

Message-Id: <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: b57ebd57b43db5456b850a81a2ef46b03b8716ca
      
https://github.com/qemu/qemu/commit/b57ebd57b43db5456b850a81a2ef46b03b8716ca
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M tests/libqos/virtio-mmio.c
    M tests/libqos/virtio-pci.c
    M tests/libqos/virtio.c
    M tests/libqos/virtio.h
    M tests/virtio-blk-test.c

  Log Message:
  -----------
  tests/libqos: Replace clock_step with qtest_clock_step in virtio code

Library functions should not rely on functions that require global_qtest
(since they might get used in tests that deal with multiple states).
Commit 1999a70a05ad603d ("Make generic virtio code independent from
global_qtest") already tried to clean the libqos virtio code, but I
missed to replace the clock_step() function. Thus change it now to
qtest_clock_step() instead.
The logic of the qvirtio_wait_config_isr() function is now pushed
to the virtio-mmio.c and virtio-pci.c files instead, since we can
get the QTestState here easily.

Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 731a29fabacb6a8bcbd5ae7ded1df467fdcf15a7
      
https://github.com/qemu/qemu/commit/731a29fabacb6a8bcbd5ae7ded1df467fdcf15a7
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M tests/ahci-test.c
    M tests/bios-tables-test.c
    M tests/ivshmem-test.c
    M tests/rtas-test.c

  Log Message:
  -----------
  tests: Remove unnecessary global_qtest references

We are going to remove global_qtest from the main libqtest library
soon, so tests that do not urgently need global_qtest anymore
should be cleaned from the unnecessary references.

Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 0ba67974aff2b42105c93e61b852d90197f37a20
      
https://github.com/qemu/qemu/commit/0ba67974aff2b42105c93e61b852d90197f37a20
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M MAINTAINERS
    A tests/libqtest-single.h
    M tests/libqtest.c
    M tests/libqtest.h

  Log Message:
  -----------
  tests/libqtest: Move global_test wrapper function into a separate header

We want libqtest.h to become completely independent from global_qtest
(so that the wrapper functions are not used by accident anymore). As
a first step, move the wrapper functions into a separate header file.

The new header is only included from libqtest.h for now, so that there
is no difference to the users of libqtest.h yet. In the next patch, we
will switch this, so that the users of the global_qtest-related
functions will be using libqtest-single.h directly and libqtest.h
becomes completely independent of this.

Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: dd210749727530cdef7c335040edbf81c3c5d041
      
https://github.com/qemu/qemu/commit/dd210749727530cdef7c335040edbf81c3c5d041
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M tests/cpu-plug-test.c
    M tests/display-vga-test.c
    M tests/e1000e-test.c
    M tests/fdc-test.c
    M tests/i440fx-test.c
    M tests/i82801b11-test.c
    M tests/intel-hda-test.c
    M tests/ioh3420-test.c
    M tests/ipmi-kcs-test.c
    M tests/libqtest-single.h
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/m25p80-test.c
    M tests/qos-test.c
    M tests/rtc-test.c
    M tests/rtl8139-test.c
    M tests/test-arm-mptimer.c
    M tests/test-netfilter.c
    M tests/test-x86-cpuid-compat.c
    M tests/tmp105-test.c
    M tests/tpm-crb-test.c
    M tests/tpm-tests.c
    M tests/tpm-tis-test.c
    M tests/usb-hcd-ohci-test.c
    M tests/usb-hcd-uhci-test.c
    M tests/usb-hcd-xhci-test.c
    M tests/vhost-user-test.c
    M tests/virtio-9p-test.c
    M tests/virtio-blk-test.c
    M tests/virtio-ccw-test.c
    M tests/virtio-net-test.c
    M tests/virtio-scsi-test.c
    M tests/virtio-serial-test.c

  Log Message:
  -----------
  tests/libqtest: Use libqtest-single.h in tests that require global_qtest

Tests that require global_qtest or the related wrapper functions now
use the libqtest-single.h header that is dedicated for everything
related to global_qtest. The core libqtest.c and libqtest.h files are
now completely indepedent from global_qtest, so that the core library
is now not depending on a global state anymore.

Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 4631332675dc4610b6b8c77bbe5646182e36ec46
      
https://github.com/qemu/qemu/commit/4631332675dc4610b6b8c77bbe5646182e36ec46
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M tests/vm/Makefile.include

  Log Message:
  -----------
  tests/vm: Take the J=x setting into account for the vm-boot-ssh targets, too

For testing whether the VMs can deal with multiple CPUs correctly,
it is useful to be able to use the "J=<cpus>" setting for the
vm-boot-ssh targets, too.

Message-Id: <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 664785acffa7d3fe7ec7e0814de010e1feacb570
      
https://github.com/qemu/qemu/commit/664785acffa7d3fe7ec7e0814de010e1feacb570
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M docs/qemu-block-drivers.texi
    M docs/qemu-cpu-models.texi
    M qemu-doc.texi
    M qemu-options.hx

  Log Message:
  -----------
  qemu-doc: Do not hard-code the name of the QEMU binary

In our documentation, we use a mix of "$QEMU", "qemu-system-i386" and
"qemu-system-x86_64" when we give examples to the users how to run
QEMU. Some more consistency would be good here. Also some distributions
use different names for the QEMU binary (e.g. "qemu-kvm" in RHEL), so
providing more flexibility here would also be good. Thus let's define
some variables for the names of the QEMU command and use those in the
documentation instead: @value{qemu_system} for generic examples, and
@value{qemu_system_x86} for examples that only work with the x86
binaries.

Message-Id: <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Miroslav Rezanina <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: e7dc804ef0d7cac9ac8b4a1324ab7dbfafb55704
      
https://github.com/qemu/qemu/commit/e7dc804ef0d7cac9ac8b4a1324ab7dbfafb55704
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M .gitlab-ci.yml

  Log Message:
  -----------
  gitlab-ci.yml: Install libattr-devel and libcap-devel to test virtio-9p

So far the gitlab-ci was not testing virtio-9p yet, since we did not
install libattr-devel and libcap-devel in any of the pipelines. Do
it now to get some more test coverage.

Message-Id: <address@hidden>
Acked-by: Greg Kurz <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 90b1e3afd33226b6078fec6d77a18373712a975c
      
https://github.com/qemu/qemu/commit/90b1e3afd33226b6078fec6d77a18373712a975c
  Author: Peter Maydell <address@hidden>
  Date:   2019-09-05 (Thu, 05 Sep 2019)

  Changed paths:
    M .gitlab-ci.yml
    M MAINTAINERS
    M docs/qemu-block-drivers.texi
    M docs/qemu-cpu-models.texi
    M qemu-doc.texi
    M qemu-options.hx
    M tests/ahci-test.c
    M tests/bios-tables-test.c
    M tests/cpu-plug-test.c
    M tests/display-vga-test.c
    M tests/e1000e-test.c
    M tests/fdc-test.c
    M tests/i440fx-test.c
    M tests/i82801b11-test.c
    M tests/intel-hda-test.c
    M tests/ioh3420-test.c
    M tests/ipmi-kcs-test.c
    M tests/ivshmem-test.c
    M tests/libqos/e1000e.c
    M tests/libqos/virtio-mmio.c
    M tests/libqos/virtio-pci.c
    M tests/libqos/virtio.c
    M tests/libqos/virtio.h
    A tests/libqtest-single.h
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/m25p80-test.c
    M tests/migration-test.c
    M tests/qos-test.c
    M tests/rtas-test.c
    M tests/rtc-test.c
    M tests/rtl8139-test.c
    M tests/test-arm-mptimer.c
    M tests/test-netfilter.c
    M tests/test-x86-cpuid-compat.c
    M tests/tmp105-test.c
    M tests/tpm-crb-test.c
    M tests/tpm-tests.c
    M tests/tpm-tis-test.c
    M tests/usb-hcd-ohci-test.c
    M tests/usb-hcd-uhci-test.c
    M tests/usb-hcd-xhci-test.c
    M tests/vhost-user-test.c
    M tests/virtio-9p-test.c
    M tests/virtio-blk-test.c
    M tests/virtio-ccw-test.c
    M tests/virtio-net-test.c
    M tests/virtio-scsi-test.c
    M tests/virtio-serial-test.c
    M tests/vm/Makefile.include

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/huth-gitlab/tags/pull-request-2019-09-05-v2' into staging

- Make the core libqtest library independent from global_qtest
- Clean up docs from hard-coded qemu-system-* names
- Install libattr-dev and libcap-dev in gitlab-ci to test virtio-9p

# gpg: Signature made Thu 05 Sep 2019 15:52:30 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-09-05-v2:
  gitlab-ci.yml: Install libattr-devel and libcap-devel to test virtio-9p
  qemu-doc: Do not hard-code the name of the QEMU binary
  tests/vm: Take the J=x setting into account for the vm-boot-ssh targets, too
  tests/libqtest: Use libqtest-single.h in tests that require global_qtest
  tests/libqtest: Move global_test wrapper function into a separate header
  tests: Remove unnecessary global_qtest references
  tests/libqos: Replace clock_step with qtest_clock_step in virtio code
  tests/libqos/e1000e: Make e1000e libqos functions independent from 
global_qtest
  tests/migration: Do not use functions anymore that rely on global_qtest

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/74aa913fe62e...90b1e3afd332