diff options
| author | Peter Maydell | 2019-08-16 14:58:41 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-08-16 14:58:42 +0200 |
| commit | 1f3a51f3feabb5235c073a9ec9211156a519d058 (patch) | |
| tree | 880e9ed05327f34b903b51f83a4afc386472d5f6 /tests/libqos/virtio-net.c | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20190814a'... (diff) | |
| parent | tests/libqtest: Make qmp_assert_success() independent from global_qtest (diff) | |
| download | qemu-1f3a51f3feabb5235c073a9ec9211156a519d058.tar.gz qemu-1f3a51f3feabb5235c073a9ec9211156a519d058.tar.xz qemu-1f3a51f3feabb5235c073a9ec9211156a519d058.zip | |
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 'tests/libqos/virtio-net.c')
| -rw-r--r-- | tests/libqos/virtio-net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/libqos/virtio-net.c b/tests/libqos/virtio-net.c index 66405b646e..6567beb553 100644 --- a/tests/libqos/virtio-net.c +++ b/tests/libqos/virtio-net.c @@ -53,6 +53,7 @@ static void virtio_net_setup(QVirtioNet *interface) } else { interface->n_queues = 2; } + interface->n_queues++; /* Account for the ctrl queue */ interface->queues = g_new(QVirtQueue *, interface->n_queues); for (i = 0; i < interface->n_queues; i++) { |