From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agxmH-0006UC-Do for qemu-devel@nongnu.org; Fri, 18 Mar 2016 13:01:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agxmG-00083P-DP for qemu-devel@nongnu.org; Fri, 18 Mar 2016 13:01:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agxmG-00082x-7S for qemu-devel@nongnu.org; Fri, 18 Mar 2016 13:01:32 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id C57BB804E0 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-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2IH1TM6027325 (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:56 +0100 Message-Id: <1458320487-19603-10-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 09/40] ivshmem-test: Improve test cases /ivshmem/server-* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Document missing test: behavior with MSI-X present but not enabled. For MSI-X, we test and clear the interrupt pending bit before testing the interrupt. For INTx, we only clear. Change to test and clear for consistency. Test MSI-X vector 1 in addition to vector 0. Improve comments. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <1458066895-20632-10-git-send-email-armbru@redhat.com> --- tests/ivshmem-test.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index bbea8cd..7b6b957 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -339,18 +339,21 @@ static void test_ivshmem_server(bool msi) vm2 =3D in_reg(s2, IVPOSITION); g_assert_cmpuint(vm1, !=3D, vm2); =20 + /* check number of MSI-X vectors */ global_qtest =3D s1->qtest; if (msi) { ret =3D qpci_msix_table_size(s1->dev); g_assert_cmpuint(ret, =3D=3D, nvectors); } =20 - /* ping vm2 -> vm1 */ + /* TODO test behavior before MSI-X is enabled */ + + /* ping vm2 -> vm1 on vector 0 */ if (msi) { ret =3D qpci_msix_pending(s1->dev, 0); g_assert_cmpuint(ret, =3D=3D, 0); } else { - out_reg(s1, INTRSTATUS, 0); + g_assert_cmpuint(in_reg(s1, INTRSTATUS), =3D=3D, 0); } out_reg(s2, DOORBELL, vm1 << 16); do { @@ -359,18 +362,18 @@ static void test_ivshmem_server(bool msi) } while (ret =3D=3D 0 && g_get_monotonic_time() < end_time); g_assert_cmpuint(ret, !=3D, 0); =20 - /* ping vm1 -> vm2 */ + /* ping vm1 -> vm2 on vector 1 */ global_qtest =3D s2->qtest; if (msi) { - ret =3D qpci_msix_pending(s2->dev, 0); + ret =3D qpci_msix_pending(s2->dev, 1); g_assert_cmpuint(ret, =3D=3D, 0); } else { - out_reg(s2, INTRSTATUS, 0); + g_assert_cmpuint(in_reg(s2, INTRSTATUS), =3D=3D, 0); } - out_reg(s1, DOORBELL, vm2 << 16); + out_reg(s1, DOORBELL, vm2 << 16 | 1); do { g_usleep(10000); - ret =3D msi ? qpci_msix_pending(s2->dev, 0) : in_reg(s2, INTRSTA= TUS); + ret =3D msi ? qpci_msix_pending(s2->dev, 1) : in_reg(s2, INTRSTA= TUS); } while (ret =3D=3D 0 && g_get_monotonic_time() < end_time); g_assert_cmpuint(ret, !=3D, 0); =20 --=20 2.4.3