[Qemu-commits] [qemu/qemu] 6415c2: tests: test-announce-self: fix memory leak

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6415c2d0b66eab958be2a1fd81615c55793cefa6
      
https://github.com/qemu/qemu/commit/6415c2d0b66eab958be2a1fd81615c55793cefa6
  Author: Li Qiang <address@hidden>
  Date:   2019-03-12 (Tue, 12 Mar 2019)

  Changed paths:
    M tests/test-announce-self.c

  Log Message:
  -----------
  tests: test-announce-self: fix memory leak

Spotted by ASAN while running 'make check'.

Fixes: 4b9b7000 ("tests: Add a test for qemu self announcements")
Suggested-by: Thomas Huth <address@hidden>
Signed-off-by: Li Qiang <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: a189a9375bfe07549dd506e91bfa8af8165f05e2
      
https://github.com/qemu/qemu/commit/a189a9375bfe07549dd506e91bfa8af8165f05e2
  Author: Eric Blake <address@hidden>
  Date:   2019-03-12 (Tue, 12 Mar 2019)

  Changed paths:
    M tests/ahci-test.c
    M tests/libqos/libqos.c
    M tests/libqos/libqos.h

  Log Message:
  -----------
  ahci-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; the
management of global_qtest is even harder to follow because
it was masked behind set_context().

Instead, explicitly pass QTestState* around (generally, by
reusing the member already present in ahci->parent QOSState),
and call explicit qtest_* functions on all places that
interact with a monitor.

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>
Acked-by: John Snow <address@hidden>
[thuth: rebased patch to current master branch]
Signed-off-by: Thomas Huth <address@hidden>


  Commit: ce864603443567b8186dc435ebba08338ef4a6d6
      
https://github.com/qemu/qemu/commit/ce864603443567b8186dc435ebba08338ef4a6d6
  Author: Thomas Huth <address@hidden>
  Date:   2019-03-12 (Tue, 12 Mar 2019)

  Changed paths:
    M hw/sd/Kconfig
    M hw/sd/Makefile.objs
    M hw/sd/sdhci-internal.h
    A hw/sd/sdhci-pci.c
    M hw/sd/sdhci.c

  Log Message:
  -----------
  hw/sd/sdhci: Move PCI-related code into a separate file

Some machines have an SDHCI device, but no PCI. To be able to
compile hw/sd/sdhci.c without CONFIG_PCI, we must not call functions
like pci_get_address_space() and pci_allocate_irq() there. Thus
move the PCI-related code into a separate file.

This is required for the new Kconfig-like build system, e.g. it is
needed if a user wants to compile a QEMU binary with just one machine
that has SDHCI, but no PCI, like the ARM "raspi" machines for example.

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 390947ed2a7e5e84fa912f275ac20eac48d2f8ca
      
https://github.com/qemu/qemu/commit/390947ed2a7e5e84fa912f275ac20eac48d2f8ca
  Author: Alex Bennée <address@hidden>
  Date:   2019-03-12 (Tue, 12 Mar 2019)

  Changed paths:
    M scripts/qemugdb/timers.py

  Log Message:
  -----------
  scripts/qemugdb: re-license timers.py to GPLv2 or later

I'm the sole author (aside from a one line by Greg fixing encoding)
and I was asked nicely on IRC to bring it into line with the rest of
the files.

Cc: Greg Kurz <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 3f3bbfc7cef4490c5ed5550766a81e7d18f08db1
      
https://github.com/qemu/qemu/commit/3f3bbfc7cef4490c5ed5550766a81e7d18f08db1
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-12 (Tue, 12 Mar 2019)

  Changed paths:
    M hw/sd/Kconfig
    M hw/sd/Makefile.objs
    M hw/sd/sdhci-internal.h
    A hw/sd/sdhci-pci.c
    M hw/sd/sdhci.c
    M scripts/qemugdb/timers.py
    M tests/ahci-test.c
    M tests/libqos/libqos.c
    M tests/libqos/libqos.h
    M tests/test-announce-self.c

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

- qtest patches
- One SD patch (with Reviewed-by from the maintainer)
- One license fix patch

# gpg: Signature made Tue 12 Mar 2019 09:03:58 GMT
# gpg:                using RSA key 2ED9D774FE702DB5
# 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-03-12:
  scripts/qemugdb: re-license timers.py to GPLv2 or later
  hw/sd/sdhci: Move PCI-related code into a separate file
  ahci-test: Drop dependence on global_qtest
  tests: test-announce-self: fix memory leak

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


Compare: https://github.com/qemu/qemu/compare/9d867123659a...3f3bbfc7cef4