[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] vhost-user-test: added proper TestServer *dest
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH] vhost-user-test: added proper TestServer *dest initialization in test_migrate() |
Date: |
Sun, 15 Jul 2018 17:40:23 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 |
On 26/06/2018 16:18, Emanuele Giuseppe Esposito wrote:
> 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 <address@hidden>
> ---
> tests/vhost-user-test.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> index bbc8091..4d71d5e 100644
> --- a/tests/vhost-user-test.c
> +++ b/tests/vhost-user-test.c
> @@ -545,6 +545,7 @@ static gboolean _test_server_free(TestServer *server)
> g_free(server->mig_path);
>
> g_free(server->chr_name);
> + g_assert(server->bus);
> qpci_free_pc(server->bus);
>
> g_free(server);
> @@ -706,6 +707,7 @@ static void test_migrate(void)
> g_free(cmd);
>
> init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);
> + init_virtio_dev(dest, 1u << VIRTIO_NET_F_MAC);
> wait_for_fds(s);
> size = get_log_size(s);
> g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8));
> @@ -761,6 +763,7 @@ static void test_migrate(void)
> read_guest_mem_server(dest);
>
> uninit_virtio_dev(s);
> + uninit_virtio_dev(dest);
>
> g_source_destroy(source);
> g_source_unref(source);
>
Queued for 3.0, thanks.
Paolo
- Re: [Qemu-devel] [PATCH] vhost-user-test: added proper TestServer *dest initialization in test_migrate(),
Paolo Bonzini <=