OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vhost-user-test: added proper TestServer *dest initialization in test_migrate()

Browse Source 
server->bus in _test_server_free() could be NULL, since TestServer
*dest in test_migrate() was not properly initialized like TestServer *s.
Added init_virtio_dev(dest) and uninit_virtio_dev(dest), so the fields
are properly set and when test_server_free(dest); is called, they can
be correctly freed.

The reason for that is init_virtio_dev() calls qpci_init_pc(), that
creates a QPCIBusPC * (returned as QPCIBus *), while test_server_free()
calls qpci_free_pc(), that frees the QPCIBus *. Not calling
init_virtio_dev() would leave the QPCIBus * of TestServer unset.

Problem came out once I modified  pci-pc.c and pci-pc.h, modifying
QPCIBusPC by adding another field before QPCIBus bus. Re-running the
tests showed vhost-user-test failing.

Signed-off-by: Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
Message-Id: <1530022733-29581-1-git-send-email-esposem@usi.ch>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2018-06-26 16:18:53 +02:00 committed by Paolo Bonzini
parent e9688fabc3
commit 9ee8a692f1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/vhost-user-test.c
View File

@ -537,6 +537,7 @@ static gboolean _test_server_free(TestServer *server)
g_free(server->mig_path); g_free(server->mig_path);
g_free(server->chr_name); g_free(server->chr_name);
g_assert(server->bus);
qpci_free_pc(server->bus); qpci_free_pc(server->bus);
g_free(server); g_free(server);
@ -684,6 +685,7 @@ static void test_migrate(void)
g_free(cmd); g_free(cmd);
init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);
init_virtio_dev(dest, 1u << VIRTIO_NET_F_MAC);
wait_for_fds(s); wait_for_fds(s);
size = get_log_size(s); size = get_log_size(s);
g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8)); g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8));
@ -739,6 +741,7 @@ static void test_migrate(void)
read_guest_mem_server(dest); read_guest_mem_server(dest);
uninit_virtio_dev(s); uninit_virtio_dev(s);
uninit_virtio_dev(dest);
g_source_destroy(source); g_source_destroy(source);
g_source_unref(source); g_source_unref(source);