From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agxmH-0006Ug-KR for qemu-devel@nongnu.org; Fri, 18 Mar 2016 13:01:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agxmG-00083W-Fs for qemu-devel@nongnu.org; Fri, 18 Mar 2016 13:01:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agxmG-000830-8z for qemu-devel@nongnu.org; Fri, 18 Mar 2016 13:01:32 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id CBBC93DC for ; Fri, 18 Mar 2016 17:01:31 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2IH1T0d010059 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 18 Mar 2016 13:01:31 -0400 From: Markus Armbruster Date: Fri, 18 Mar 2016 18:00:55 +0100 Message-Id: <1458320487-19603-9-git-send-email-armbru@redhat.com> In-Reply-To: <1458320487-19603-1-git-send-email-armbru@redhat.com> References: <1458320487-19603-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 08/40] ivshmem-test: Clean up wait for devices to become operational List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org test_ivshmem_server() waits until the first byte in BAR 2 contains the 0x42 we put into shared memory. Works because the byte reads zero until the device maps the shared memory gotten from the server. Check the IVPosition register instead: it's initially -1, and becomes non-negative right when the device maps the share memory, so no change, just cleaner, because it's what guest software is supposed to do. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <1458066895-20632-9-git-send-email-armbru@redhat.com> --- tests/ivshmem-test.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index a48dc49..bbea8cd 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -301,7 +301,6 @@ static void test_ivshmem_server(bool msi) int nvectors =3D 2; guint64 end_time =3D g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND= ; =20 - memset(tmpshmem, 0x42, TMPSHMSIZE); ret =3D ivshmem_server_init(&server, tmpserver, tmpshm, true, TMPSHMSIZE, nvectors, g_test_verbose()); @@ -315,9 +314,9 @@ static void test_ivshmem_server(bool msi) setup_vm_with_server(&state2, nvectors, msi); s2 =3D &state2; =20 + /* check state before server sends stuff */ g_assert_cmpuint(in_reg(s1, IVPOSITION), =3D=3D, 0xffffffff); g_assert_cmpuint(in_reg(s2, IVPOSITION), =3D=3D, 0xffffffff); - g_assert_cmpuint(qtest_readb(s1->qtest, (uintptr_t)s1->mem_base), =3D= =3D, 0x00); =20 thread.server =3D &server; @@ -326,12 +325,11 @@ static void test_ivshmem_server(bool msi) thread.thread =3D g_thread_new("ivshmem-server", server_thread, &thr= ead); g_assert(thread.thread !=3D NULL); =20 - /* waiting until mapping is done */ + /* waiting for devices to become operational */ while (g_get_monotonic_time() < end_time) { g_usleep(1000); - - if (qtest_readb(s1->qtest, (uintptr_t)s1->mem_base) =3D=3D 0x42 = && - qtest_readb(s2->qtest, (uintptr_t)s2->mem_base) =3D=3D 0x42)= { + if ((int)in_reg(s1, IVPOSITION) >=3D 0 && + (int)in_reg(s2, IVPOSITION) >=3D 0) { break; } } --=20 2.4.3