From nobody Thu Nov 6 18:20:56 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 1542292809549745.4632761422148; Thu, 15 Nov 2018 06:40:09 -0800 (PST) Received: from localhost ([::1]:39227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNIoS-0008W3-7E for importer@patchew.org; Thu, 15 Nov 2018 09:40:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNIgY-0002SW-Sv for qemu-devel@nongnu.org; Thu, 15 Nov 2018 09:32:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNIgV-00045h-6Z for qemu-devel@nongnu.org; Thu, 15 Nov 2018 09:31:58 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55140) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gNIgU-0003va-PP for qemu-devel@nongnu.org; Thu, 15 Nov 2018 09:31:54 -0500 Received: by mail-wm1-x342.google.com with SMTP id r63-v6so19120717wma.4 for ; Thu, 15 Nov 2018 06:31:34 -0800 (PST) Received: from localhost.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id x194-v6sm55262620wmd.41.2018.11.15.06.31.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Nov 2018 06:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rB3lmxo96gR1gARBk5c8RKWWRRjC2b3pa8ZLnu7LbeY=; b=mpptXxJ5VgKbCEuvCSzm0t0nC50b19GbLiFlLCjAMqKRhq0U9BRurCnu8X2qSB+9CD 6PJgdBJk15fW04BlgCLsY3a5UYbL69o38NJmNUYPh3HY6aWzBnIO7r4s2bs1ye4J/cAB qhutCSiereMQQrX2AX6486WRD6Qm6hZ2Tf7nh7N1KDt3ask4IezuzK0qeUq3SW+uEySB JXL8a24+3ne+cqZBhIByaWK217E8f0e+VrPVCwN9SpLB9FEiCbLWQNFGK1WuZOc0D2th 0EjocP9zhhF1kyfdooa3cq+cmu81XDzrXynRGK5DfzdXLCOD4ugta8uGnwwUlby4PTTm dNGQ== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rB3lmxo96gR1gARBk5c8RKWWRRjC2b3pa8ZLnu7LbeY=; b=cC2yS/7D8qt22zCe0aHpwzXODqP3dO/Gr+Ww1OnXoCz1XbS7uZ4aczKYnMb1O/1oTu nwTc//81bfh6YE//wURlB2UGZ0k2/hD3bmhmCk2UVm7tdAwDaO4iXmaBRmcJxdTyTmiK 08GVVbp8MZsZSnv8EzVPWO865GbBYXDPKrBm+Xott0xFgFq0qTxOyTFrR1kwAitgRLad ihrs2PFVUcGsTmscyuWSruBULsVne/5H4LqBQoVOqCiDJ3qnygKnD3wQeJ9wxjB8fOBM WmJH1FYa4s0qTL7fuWVlBHd0QfGoKLQHY4mn1yehNwFFcotiO+5njgpSsVivvv6CyInL 1Zww== X-Gm-Message-State: AGRZ1gJKoR16rLZnVtgDZlzzaI4xlE+RwW8Gd/HkFVRC5P8BrtjPZlwH c7cuxmKk6RWEfW7F8dDGzIA4x/2E X-Google-Smtp-Source: AJdET5fAtQvy7iaaCaQax2weIzYeUFPdlxdivFhWy4toaRw//pD8JSTMG5NweKYs2eNg7NGaW8gThw== X-Received: by 2002:a1c:1f11:: with SMTP id f17mr3384828wmf.56.1542292292840; Thu, 15 Nov 2018 06:31:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Nov 2018 15:31:20 +0100 Message-Id: <20181115143124.19234-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115143124.19234-1-pbonzini@redhat.com> References: <20181115143124.19234-1-pbonzini@redhat.com> MIME-Version: 1.0 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::342 Subject: [Qemu-devel] [PATCH 06/10] 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: , Cc: lvivier@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , jasowang@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Paolo Bonzini --- 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 82fc6c581b..59e1aec397 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 2.19.1