[Qemu-commits] [qemu/qemu] b5e62a: tests: Fix check-report-qtest-% target

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b5e62af8aa2710d4645cd04e3e8a15722c1616e4
      
https://github.com/qemu/qemu/commit/b5e62af8aa2710d4645cd04e3e8a15722c1616e4
  Author: Andreas Färber <address@hidden>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M tests/Makefile

  Log Message:
  -----------
  tests: Fix check-report-qtest-% target

Commit e253c28 ("tests: Fix how qom-test is run") introduced
$(qtest-generic-y) and used it for check-qtest-% target, but did not
update check-report-qtest-%. This causes check-report-qtest-aarch64.xml
target to fail with a gtester usage error for lack of test arguments.

Fix this by adding $(qtest-generic-y) in check-report-qtest-%.
Also add it in check-clean target, spotted by Markus.

Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 70ae0b6d0e7968a9ac1b85acb5697a6950654bf4
      
https://github.com/qemu/qemu/commit/70ae0b6d0e7968a9ac1b85acb5697a6950654bf4
  Author: Cao jin <address@hidden>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M include/qom/object.h

  Log Message:
  -----------
  qom: Update documentation comment of struct Object

It doesn't have "GSList *interfaces" anymore, drop the paragraph.

Signed-off-by: Cao jin <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 041088c71934b8991c21b61bd4ee91d76a6f2b07
      
https://github.com/qemu/qemu/commit/041088c71934b8991c21b61bd4ee91d76a6f2b07
  Author: Markus Armbruster <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M tests/ide-test.c
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/vhost-user-test.c

  Log Message:
  -----------
  tests: Use proper functions types instead of void (*fn)

We have several function parameters declared as void (*fn).  This is
just a stupid way to write void *, and the only purpose writing it
like that could serve is obscuring the sin of bypassing the type
system without need.

The original sin is commit 49ee359: its qtest_add_func() is a wrapper
for g_test_add_func().  Fix the parameter type to match
g_test_add_func()'s.  This uncovers type errors in ide-test.c; fix
them.

Commit 7949c0e faithfully repeated the sin for qtest_add_data_func().
Fix it the same way, along with a harmless type error uncovered in
vhost-user-test.c.

Commit 063c23d repeated it for qtest_add_abrt_handler().  The screwy
parameter gets assigned to GHook member func, so change its type to
match.  Requires wrapping kill_qemu() to keep the type checker happy.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[AF/armbru: Inline GTestFunc/GTestDataFunc typedef for old GLib]
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 0d2cd785ef1282b14687f9f7f4b63ae4a2430be3
      
https://github.com/qemu/qemu/commit/0d2cd785ef1282b14687f9f7f4b63ae4a2430be3
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M tests/qom-test.c

  Log Message:
  -----------
  qom-test: Fix qmp() leaks

Before this patch ASAN reported:
SUMMARY: AddressSanitizer: 677165875 byte(s) leaked in 1272437 allocation(s)

After this patch:
SUMMARY: AddressSanitizer: 465 byte(s) leaked in 32 allocation(s)

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Straightforwardly rebased onto the previous patch]
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c
      
https://github.com/qemu/qemu/commit/a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c
  Author: Peter Maydell <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M include/qom/object.h
    M tests/Makefile
    M tests/ide-test.c
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/qom-test.c
    M tests/vhost-user-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' 
into staging

QOM infrastructure fixes and device conversions

* Documentation update
* qom-test and related fixes

# gpg: Signature made Fri 04 Dec 2015 17:54:55 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <address@hidden>"
# gpg:                 aka "Andreas Färber <address@hidden>"

* remotes/afaerber/tags/qom-devices-for-peter:
  qom-test: Fix qmp() leaks
  tests: Use proper functions types instead of void (*fn)
  qom: Update documentation comment of struct Object
  tests: Fix check-report-qtest-% target

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


Compare: https://github.com/qemu/qemu/compare/61e3aa25b129...a5582eac1517