From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwX1x-0005eU-7y for qemu-devel@nongnu.org; Tue, 18 Oct 2016 12:14:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwX1w-0003vv-2c for qemu-devel@nongnu.org; Tue, 18 Oct 2016 12:14:21 -0400 References: <1476787933-7180-1-git-send-email-david@gibson.dropbear.id.au> <1476787933-7180-8-git-send-email-david@gibson.dropbear.id.au> From: Laurent Vivier Message-ID: Date: Tue, 18 Oct 2016 18:14:09 +0200 MIME-Version: 1.0 In-Reply-To: <1476787933-7180-8-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 7/8] tests: Use qpci_mem{read, write} in ivshmem-test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , pbonzini@redhat.com, qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, agraf@suse.de, stefanha@redhat.com, mst@redhat.com, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, groug@kaod.org, thuth@redhat.com On 18/10/2016 12:52, David Gibson wrote: > ivshmem implements a block of shared memory in a PCI BAR. Currently our > test case accesses this using qtest_mem{read,write}. However, deducing > the correct addresses for these requires making assumptions about the > internel format returned by qpci_iomap(), along with some ugly casts. > > This patch changes the test to use the new qpci_mem{read,write} interfaces > which is neater. > > Signed-off-by: David Gibson I think your changes break this test. There is two guest, so we need to access them through two sockets, defined in s1->qtest and s2->qtest. But qpci_memXXX() always use memread(...) and thus qtest_memread(global_qtest, ...) , so always test the last guest started. You must swap global_qtest as it is done in in_reg()/out_reg() before your qpci_memXXX() in test_ivshmem_pair(). Laurent > --- > tests/ivshmem-test.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c > index f36bfe7..97a887e 100644 > --- a/tests/ivshmem-test.c > +++ b/tests/ivshmem-test.c > @@ -169,7 +169,7 @@ static void test_ivshmem_single(void) > for (i = 0; i < G_N_ELEMENTS(data); i++) { > data[i] = i; > } > - qtest_memwrite(s->qtest, (uintptr_t)s->mem_base, data, sizeof(data)); > + qpci_memwrite(s->dev, s->mem_base, data, sizeof(data)); > > /* verify write */ > for (i = 0; i < G_N_ELEMENTS(data); i++) { > @@ -178,7 +178,7 @@ static void test_ivshmem_single(void) > > /* read it back and verify read */ > memset(data, 0, sizeof(data)); > - qtest_memread(s->qtest, (uintptr_t)s->mem_base, data, sizeof(data)); > + qpci_memread(s->dev, s->mem_base, data, sizeof(data)); > for (i = 0; i < G_N_ELEMENTS(data); i++) { > g_assert_cmpuint(data[i], ==, i); > } > @@ -201,29 +201,29 @@ static void test_ivshmem_pair(void) > > /* host write, guest 1 & 2 read */ > memset(tmpshmem, 0x42, TMPSHMSIZE); > - qtest_memread(s1->qtest, (uintptr_t)s1->mem_base, data, TMPSHMSIZE); > + qpci_memread(s1->dev, s1->mem_base, data, TMPSHMSIZE); > for (i = 0; i < TMPSHMSIZE; i++) { > g_assert_cmpuint(data[i], ==, 0x42); > } > - qtest_memread(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + qpci_memread(s2->dev, s2->mem_base, data, TMPSHMSIZE); > for (i = 0; i < TMPSHMSIZE; i++) { > g_assert_cmpuint(data[i], ==, 0x42); > } > > /* guest 1 write, guest 2 read */ > memset(data, 0x43, TMPSHMSIZE); > - qtest_memwrite(s1->qtest, (uintptr_t)s1->mem_base, data, TMPSHMSIZE); > + qpci_memwrite(s1->dev, s1->mem_base, data, TMPSHMSIZE); > memset(data, 0, TMPSHMSIZE); > - qtest_memread(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + qpci_memread(s2->dev, s2->mem_base, data, TMPSHMSIZE); > for (i = 0; i < TMPSHMSIZE; i++) { > g_assert_cmpuint(data[i], ==, 0x43); > } > > /* guest 2 write, guest 1 read */ > memset(data, 0x44, TMPSHMSIZE); > - qtest_memwrite(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + qpci_memwrite(s2->dev, s2->mem_base, data, TMPSHMSIZE); > memset(data, 0, TMPSHMSIZE); > - qtest_memread(s1->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + qpci_memread(s1->dev, s2->mem_base, data, TMPSHMSIZE); > for (i = 0; i < TMPSHMSIZE; i++) { > g_assert_cmpuint(data[i], ==, 0x44); > } >