From patchwork Thu Sep 15 14:50:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 670472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sZhfR1FJTz9s4x for ; Fri, 16 Sep 2016 01:09:51 +1000 (AEST) Received: from localhost ([::1]:35373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkYIN-0003aW-SC for incoming@patchwork.ozlabs.org; Thu, 15 Sep 2016 11:09:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXzr-0003py-Pa for qemu-devel@nongnu.org; Thu, 15 Sep 2016 10:50:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkXzm-0002bk-Qc for qemu-devel@nongnu.org; Thu, 15 Sep 2016 10:50:39 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:60748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXzm-0002ba-Fj for qemu-devel@nongnu.org; Thu, 15 Sep 2016 10:50:34 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8FEmEnW023586 for ; Thu, 15 Sep 2016 10:50:33 -0400 Received: from e18.ny.us.ibm.com (e18.ny.us.ibm.com [129.33.205.208]) by mx0a-001b2d01.pphosted.com with ESMTP id 25fqtruhbn-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 15 Sep 2016 10:50:33 -0400 Received: from localhost by e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 15 Sep 2016 10:50:32 -0400 Received: from d01dlp03.pok.ibm.com (9.56.250.168) by e18.ny.us.ibm.com (146.89.104.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 15 Sep 2016 10:50:29 -0400 X-IBM-Helo: d01dlp03.pok.ibm.com X-IBM-MailFrom: groug@kaod.org Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 525C2C90048; Thu, 15 Sep 2016 10:50:15 -0400 (EDT) Received: from b01ledav001.gho.pok.ibm.com (b01ledav001.gho.pok.ibm.com [9.57.199.106]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u8FEoVJx19464652; Thu, 15 Sep 2016 14:50:31 GMT Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0339C2803D; Thu, 15 Sep 2016 10:50:28 -0400 (EDT) Received: from [192.168.66.108] (unknown [9.164.164.67]) by b01ledav001.gho.pok.ibm.com (Postfix) with ESMTP id 393DA28046; Thu, 15 Sep 2016 10:50:27 -0400 (EDT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Thu, 15 Sep 2016 16:50:26 +0200 In-Reply-To: <147395101100.3728.9929660720854734579.stgit@bahia> References: <147395101100.3728.9929660720854734579.stgit@bahia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16091514-0044-0000-0000-00000132BABC X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005765; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000185; SDB=6.00757981; UDB=6.00359640; IPR=6.00531596; BA=6.00004731; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012682; XFM=3.00000011; UTC=2016-09-15 14:50:31 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16091514-0045-0000-0000-0000054BBB5F Message-Id: <147395102617.3728.7506315729853866362.stgit@bahia> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-15_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609020000 definitions=main-1609150199 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v2 2/3] tests: virtio-9p: add basic configuration test 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: Cornelia Huck , Greg Kurz , "Aneesh Kumar K.V" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This adds PCI init code and a basic test that checks the device config matches what is passed on the command line. Signed-off-by: Greg Kurz Acked-by: Cornelia Huck --- V2: - s/char* tag/char *tag/ (patchew) - moved "mount_tag" change from 2/3 to 1/3 (Cornelia) - added Cornelia's A-b tag --- tests/Makefile.include | 2 + tests/virtio-9p-test.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 03382b5fe7b8..a9dce206fbf6 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -600,7 +600,7 @@ tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o $(libqos-virtio-obj-y) tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y) $(libqos-virtio-obj-y) tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o $(libqos-pc-obj-y) tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-obj-y) -tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o +tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o $(libqos-virtio-obj-y) tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o tests/virtio-console-test$(EXESUF): tests/virtio-console-test.o tests/tpci200-test$(EXESUF): tests/tpci200-test.o diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c index 45fc8041d7f3..b8fb6cd869a9 100644 --- a/tests/virtio-9p-test.c +++ b/tests/virtio-9p-test.c @@ -10,6 +10,13 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qemu-common.h" +#include "libqos/pci-pc.h" +#include "libqos/virtio.h" +#include "libqos/virtio-pci.h" +#include "libqos/malloc.h" +#include "libqos/malloc-pc.h" +#include "standard-headers/linux/virtio_ids.h" +#include "standard-headers/linux/virtio_pci.h" static const char mount_tag[] = "qtest"; static char *test_share; @@ -42,10 +49,80 @@ static void pci_nop(void) qvirtio_9p_stop(); } +typedef struct { + QVirtioDevice *dev; + QGuestAllocator *alloc; + QPCIBus *bus; + QVirtQueue *vq; +} QVirtIO9P; + +static QVirtIO9P *qvirtio_9p_pci_init(void) +{ + QVirtIO9P *v9p; + QVirtioPCIDevice *dev; + + v9p = g_new0(QVirtIO9P, 1); + v9p->alloc = pc_alloc_init(); + v9p->bus = qpci_init_pc(); + + dev = qvirtio_pci_device_find(v9p->bus, VIRTIO_ID_9P); + g_assert_nonnull(dev); + g_assert_cmphex(dev->vdev.device_type, ==, VIRTIO_ID_9P); + v9p->dev = (QVirtioDevice *) dev; + + qvirtio_pci_device_enable(dev); + qvirtio_reset(&qvirtio_pci, v9p->dev); + qvirtio_set_acknowledge(&qvirtio_pci, v9p->dev); + qvirtio_set_driver(&qvirtio_pci, v9p->dev); + + v9p->vq = qvirtqueue_setup(&qvirtio_pci, v9p->dev, v9p->alloc, 0); + return v9p; +} + +static void qvirtio_9p_pci_free(QVirtIO9P *v9p) +{ + qvirtqueue_cleanup(&qvirtio_pci, v9p->vq, v9p->alloc); + pc_alloc_uninit(v9p->alloc); + qvirtio_pci_device_disable(container_of(v9p->dev, QVirtioPCIDevice, vdev)); + g_free(v9p->dev); + qpci_free_pc(v9p->bus); + g_free(v9p); +} + +static void pci_basic_config(void) +{ + QVirtIO9P *v9p; + void *addr; + size_t tag_len; + char *tag; + int i; + + qvirtio_9p_start(); + v9p = qvirtio_9p_pci_init(); + + addr = ((QVirtioPCIDevice *) v9p->dev)->addr + VIRTIO_PCI_CONFIG_OFF(false); + tag_len = qvirtio_config_readw(&qvirtio_pci, v9p->dev, + (uint64_t)(uintptr_t)addr); + g_assert_cmpint(tag_len, ==, strlen(mount_tag)); + addr += sizeof(uint16_t); + + tag = g_malloc(tag_len); + for (i = 0; i < tag_len; i++) { + tag[i] = qvirtio_config_readb(&qvirtio_pci, v9p->dev, + (uint64_t)(uintptr_t)addr + i); + } + g_assert_cmpmem(tag, tag_len, mount_tag, tag_len); + g_free(tag); + + qvirtio_9p_pci_free(v9p); + qvirtio_9p_stop(); +} + int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); qtest_add_func("/virtio/9p/pci/nop", pci_nop); + qtest_add_func("/virtio/9p/pci/basic/configuration", pci_basic_config); return g_test_run(); }