[Qemu-commits] [qemu/qemu] 48acf6: tests/avocado: push default timeout to QemuBaseTest

[Richard Henderson]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 48acf68cfe08496284fb12bf598721dea82d74a9
      
https://github.com/qemu/qemu/commit/48acf68cfe08496284fb12bf598721dea82d74a9
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-08-24 (Wed, 24 Aug 2022)

  Changed paths:
    M tests/avocado/avocado_qemu/__init__.py

  Log Message:
  -----------
  tests/avocado: push default timeout to QemuBaseTest

All of the QEMU tests eventually end up derrived from this class. Move
the default timeout from LinuxTest to ensure we catch them all. We
keep the 15 minute timeout as currently some of the more heavyweight
CFI and TCG tests can overrun. We should aim to drop it down to 2
minutes which is a more reasonable target for tests to aim for but we
want to get this release out.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
[AJB: revert to 15 min timeout for v2]
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220822165608.2980552-2-alex.bennee@linaro.org>


  Commit: e25636a12a1cc0a136aaa611a0cfbe6ebfa4aed4
      
https://github.com/qemu/qemu/commit/e25636a12a1cc0a136aaa611a0cfbe6ebfa4aed4
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-24 (Wed, 24 Aug 2022)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  tests/qtest/migration-test: Only wait for serial output where migration 
succeeds

Waiting for the serial output can take a couple of seconds - and since
we're doing a lot of migration tests, this time easily sums up to
multiple minutes. But if a test is supposed to fail, it does not make
much sense to wait for the source to be in the right state first, so
we can skip the waiting here. This way we can speed up all tests where
the migration is supposed to fail. In the gitlab-CI gprov-gcov test,
each of the migration-tests now run two minutes faster!

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220819053802.296584-2-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20220822165608.2980552-3-alex.bennee@linaro.org>


  Commit: c398c7618737d7ff36ae49ba31dae1925683a605
      
https://github.com/qemu/qemu/commit/c398c7618737d7ff36ae49ba31dae1925683a605
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-24 (Wed, 24 Aug 2022)

  Changed paths:
    M tests/migration/aarch64/a-b-kernel.S
    M tests/migration/aarch64/a-b-kernel.h

  Log Message:
  -----------
  tests/migration/aarch64: Speed up the aarch64 migration test

The migration tests spend a lot of time waiting for a sign of live
of the guest on the serial console. The aarch64 migration code only
outputs "B"s every couple of seconds (at least it takes more than 4
seconds between each characeter on my x86 laptop). There are a lot
of migration tests, and if each test that checks for a successful
migration waits for these characters before and after migration, the
wait time sums up to multiple minutes! Let's use a shorter delay to
speed things up.

While we're at it, also remove a superfluous masking with 0xff - we're
reading and storing bytes, so the upper bits of the register do not
matter anyway.

With these changes, the test runs twice as fast on my laptop, decreasing
the total run time from approx. 8 minutes to only 4 minutes!

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220819053802.296584-3-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220822165608.2980552-4-alex.bennee@linaro.org>


  Commit: 41adc59640b786575ebf002a4ede8169b0a9541e
      
https://github.com/qemu/qemu/commit/41adc59640b786575ebf002a4ede8169b0a9541e
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-24 (Wed, 24 Aug 2022)

  Changed paths:
    M tests/migration/i386/a-b-bootblock.S
    M tests/migration/i386/a-b-bootblock.h

  Log Message:
  -----------
  tests/migration/i386: Speed up the i386 migration test (when using TCG)

When KVM is not available, the i386 migration test also runs in a rather
slow fashion, since the guest code takes a couple of seconds to print
the "B"s on the serial console, and the migration test has to wait for
this each time. Let's increase the frequency here, too, so that the
delays in the migration tests get smaller.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220819053802.296584-4-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220822165608.2980552-5-alex.bennee@linaro.org>


  Commit: 00269477c2184393d23865a089a3d71b03ef3d17
      
https://github.com/qemu/qemu/commit/00269477c2184393d23865a089a3d71b03ef3d17
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-24 (Wed, 24 Aug 2022)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  tests/qtest/migration-test: Remove duplicated test_postcopy from the test plan

test_postcopy() is currently run twice - which is just a waste of resources
and time. The commit d1a27b169b2d that introduced the duplicate talked about
renaming the "postcopy/unix" test, but apparently it forgot to remove the
old entry. Let's do that now.

Fixes: d1a27b169b ("tests: Add postcopy tls migration test")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220819053802.296584-5-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20220822165608.2980552-6-alex.bennee@linaro.org>


  Commit: 5af2b0f6eace7b368ed5cad9677e3bc995b6a7e3
      
https://github.com/qemu/qemu/commit/5af2b0f6eace7b368ed5cad9677e3bc995b6a7e3
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-08-24 (Wed, 24 Aug 2022)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: try and clarify preferred block semantics

Try to correct any confusion about QEMU's Byzantine disk options by
laying out the preferred "modern" options as-per:

 "<danpb> (best:  -device + -blockdev,  2nd obsolete syntax: -device +
     -drive,  3rd obsolete syntax: -drive, 4th obsolete syntax: -hdNN)"

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Cc: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Hanna Reitz <hreitz@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Message-Id: <20220822165608.2980552-7-alex.bennee@linaro.org>


  Commit: 1f6a638cee087b1be4f464e44a9311e19a79c50e
      
https://github.com/qemu/qemu/commit/1f6a638cee087b1be4f464e44a9311e19a79c50e
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2022-08-24 (Wed, 24 Aug 2022)

  Changed paths:
    M qemu-options.hx
    M tests/avocado/avocado_qemu/__init__.py
    M tests/migration/aarch64/a-b-kernel.S
    M tests/migration/aarch64/a-b-kernel.h
    M tests/migration/i386/a-b-bootblock.S
    M tests/migration/i386/a-b-bootblock.h
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  Merge tag 'pull-for-7.1-fixes-240822-3' of https://github.com/stsquad/qemu 
into staging

Testing and doc updates:

  - move default timeout to QemuBaseTests
  - optimise migration tests to run faster
  - removed duplicate migration test
  - add some clarifying language to block options in manual

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmMF7MMACgkQ+9DbCVqe
# KkTCmgf/eyjET4BObyQEp7QsbdS295eL3If2PxSumCrypMjpmYAFJcQ9POjagExo
# wh+E8hU587BLzghgjPcsJ4fm3m21bngmAvsczmLcgOMhAaMhH5MRMR0dvHjo7l9F
# isJ1ro20fCJ2QcFNybAIu4VluwBr9oYBnZ3B7YpL9DDu8x9MmS6UCQkCJ4Y86raW
# G9IXTHwwiq3D4RiuLccPRZ/WsMZhuNVafFrgJK56GBF7jWI0d0kOar5HyS8pATNL
# hkAYBTfkrBmEhOA86vMiRmfmpVa+FqSzXkn2quWvJ8HGQ2tmIoboBbGWDExvN0/d
# pPLoAzDVPEnHAMqarC2RgSQTH0JmJQ==
# =ODg1
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 24 Aug 2022 02:17:55 AM PDT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) 
<alex.bennee@linaro.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* tag 'pull-for-7.1-fixes-240822-3' of https://github.com/stsquad/qemu:
  qemu-options: try and clarify preferred block semantics
  tests/qtest/migration-test: Remove duplicated test_postcopy from the test plan
  tests/migration/i386: Speed up the i386 migration test (when using TCG)
  tests/migration/aarch64: Speed up the aarch64 migration test
  tests/qtest/migration-test: Only wait for serial output where migration 
succeeds
  tests/avocado: push default timeout to QemuBaseTest

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/a8cc5842b5cb...1f6a638cee08