From nobody Sun Nov 9 22:28:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551982407906765.4823180222251; Thu, 7 Mar 2019 10:13:27 -0800 (PST) Received: from localhost ([127.0.0.1]:56701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1xWG-00053B-NC for importer@patchew.org; Thu, 07 Mar 2019 13:13:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wrP-0003t9-7z for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:31:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1wrO-0000CA-8G for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:31:11 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46337) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1wrO-0000BN-0n for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:31:10 -0500 Received: by mail-wr1-x432.google.com with SMTP id i16so18390732wrs.13 for ; Thu, 07 Mar 2019 09:31:09 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id d206sm9979753wmc.11.2019.03.07.09.31.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 09:31:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=u0HTcJnAPuu2RBErVhE0oIR+WQ0hlSpjlb8FtAPrNO8=; b=PkMwnxVaKqQPTTbWtr34hwsSNQPw8mvnvOsbpmM5+/NW8QFfJNxe4wDtoA9fsVOuMu 493g0cL2JT67yfwsSbc/7p/f8qrZQ4cybK2y8Rfw/h+Xo/owlSCJpRw9pog4ujk7ClhB Xf4hEuFP9CPt/bUAWRWsvSa6dKJft8DmPBsJMpl3j9oBy5PkbqVWTtJOBvxkyTFb+xlj lxL/TH+1vgbFCvUm+9l/c9SpCsGuPgjnnnppY30fUAOLdkVbC9j5Tmo4JYg93qfSfr1N SGoFBe3XlIvoJJxyW2n1hrU4ABu5XdtgWa16NL+h4D8Jb5mecgw8g0GrdWJmLRBCYBOw qwuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=u0HTcJnAPuu2RBErVhE0oIR+WQ0hlSpjlb8FtAPrNO8=; b=mtY96HvfCQ+vo++EcU8I8QKvyZ4a9E1u1vzwx9Tk2nmm447OIjERLAc1Tq6mCCxi4t 6LHJ4ClOQK5gk4ThqxRdcrTNVXHvXL3sDsELtTCTJPawsQA0JVFN2NFJQshYJOlPYIUa HAxlDCV2AlRQchJrPv/M9E+ma/p2WMzcAgxIi8yPj10sbmubXDlQV35kfBE3C9iiEizZ rM44c37ohvbuhD8lmYmHFmbBW2ZmvGN1G2IqAxXSQ6ZG9DumG0kfy9TsnbZm9iPOTWs9 f9EaDl4dJ1UIGEpmT2ZdSvJeR8wNXgRq5+gvlRXopPOltrYMcLNm7A7IeMughJV71dZl Oxyw== X-Gm-Message-State: APjAAAXeD9IInB9Gt/KtEb9IYBQ66GsuvKjwJoRFzcYRwA0CHgPgcTV9 vzQHHrqgIJoCvjgWUOGg7vuuASrl X-Google-Smtp-Source: APXvYqwFGEWh+tGsajaokSnyBS5McuGdymjsf/dao1RlhNiDmmDQuwpuwA+11j4GS2NCcCVXfXjYRA== X-Received: by 2002:a5d:558c:: with SMTP id i12mr7578104wrv.19.1551979868267; Thu, 07 Mar 2019 09:31:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 18:30:00 +0100 Message-Id: <1551979804-6060-54-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551979804-6060-1-git-send-email-pbonzini@redhat.com> References: <1551979804-6060-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 Subject: [Qemu-devel] [PULL 53/57] qos-test: vmxnet3 test node 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: thuth@redhat.com, Emanuele Giuseppe Esposito , lviver@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Emanuele Giuseppe Esposito Convert tests/vmxnet3-test to a driver node; currently it runs the PCI nop test only, therefore we're not placing it in tests/libqos. Signed-off-by: Emanuele Giuseppe Esposito Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 3 +-- tests/vmxnet3-test.c | 46 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 8ba8e27..5be98d7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -180,7 +180,6 @@ check-qtest-i386-y +=3D tests/drive_del-test$(EXESUF) check-qtest-i386-$(CONFIG_WDT_IB700) +=3D tests/wdt_ib700-test$(EXESUF) check-qtest-i386-y +=3D tests/tco-test$(EXESUF) check-qtest-i386-y +=3D $(check-qtest-pci-y) -check-qtest-i386-$(CONFIG_VMXNET3_PCI) +=3D tests/vmxnet3-test$(EXESUF) check-qtest-i386-$(CONFIG_PVPANIC) +=3D tests/pvpanic-test$(EXESUF) check-qtest-i386-$(CONFIG_I82801B11) +=3D tests/i82801b11-test$(EXESUF) check-qtest-i386-$(CONFIG_IOH3420) +=3D tests/ioh3420-test$(EXESUF) @@ -762,6 +761,7 @@ qos-test-obj-y +=3D tests/virtio-net-test.o qos-test-obj-y +=3D tests/virtio-rng-test.o qos-test-obj-y +=3D tests/virtio-scsi-test.o qos-test-obj-y +=3D tests/virtio-serial-test.o +qos-test-obj-y +=3D tests/vmxnet3-test.o =20 check-unit-y +=3D tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) @@ -801,7 +801,6 @@ tests/e1000-test$(EXESUF): tests/e1000-test.o tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y) tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o tests/eepro100-test$(EXESUF): tests/eepro100-test.o -tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y) tests/virtio-ccw-test$(EXESUF): tests/virtio-ccw-test.o diff --git a/tests/vmxnet3-test.c b/tests/vmxnet3-test.c index 159c0ad..35cdea9 100644 --- a/tests/vmxnet3-test.c +++ b/tests/vmxnet3-test.c @@ -9,23 +9,49 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" +#include "libqos/qgraph.h" +#include "libqos/pci.h" =20 -/* Tests only initialization so far. TODO: Replace with functional tests */ -static void nop(void) +typedef struct QVmxnet3 QVmxnet3; + +struct QVmxnet3 { + QOSGraphObject obj; + QPCIDevice dev; +}; + +static void *vmxnet3_get_driver(void *obj, const char *interface) { + QVmxnet3 *vmxnet3 =3D obj; + + if (!g_strcmp0(interface, "pci-device")) { + return &vmxnet3->dev; + } + + fprintf(stderr, "%s not present in vmxnet3\n", interface); + g_assert_not_reached(); } =20 -int main(int argc, char **argv) +static void *vmxnet3_create(void *pci_bus, QGuestAllocator *alloc, void *a= ddr) { - int ret; + QVmxnet3 *vmxnet3 =3D g_new0(QVmxnet3, 1); + QPCIBus *bus =3D pci_bus; =20 - g_test_init(&argc, &argv, NULL); - qtest_add_func("/vmxnet3/nop", nop); + qpci_device_init(&vmxnet3->dev, bus, addr); + vmxnet3->obj.get_driver =3D vmxnet3_get_driver; =20 - qtest_start("-device vmxnet3"); - ret =3D g_test_run(); + return &vmxnet3->obj; +} =20 - qtest_end(); +static void vmxnet3_register_nodes(void) +{ + QOSGraphEdgeOptions opts =3D { + .extra_device_opts =3D "addr=3D04.0", + }; + add_qpci_address(&opts, &(QPCIAddress) { .devfn =3D QPCI_DEVFN(4, 0) }= ); =20 - return ret; + qos_node_create_driver("vmxnet3", vmxnet3_create); + qos_node_consumes("vmxnet3", "pci-bus", &opts); + qos_node_produces("vmxnet3", "pci-device"); } + +libqos_init(vmxnet3_register_nodes); --=20 1.8.3.1