diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-16 13:58:41 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-16 13:58:42 +0100 |
| commit | 1f3a51f3feabb5235c073a9ec9211156a519d058 (patch) | |
| tree | 880e9ed05327f34b903b51f83a4afc386472d5f6 /include | |
| parent | 27608c7c66bd923eb5e5faab80e795408cbe2b51 (diff) | |
| parent | 6fc9f3d347aee337421f8afc4d0984294f8ea6c3 (diff) | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-15' into staging
- Fix for ctrl queue in the virtio-net QOS driver
- Improve Valgrind reports in the tests that use the null-co driver
- Get rid of global_qtest related code in libqtest and libqos
# gpg: Signature made Thu 15 Aug 2019 18:28:16 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2019-08-15:
tests/libqtest: Make qmp_assert_success() independent from global_qtest
tests/libqtest: Make qtest_qmp_device_add/del independent from global_qtest
tests/libqtest: Clean up qtest_cb_for_every_machine() wrt global_qtest
tests/libqtest: Remove unused function hmp()
tests/libqos: Make virtio-pci code independent from global_qtest
tests/libqos: Make generic virtio code independent from global_qtest
tests: Set read-zeroes on for null-co driver
libqos: Account for the ctrl queue in virtio-net
qtest: Rename qtest.c:qtest_init()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/qtest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h index cd114b8d80..5ed09c80b1 100644 --- a/include/sysemu/qtest.h +++ b/include/sysemu/qtest.h @@ -24,6 +24,6 @@ static inline bool qtest_enabled(void) bool qtest_driver(void); -void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp); +void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **errp); #endif |