From nobody Fri Nov 7 00:47:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544630147434586.2421574229742; Wed, 12 Dec 2018 07:55:47 -0800 (PST) Received: from localhost ([::1]:45726 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6rS-00024B-At for importer@patchew.org; Wed, 12 Dec 2018 10:55:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6N8-0001NJ-9T for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:24:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX6N3-0000eF-6S for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:24:26 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:33946) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gX6N1-0000Zl-1f for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:24:21 -0500 Received: by mail-wm1-x335.google.com with SMTP id y185so11705808wmd.1 for ; Wed, 12 Dec 2018 07:24:13 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u10sm15878859wrr.33.2018.12.12.07.24.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 07:24:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B9VhKO2W9JIF/PCxT0Z34NpXqfmEufxNf9w/zUS6xC0=; b=ih+4ESy5Zc1dNtpevI8jAHerTzP63S2kKrHrz38Qp8lAygiCYbRCcbvcfQMeEaxxKd 7YHb4jkXjeetwxAt1+HzBqCwxZGIfHbxctf1l8TXZtoALmWII6gYbEmOYvJHTQfjBj2F Fcb3R780OrjW9uf0a1y0eTNHysufPebfbiZbMMP9Pxr6/va/LLxtfqlOghlLyHAtdPeR EikHcIJg0u/KRTaoMnRV0O4vGNlO2KQe2a1KLxE2CfWi17oD5ABLjkLsq8QtW5uFt38H JobEZQP1yyJPh6oA8OFPdvNGOETs9HWVVQwOwDdjDyPrL0HjgnWJOBM1wIaZLipwhDav RfHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=B9VhKO2W9JIF/PCxT0Z34NpXqfmEufxNf9w/zUS6xC0=; b=LyK+DfJZS0LG+WtHB9pbygM/sBdA54Gk89vLa4/uxYn9oozkCkOPMNcQoOXXgLVJNy wrmzYPH/cP7Sh0mhfdp9EVGjiFjAd/fDW8zIGUNw/cQfALtH7q2GbI8k9UleHeVLFO4P +sRwWT1Emxyz6EX1JeVfWdbJOqjCjvGV5dDAMb41xjx9GPmvIPcrOT9qc7liRwgQmpFQ Bbj4VXBqBvL+5SunQwQXk8sZuyD+/6lQW8YRTCK5hA8PZDCAmJ+Dv+Jb9t3DS5oewWA8 0ggL1PGy/aweLb270JCkEtrX6mHBHe9tVwAa5JpDawzGOrlujGTjDEKiL2fkUYVKd2pe 1zEQ== X-Gm-Message-State: AA+aEWb96vJeG+Rq0iicqGn8cxUZQinKc8TDVJ2HOmdiTgj35TBDDkQl tV4TVp9eOeE0V9lzHtt6IjAIyMAJ X-Google-Smtp-Source: AFSGD/WX9r94uV1AkrBV1/n/nrgB6DJR3UHul8c/aJdJt12325Kuf2hYH8mhr770qRLreWuFltRbSA== X-Received: by 2002:a1c:7fca:: with SMTP id a193mr6758601wmd.36.1544628251837; Wed, 12 Dec 2018 07:24:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Dec 2018 16:23:11 +0100 Message-Id: <1544628195-37728-51-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> References: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 Subject: [Qemu-devel] [PULL 50/54] vhost-user-test: skip if there is no memory at address 0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The virt machine cannot run the vhost-user qtests because they hardcode the presence of memory at address 0. Report the tests as a skip so that they can be converted to use qgraph. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini Message-Id: <1543851204-41186-11-git-send-email-pbonzini@redhat.com> --- tests/vhost-user-test.c | 58 ++++++++++++++++++++++++++++++++++++++-------= ---- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 82fc6c5..59e1aec 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -228,9 +228,11 @@ static void uninit_virtio_dev(TestServer *s) qvirtio_pci_device_free(s->dev); } =20 -static void wait_for_fds(TestServer *s) +static bool wait_for_fds(TestServer *s) { gint64 end_time; + bool got_region; + int i; =20 g_mutex_lock(&s->data_mutex); =20 @@ -248,6 +250,19 @@ static void wait_for_fds(TestServer *s) g_assert_cmpint(s->fds_num, =3D=3D, s->memory.nregions); =20 g_mutex_unlock(&s->data_mutex); + + got_region =3D false; + for (i =3D 0; i < s->memory.nregions; ++i) { + VhostUserMemoryRegion *reg =3D &s->memory.regions[i]; + if (reg->guest_phys_addr =3D=3D 0) { + got_region =3D true; + break; + } + } + if (!got_region) { + g_test_skip("No memory at address 0x0"); + } + return got_region; } =20 static void read_guest_mem_server(TestServer *s) @@ -256,8 +271,6 @@ static void read_guest_mem_server(TestServer *s) int i, j; size_t size; =20 - wait_for_fds(s); - g_mutex_lock(&s->data_mutex); =20 /* iterate all regions */ @@ -577,8 +590,6 @@ static void write_guest_mem(TestServer *s, uint32_t see= d) int i, j; size_t size; =20 - wait_for_fds(s); - /* iterate all regions */ for (i =3D 0; i < s->fds_num; i++) { =20 @@ -661,8 +672,13 @@ static void test_read_guest_mem(const void *arg) =20 init_virtio_dev(server, 1u << VIRTIO_NET_F_MAC); =20 + if (!wait_for_fds(server)) { + goto exit; + } + read_guest_mem_server(server); =20 +exit: uninit_virtio_dev(server); =20 qtest_quit(s); @@ -689,8 +705,10 @@ static void test_migrate(void) g_free(cmd); =20 init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); - init_virtio_dev(dest, 1u << VIRTIO_NET_F_MAC); - wait_for_fds(s); + if (!wait_for_fds(s)) { + goto exit; + } + size =3D get_log_size(s); g_assert_cmpint(size, =3D=3D, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8)= ); =20 @@ -699,6 +717,7 @@ static void test_migrate(void) g_free(tmp); to =3D qtest_init(cmd); g_free(cmd); + init_virtio_dev(dest, 1u << VIRTIO_NET_F_MAC); =20 source =3D g_source_new(&test_migrate_source_funcs, sizeof(TestMigrateSource)); @@ -738,15 +757,18 @@ static void test_migrate(void) global_qtest =3D to; qmp_eventwait("RESUME"); =20 + g_assert(wait_for_fds(s)); read_guest_mem_server(dest); =20 - uninit_virtio_dev(s); uninit_virtio_dev(dest); + qtest_quit(to); =20 g_source_destroy(source); g_source_unref(source); =20 - qtest_quit(to); +exit: + uninit_virtio_dev(s); + test_server_free(dest); qtest_quit(from); test_server_free(s); @@ -810,16 +832,20 @@ static void test_reconnect_subprocess(void) g_free(cmd); =20 init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); - wait_for_fds(s); + if (!wait_for_fds(s)) { + goto exit; + } + wait_for_rings_started(s, 2); =20 /* reconnect */ s->fds_num =3D 0; s->rings =3D 0; g_idle_add(reconnect_cb, s); - wait_for_fds(s); + g_assert(wait_for_fds(s)); wait_for_rings_started(s, 2); =20 +exit: uninit_virtio_dev(s); =20 qtest_end(); @@ -848,9 +874,12 @@ static void test_connect_fail_subprocess(void) g_free(cmd); =20 init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); - wait_for_fds(s); + if (!wait_for_fds(s)) { + goto exit; + } wait_for_rings_started(s, 2); =20 +exit: uninit_virtio_dev(s); =20 qtest_end(); @@ -878,9 +907,12 @@ static void test_flags_mismatch_subprocess(void) g_free(cmd); =20 init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); - wait_for_fds(s); + if (!wait_for_fds(s)) { + goto exit; + } wait_for_rings_started(s, 2); =20 +exit: uninit_virtio_dev(s); =20 qtest_end(); --=20 1.8.3.1