[Qemu-commits] [qemu/qemu] d786f7: tests/libqos/pci: Make PCI access functions indepe...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d786f782521fd2843394b498b4254a05cfd0e1d3
      
https://github.com/qemu/qemu/commit/d786f782521fd2843394b498b4254a05cfd0e1d3
  Author: Thomas Huth <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/libqos/pci-pc.c
    M tests/libqos/pci-spapr.c

  Log Message:
  -----------
  tests/libqos/pci: Make PCI access functions independent of global_qtest

QPCIBus already tracks QTestState, so use that state instead of an
implicit reliance on global_qtest.

Based on an earlier patch ("libqos: Use explicit QTestState for pci
operations") from Eric Blake.

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


  Commit: 24c01ffa9d356eed4530e31f7ef93844b6599502
      
https://github.com/qemu/qemu/commit/24c01ffa9d356eed4530e31f7ef93844b6599502
  Author: Eric Blake <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/ivshmem-test.c

  Log Message:
  -----------
  ivshmem-test: Drop dependence on global_qtest

Managing parallel connections to two different monitors via
the implicit global_qtest makes it hard to copy-and-paste code
to tests that are not aware of the implicit state.  Since we
have already fixed qpci to avoid global_qtest, we can now
simplify by not using global_qtest anywhere in ivshmem-test.

We can assert that the conversion is correct by checking that
global_qtest remains NULL throughout the test (a later patch
that changes global_qtest to not be a public global variable
will drop the assertions).

Signed-off-by: Eric Blake <address@hidden>
[thuth: Dropped the changes to test_ivshmem_hotplug() - will be fixed later]
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 273e3d92cfa26ae07a72657b75b4b76105a0fbc4
      
https://github.com/qemu/qemu/commit/273e3d92cfa26ae07a72657b75b4b76105a0fbc4
  Author: Eric Blake <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/acpi-utils.c
    M tests/acpi-utils.h
    M tests/bios-tables-test.c
    M tests/vmgenid-test.c

  Log Message:
  -----------
  tests/acpi-utils: Drop dependence on global_qtest

As a general rule, we prefer avoiding implicit global state
because it makes code harder to safely copy and paste without
thinking about the global state.  Adjust the helper code to
use explicit state instead, and update all callers.

bios-tables-test no longer depends on global_qtest, now that it
passes explicit state through the testsuite data; an assert
proves this fact (although we will get rid of it later, once
global_qtest is gone).

Signed-off-by: Eric Blake <address@hidden>
Acked-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
[thuth: adapted patch to current master branch]
Signed-off-by: Thomas Huth <address@hidden>


  Commit: ac16ab753ae2ee240fddb9c69400782c18ae3bc1
      
https://github.com/qemu/qemu/commit/ac16ab753ae2ee240fddb9c69400782c18ae3bc1
  Author: Thomas Huth <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/vmgenid-test.c

  Log Message:
  -----------
  tests/vmgenid: Make test independent of global_qtest

The biggest part has already been done in the previous patch, we now
only have to replace some few qmp() and readb() calls with the
corresponding qtest_*() functions to get there.

Acked-by: Igor Mammedov <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 791a289badd77a9c920c59609ce0a4f5b1ed5f5e
      
https://github.com/qemu/qemu/commit/791a289badd77a9c920c59609ce0a4f5b1ed5f5e
  Author: Thomas Huth <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/pvpanic-test.c

  Log Message:
  -----------
  tests/pvpanic: Make the pvpanic test independent of global_qtest

We want to get rid of global_qtest in the long run, thus do not
use the wrappers like inb() and outb() here anymore.

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


  Commit: e6426b74199e2c83185ef016596a624ab491e8a0
      
https://github.com/qemu/qemu/commit/e6426b74199e2c83185ef016596a624ab491e8a0
  Author: Thomas Huth <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/boot-serial-test.c

  Log Message:
  -----------
  tests/boot-serial: Get rid of global_qtest variable

The test does not use any of the functions that require global_qtest,
so we can simply get rid of this global variable here.

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


  Commit: a2569b001cf6acf9e9e9bcf7dbcd0a9c94d4bd52
      
https://github.com/qemu/qemu/commit/a2569b001cf6acf9e9e9bcf7dbcd0a9c94d4bd52
  Author: Thomas Huth <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/test-filter-mirror.c
    M tests/test-filter-redirector.c

  Log Message:
  -----------
  tests/test-filter: Make tests independent of global_qtest

Apart from using qmp() in the qmp_discard_response() macro, these
tests do not have any dependencies to the global_qtest variable,
so we can simply get rid of it here by replacing the qmp() with
qtest_qmp() in the macro.

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


  Commit: ed398a1206035c082bf9553cb627f4c6c6b5b5c1
      
https://github.com/qemu/qemu/commit/ed398a1206035c082bf9553cb627f4c6c6b5b5c1
  Author: Thomas Huth <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/machine-none-test.c

  Log Message:
  -----------
  tests/machine-none: Make test independent of global_qtest

Apart from using qmp() in one spot, this test does not have any
dependencies to the global_qtest variable, so we can simply get
rid of it here by replacing the qmp() with qtest_qmp().

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


  Commit: dc4c1587223d8d5eb60a8ad2c465839545674442
      
https://github.com/qemu/qemu/commit/dc4c1587223d8d5eb60a8ad2c465839545674442
  Author: Thomas Huth <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/prom-env-test.c

  Log Message:
  -----------
  tests/prom-env: Make test independent of global_qtest

global_qtest is only needed here for one readl(). Let's replace it
with qtest_readl() and we can remove the global_qtest variable here.

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


  Commit: 43497c438d55e0e22369a6c633f9c8e3f6a498f2
      
https://github.com/qemu/qemu/commit/43497c438d55e0e22369a6c633f9c8e3f6a498f2
  Author: Thomas Huth <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/pxe-test.c

  Log Message:
  -----------
  tests/pxe: Make test independent of global_qtest

global_qtest is not really required here, since boot_sector_test()
is already independent from that global variable.

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


  Commit: 21f80286cc48142c2df1530eba32bd70131a1bdc
      
https://github.com/qemu/qemu/commit/21f80286cc48142c2df1530eba32bd70131a1bdc
  Author: Richard Henderson <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/boot-serial-test.c
    M tests/libqtest.c
    M tests/libqtest.h

  Log Message:
  -----------
  tests: Exit boot-serial-test loop if child dies

There's no point in waiting 5 full minutes when there will be
no more output.  Compute timeout based on elapsed wall clock
time instead of N * delays, as the delay is a minimum sleep time.

Cc: Thomas Huth <address@hidden>
Cc: Laurent Vivier <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Wainer dos Santos Moschetta <address@hidden>
[thuth: Replaced global_qtest with local qts variable]
Signed-off-by: Thomas Huth <address@hidden>


  Commit: da15af649769813dc411fc0a0fd5055ac5a4e74f
      
https://github.com/qemu/qemu/commit/da15af649769813dc411fc0a0fd5055ac5a4e74f
  Author: Igor Mammedov <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

  Changed paths:
    M tests/acpi-utils.h

  Log Message:
  -----------
  tests: acpi: remove not used ACPI_READ_GENERIC_ADDRESS macro

Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
[thuth: Fixed conflicts with additional "qts" parameter]
Signed-off-by: Thomas Huth <address@hidden>


  Commit: fe17cca6bd2cdfb9cc7f29da8e71aa1238bcdba7
      
https://github.com/qemu/qemu/commit/fe17cca6bd2cdfb9cc7f29da8e71aa1238bcdba7
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-12-17 (Mon, 17 Dec 2018)

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

  Log Message:
  -----------
  tests/bios-tables-test: Sanitize test verbose output

Fix the extraneous extra blank lines in the test output when running with V=1.

Before:

    TEST: tests/bios-tables-test... (pid=25678)
      /i386/acpi/piix4:
    Looking for expected file 'tests/acpi-test-data/pc/DSDT'

    Using expected file 'tests/acpi-test-data/pc/DSDT'

    Looking for expected file 'tests/acpi-test-data/pc/FACP'

    Using expected file 'tests/acpi-test-data/pc/FACP'

    Looking for expected file 'tests/acpi-test-data/pc/APIC'

    Using expected file 'tests/acpi-test-data/pc/APIC'

    Looking for expected file 'tests/acpi-test-data/pc/HPET'

    Using expected file 'tests/acpi-test-data/pc/HPET'
    OK

After:

    TEST: tests/bios-tables-test... (pid=667)
      /i386/acpi/piix4:
    Looking for expected file 'tests/acpi-test-data/pc/DSDT'
    Using expected file 'tests/acpi-test-data/pc/DSDT'
    Looking for expected file 'tests/acpi-test-data/pc/FACP'
    Using expected file 'tests/acpi-test-data/pc/FACP'
    Looking for expected file 'tests/acpi-test-data/pc/APIC'
    Using expected file 'tests/acpi-test-data/pc/APIC'
    Looking for expected file 'tests/acpi-test-data/pc/HPET'
    Using expected file 'tests/acpi-test-data/pc/HPET'
    OK

Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: e85c577158a2e8e252414959da9ef15c12eec63d
      
https://github.com/qemu/qemu/commit/e85c577158a2e8e252414959da9ef15c12eec63d
  Author: Peter Maydell <address@hidden>
  Date:   2018-12-18 (Tue, 18 Dec 2018)

  Changed paths:
    M tests/acpi-utils.c
    M tests/acpi-utils.h
    M tests/bios-tables-test.c
    M tests/boot-serial-test.c
    M tests/ivshmem-test.c
    M tests/libqos/pci-pc.c
    M tests/libqos/pci-spapr.c
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/machine-none-test.c
    M tests/prom-env-test.c
    M tests/pvpanic-test.c
    M tests/pxe-test.c
    M tests/test-filter-mirror.c
    M tests/test-filter-redirector.c
    M tests/vmgenid-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/huth-gitlab/tags/pull-request-2018-12-17' into staging

- Replace global_qtest in some tests
- Exit boot-serial-test loop if child dies
- Sanitize verbose output in biot-tables-test

# gpg: Signature made Mon 17 Dec 2018 16:08:07 GMT
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <address@hidden>"
# gpg:                 aka "Thomas Huth <address@hidden>"
# gpg:                 aka "Thomas Huth <address@hidden>"
# gpg:                 aka "Thomas Huth <address@hidden>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2018-12-17:
  tests/bios-tables-test: Sanitize test verbose output
  tests: acpi: remove not used ACPI_READ_GENERIC_ADDRESS macro
  tests: Exit boot-serial-test loop if child dies
  tests/pxe: Make test independent of global_qtest
  tests/prom-env: Make test independent of global_qtest
  tests/machine-none: Make test independent of global_qtest
  tests/test-filter: Make tests independent of global_qtest
  tests/boot-serial: Get rid of global_qtest variable
  tests/pvpanic: Make the pvpanic test independent of global_qtest
  tests/vmgenid: Make test independent of global_qtest
  tests/acpi-utils: Drop dependence on global_qtest
  ivshmem-test: Drop dependence on global_qtest
  tests/libqos/pci: Make PCI access functions independent of global_qtest

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


Compare: https://github.com/qemu/qemu/compare/ec3c927f3d98...e85c577158a2
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.