From patchwork Mon Aug 20 12:02:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 959638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p686wdYG"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vCBZ5z2lz9s3C for ; Mon, 20 Aug 2018 22:03:34 +1000 (AEST) Received: from localhost ([::1]:46657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1friuC-0005r8-FH for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:03:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fritG-0005pd-MD for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:02:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fritD-0002U3-Va for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:02:34 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:43758) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fritD-0002Tp-Pk; Mon, 20 Aug 2018 08:02:31 -0400 Received: by mail-ed1-x544.google.com with SMTP id j21-v6so8310470edp.10; Mon, 20 Aug 2018 05:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uxiUnMB0E1UqGLwYXjb/luqnm3GJy8B9Ye6+J2qv7mw=; b=p686wdYGasXfChoBpUZEhWQwf4C7TsqpALG24SzgCnzcUmQ8F8/8PiHk7Dk3tteeLs VI9nRoE7tiX1MDiR7vLgQeCRwNVzymqyZK7a8Zga8OKzXOJAi0ELb2Ek1t6jrqvUW6F0 /uAMSOzXFPW/f6uTCarQ1ThTp8to9r32iE2WdKzOACvabP+zyuCr+KMw6eTf/HiNELkC Kdz4zB74PMI1Ek7U4TdhOtDCaFwFrgIf8qYYW40Jvc0IJGi+k/aA/dYvbE1L0vjhGURA lAFQztwho04JwvXvnMvDEf/2QXTqGr5f7x+Lwm0vvkhAXvpVYvcyOA4FQYpVLCeNnjwn u9ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uxiUnMB0E1UqGLwYXjb/luqnm3GJy8B9Ye6+J2qv7mw=; b=EtCSAxjUrLI0iAxLT8FZpWsvuV9TuPl2MQJCRGJa+OVO0ISYPue4Dyh0lsPyOSDstG KuUC0CXDQyBkGMIcUDUZnWP+e7LAlHKqd3NStrdJnbadY45cKDc8NPVT9rn6oXmFt8ZP CueZNC9bPSb/r+e11YXXguzRUkcff5FFC2Digwzlw0Uqhq4aSKFCFLhpuru5mPYhltUF oO+3x48JVxl0OI2GerQqcjpN2NYHdBSTATu49J1X087cplTqvYw7mlZTMTmjCjYhDsQN cGYTEJqhffINiBH0+F/Yfk2FZup1sot9zDtajURXhA+UAVatCPpbg4uQvLEoABU107dj 6WEw== X-Gm-Message-State: AOUpUlGuzLteaoSbsxNq1w793XzGh6YoBobf4sHf2OjZP0yJBtIUKJU1 p7XVITUxmOGXIIhz8ya8C0YDENwtW14= X-Google-Smtp-Source: ANB0Vda+E86by4sbNxEZTXPTOzn912lCQ9R4EyXO49FZkYqFkeAttR4J962FgJ8AygXQzc3F7guroQ== X-Received: by 2002:a50:ae83:: with SMTP id e3-v6mr6788121edd.16.1534766550521; Mon, 20 Aug 2018 05:02:30 -0700 (PDT) Received: from emanuele-MacBookPro.mobile.usilu.net ([194.230.159.211]) by smtp.gmail.com with ESMTPSA id b20-v6sm1348486edc.30.2018.08.20.05.02.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Aug 2018 05:02:29 -0700 (PDT) From: Emanuele Giuseppe Esposito To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 14:02:03 +0200 Message-Id: <20180820120213.11095-7-e.emanuelegiuseppe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180820120213.11095-1-e.emanuelegiuseppe@gmail.com> References: <20180820120213.11095-1-e.emanuelegiuseppe@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::544 Subject: [Qemu-devel] [PATCH 06/16] test/qgraph: tpci200 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: Laurent Vivier , Dmitry Fleytman , Fam Zheng , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Amit Shah , Jason Wang , "Michael S. Tsirkin" , Emanuele Giuseppe Esposito , Alexander Graf , Greg Kurz , Keith Busch , qemu-ppc@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , John Snow , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Convert tests/tpci200-test in qgraph test node, tpci200-test. Since it's a nop test, node creation and initialization is made in the same file. Signed-off-by: Emanuele Giuseppe Esposito --- tests/Makefile.include | 2 +- tests/tpci200-test.c | 60 +++++++++++++++++++++++++++++++++++------- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 3e5964263e..1daee93de5 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -792,6 +792,7 @@ libqgraph-tests-obj-y += tests/virtio-blk-test.o libqgraph-tests-obj-y += tests/virtio-net-test.o libqgraph-tests-obj-y += tests/virtio-scsi-test.o libqgraph-tests-obj-y += tests/ac97-test.o +libqgraph-tests-obj-y += tests/tpci200-test.o check-unit-y += tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) @@ -835,7 +836,6 @@ tests/ne2000-test$(EXESUF): tests/ne2000-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 -tests/tpci200-test$(EXESUF): tests/tpci200-test.o tests/display-vga-test$(EXESUF): tests/display-vga-test.o tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o tests/qom-test$(EXESUF): tests/qom-test.o diff --git a/tests/tpci200-test.c b/tests/tpci200-test.c index 0321ec27ec..a0e1785e50 100644 --- a/tests/tpci200-test.c +++ b/tests/tpci200-test.c @@ -9,23 +9,65 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "libqos/qgraph.h" + +typedef struct QTpci200 QTpci200; +typedef struct QIpack QIpack; + +struct QIpack { + +}; +struct QTpci200 { + QOSGraphObject obj; + QIpack ipack; +}; /* Tests only initialization so far. TODO: Replace with functional tests */ -static void nop(void) +static void nop(void *obj, void *data, QGuestAllocator *alloc) { } -int main(int argc, char **argv) +/* tpci200 */ +static void *tpci200_get_driver(void *obj, const char *interface) { - int ret; + QTpci200 *tpci200 = obj; + if (!g_strcmp0(interface, "ipack")) { + return &tpci200->ipack; + } - g_test_init(&argc, &argv, NULL); - qtest_add_func("/tpci200/nop", nop); + fprintf(stderr, "%s not present in tpci200\n", interface); + g_assert_not_reached(); +} - qtest_start("-device tpci200"); - ret = g_test_run(); +static void tpci200_destructor(QOSGraphObject *obj) +{ + QTpci200 *tpci200 = (QTpci200 *) obj; + g_free(tpci200); +} - qtest_end(); +static void *tpci200_create(void *pci_bus, QGuestAllocator *alloc, void *addr) +{ + QTpci200 *tpci200 = g_new0(QTpci200, 1); + tpci200->obj.destructor = tpci200_destructor; + tpci200->obj.get_driver = tpci200_get_driver; - return ret; + return &tpci200->obj; } + +static void tpci200_register_nodes(void) +{ + qos_node_create_driver("tpci200", tpci200_create); + qos_node_consumes("tpci200", "pci-bus", &(QOSGraphEdgeOptions) { + .extra_device_opts = "id=ipack0", + }); + qos_node_produces("tpci200", "ipack"); +} + +libqos_init(tpci200_register_nodes); + +static void register_tpci200_test(void) +{ + qos_add_test("tpci200-test", "tpci200", nop, NULL); +} + +libqos_init(register_tpci200_test);