From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byxxI-00009c-0k for qemu-devel@nongnu.org; Tue, 25 Oct 2016 05:23:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1byxxE-0000Hp-MZ for qemu-devel@nongnu.org; Tue, 25 Oct 2016 05:23:36 -0400 Received: from 20.mo6.mail-out.ovh.net ([178.32.124.17]:38904) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1byxxE-0000Gv-G7 for qemu-devel@nongnu.org; Tue, 25 Oct 2016 05:23:32 -0400 Received: from player786.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo6.mail-out.ovh.net (Postfix) with ESMTP id 5CDD855C1B for ; Tue, 25 Oct 2016 11:23:30 +0200 (CEST) Date: Tue, 25 Oct 2016 11:23:18 +0200 From: Greg Kurz Message-ID: <20161025112318.6c1e582b@bahia> In-Reply-To: <1477285201-10244-11-git-send-email-david@gibson.dropbear.id.au> References: <1477285201-10244-1-git-send-email-david@gibson.dropbear.id.au> <1477285201-10244-11-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv5 10/12] tests: Use qpci_mem{read, write} in ivshmem-test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, lvivier@redhat.com, agraf@suse.de, stefanha@redhat.com, mst@redhat.com, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, thuth@redhat.com On Mon, 24 Oct 2016 15:59:59 +1100 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 > Reviewed-by: Laurent Vivier > --- Reviewed-by: Greg Kurz > tests/ivshmem-test.c | 35 +++++++++++++++++++++++++++-------- > 1 file changed, 27 insertions(+), 8 deletions(-) > > diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c > index f36bfe7..fbd8258 100644 > --- a/tests/ivshmem-test.c > +++ b/tests/ivshmem-test.c > @@ -93,6 +93,25 @@ static inline void out_reg(IVState *s, enum Reg reg, unsigned v) > global_qtest = qtest; > } > > +static inline void read_mem(IVState *s, uint64_t off, void *buf, size_t len) > +{ > + QTestState *qtest = global_qtest; > + > + global_qtest = s->qtest; > + qpci_memread(s->dev, s->mem_base + off, buf, len); > + global_qtest = qtest; > +} > + > +static inline void write_mem(IVState *s, uint64_t off, > + const void *buf, size_t len) > +{ > + QTestState *qtest = global_qtest; > + > + global_qtest = s->qtest; > + qpci_memwrite(s->dev, s->mem_base + off, buf, len); > + global_qtest = qtest; > +} > + > static void cleanup_vm(IVState *s) > { > g_free(s->dev); > @@ -169,7 +188,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)); > + write_mem(s, 0, data, sizeof(data)); > > /* verify write */ > for (i = 0; i < G_N_ELEMENTS(data); i++) { > @@ -178,7 +197,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)); > + read_mem(s, 0, data, sizeof(data)); > for (i = 0; i < G_N_ELEMENTS(data); i++) { > g_assert_cmpuint(data[i], ==, i); > } > @@ -201,29 +220,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); > + read_mem(s1, 0, 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); > + read_mem(s2, 0, 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); > + write_mem(s1, 0, data, TMPSHMSIZE); > memset(data, 0, TMPSHMSIZE); > - qtest_memread(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + read_mem(s2, 0, 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); > + write_mem(s2, 0, data, TMPSHMSIZE); > memset(data, 0, TMPSHMSIZE); > - qtest_memread(s1->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + read_mem(s1, 0, data, TMPSHMSIZE); > for (i = 0; i < TMPSHMSIZE; i++) { > g_assert_cmpuint(data[i], ==, 0x44); > }