From patchwork Mon Aug 20 12:02:02 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: 959649 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="C0fa8FM9"; 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 41vCP33Fpsz9s4v for ; Mon, 20 Aug 2018 22:12:39 +1000 (AEST) Received: from localhost ([::1]:46724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frj2z-0006XW-1V for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:12:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fritE-0005ng-9F for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:02:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fritC-0002TV-6o for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:02:32 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:40970) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fritC-0002TA-0b; Mon, 20 Aug 2018 08:02:30 -0400 Received: by mail-ed1-x52a.google.com with SMTP id f38-v6so817779edd.8; Mon, 20 Aug 2018 05:02:29 -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=P6gL0rsE1N/359Z5EQ1KJEqxJ/cpzBpOKR8U4nC2sio=; b=C0fa8FM9Ah2Wzk0Hg4zfSW1COGanlYDXFarBnxMvVcbOy7m6t5ygaIoOa2nR3Lphoh Bq6Iw1xMojpY0FuM6ZY4sbKQoVs//ZuY2y9vMQ4gMfhn8aOQw9K4M5lIq3bPU/t8J//m R5o483J7/mVAI3iQyNOe+brLJpyKvR4ahOPFY8PfliOcPxMnJ5Nr2MLMV5yRZDnKKL9W 8QMOykMoSvIWfrODQ+Tq/OK2hTZR76tDd0Fjs1kslCABGIhkEdyGUDqqXpx6NXeeeK9g WBf6AmBif/1I2gpOFkKeocEBR61y6YayZxeqdlRolgc3qChh00dSwayiF8JHUtP1/Ysg Eyrw== 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=P6gL0rsE1N/359Z5EQ1KJEqxJ/cpzBpOKR8U4nC2sio=; b=jmbwRZRiIfyxI1jbcxVyUm/Ml3tSpAHzaB1i2DpL6SYKG6zzLcaDLIoSQYde8c3vFe mBXcjsMR11x7gu1MPRAnoX2OGAy0l5MvYbIlK4fACV3vobgm6SwgQ5bKIyoStvX2Z4hr GhmGeYcXy82Cl4z1TXRXstnotnEOswWzwnu5teuvDBEty8W3n+UxR7MYOKAo4T2qWLER Ii+eriEIr90BowCNkYlhs+zdopN/JWiWjXP3X2qsFmm6ulpMIq5gfXzq7dfD2gaH/hws Mx4RmBk+UnSFFmzBP4ngjfe7Tfu/lA/9RntDWnIL87d62yLntrW2cXiWNZhc9cn+Z3eG 1VVA== X-Gm-Message-State: AOUpUlGNXtuaJq+IIbhG0Pvq8/033gQ5kNvppuDMP/q4pUFKbIeHESmd 7nMmGAd+2MH21fzoPiTPjaaqUr5B4bs= X-Google-Smtp-Source: AA+uWPwOQIkKMGHuVopT6SteoevU8Xpu4k3+ADj70UukPSy4+pX2+4/xOnYSpATLoxitkgG6v5TZPw== X-Received: by 2002:a50:f383:: with SMTP id g3-v6mr2089871edm.110.1534766548685; Mon, 20 Aug 2018 05:02:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Aug 2018 05:02:28 -0700 (PDT) From: Emanuele Giuseppe Esposito To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 14:02:02 +0200 Message-Id: <20180820120213.11095-6-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::52a Subject: [Qemu-devel] [PATCH 05/16] test/qgraph: ac97 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/ac97-test in qgraph test node, ac97-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 | 3 +-- tests/ac97-test.c | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index bad4de3d61..3e5964263e 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -217,7 +217,6 @@ check-qtest-pci-y += tests/ne2000-test$(EXESUF) gcov-files-pci-y += hw/net/ne2000.c check-qtest-pci-y += tests/nvme-test$(EXESUF) gcov-files-pci-y += hw/block/nvme.c -check-qtest-pci-y += tests/ac97-test$(EXESUF) gcov-files-pci-y += hw/audio/ac97.c check-qtest-pci-y += tests/es1370-test$(EXESUF) gcov-files-pci-y += hw/audio/es1370.c @@ -792,6 +791,7 @@ libqgraph-tests-obj-y += tests/virtio-rng-test.o 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 check-unit-y += tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) @@ -846,7 +846,6 @@ tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y) tests/nvme-test$(EXESUF): tests/nvme-test.o tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o -tests/ac97-test$(EXESUF): tests/ac97-test.o tests/es1370-test$(EXESUF): tests/es1370-test.o tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o diff --git a/tests/ac97-test.c b/tests/ac97-test.c index e0d177bd9c..1928424250 100644 --- a/tests/ac97-test.c +++ b/tests/ac97-test.c @@ -9,23 +9,44 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "libqos/qgraph.h" + +typedef struct QAC97 QAC97; + +struct QAC97 { + QOSGraphObject obj; +}; /* Tests only initialization so far. TODO: Replace with functional tests */ -static void nop(void) +static void nop(void *obj, void *data, QGuestAllocator *alloc) +{ +} + +static void ac97_destructor(QOSGraphObject *obj) { + QAC97 *ac97 = (QAC97 *)obj; + g_free(ac97); } -int main(int argc, char **argv) +static void *ac97_create(void *pci_bus, QGuestAllocator *alloc, void *addr) { - int ret; + QAC97 *ac97 = g_new0(QAC97, 1); + ac97->obj.destructor = ac97_destructor; - g_test_init(&argc, &argv, NULL); - qtest_add_func("/ac97/nop", nop); + return &ac97->obj; +} - qtest_start("-device AC97"); - ret = g_test_run(); +static void ac97_register_nodes(void) +{ + qos_node_create_driver("AC97", ac97_create); + qos_node_consumes("AC97", "pci-bus", NULL); +} - qtest_end(); +libqos_init(ac97_register_nodes); - return ret; +static void register_ac97_test(void) +{ + qos_add_test("ac97-test", "AC97", nop, NULL); } + +libqos_init(register_ac97_test);