From nobody Fri Dec 19 04:29:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534767477472608.2056365015513; Mon, 20 Aug 2018 05:17:57 -0700 (PDT) Received: from localhost ([::1]:46769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frj88-0002Ky-Ci for importer@patchew.org; Mon, 20 Aug 2018 08:17:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fritQ-0005xD-LR for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:02:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fritN-0002ZZ-AI for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:02:43 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:46233) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fritN-0002Yr-4G; Mon, 20 Aug 2018 08:02:41 -0400 Received: by mail-ed1-x52c.google.com with SMTP id o8-v6so8317308edt.13; Mon, 20 Aug 2018 05:02:41 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Aug 2018 05:02:39 -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=EfWDcYSRWmLGwqGJ3pt9KYbZ5CWBpSNdAjKr5CATVpw=; b=UBVeDSAnFE1TySX+g2+gZ3Zr4w6K9hYapcuDzcc3/wOcw1euhFs1mjDyf7XYVtQPfJ Pw7Eb0KHtaJgq0ijxitSGh4IEiU74M6jy6n0BDka/PQZrdCC/HWdJ5zZgUI+qV4XXQYq ckf4w4gICmt90AH9EMkhC80pubV/lsXSAvQEpYdFEtsDcHBFBGmDrKlQBB7uAdSLAUVz ZyZo88pqoUgCSQM2PcIXuLefqtOJS3E8+vz1wyjBo58089cutda91W5yGlfmrL+p8680 zKNW3Woz6rzvbrRiVkeb0cF5hKFXerygH/1R4O42Dczh1OYSx1sI4G/2nXvuN6mF2htA pDwA== 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=EfWDcYSRWmLGwqGJ3pt9KYbZ5CWBpSNdAjKr5CATVpw=; b=VnYAudkJKv8eyVZPmwVgN87doMgrqEoXO7jv14vobCvieF3Y+9mFbBsMLoV5GPr103 2x7setwdofqP3OGsXc1YGpu3wcS1X2gL5pNWFT1oJpikYNXMzB63INpcu9fE9nWGRKr9 ILtmgvOREJ+p7+aQPxvilmshMKNg4u9nZG8Wk5xlmGLiypl53VlrEFbOOEFaQl3vWxeM Ub+vUOQWPPShYG3h0jaEIhUgQiyArPDS80vZUca5fmBveV33qoQS+AkHFFkBKpJ9wKMD dSkCI3OnbgzYwrpRa4U3neVG5twj8Xi32pb3yHRdOX4FjRmb2oTXcT0dK1otHGDJfT3T qnfA== X-Gm-Message-State: AOUpUlFrSAa1h268dzHOk5yqNr3dYP/ckVm4UUQvc2a6FGSRgdpa/QOb BnALgro5IZMp6XcQ/2ZIUKsFhzF2UyY= X-Google-Smtp-Source: AA+uWPzlw2jIfUihVybR0OCXkL34iFRUi1OGXUenN1vQllbKvJLVZ4FucrP09Y9nYBuMaE6LC+UQcQ== X-Received: by 2002:aa7:c74b:: with SMTP id c11-v6mr3505336eds.113.1534766559648; Mon, 20 Aug 2018 05:02:39 -0700 (PDT) From: Emanuele Giuseppe Esposito To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 14:02:08 +0200 Message-Id: <20180820120213.11095-12-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::52c Subject: [Qemu-devel] [PATCH 11/16] test/qgraph: spapr-phb 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?Philippe=20Mathieu-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Convert tests/spapr-phb-test in qgraph test node, spapr-phb-test. This test adds another spapr-pci-host-bridge device in the ppc64/pseries machine Signed-off-by: Emanuele Giuseppe Esposito --- tests/Makefile.include | 3 +-- tests/spapr-phb-test.c | 28 +++++++++++----------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 1a2b645209..5b006b85d1 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -326,7 +326,6 @@ gcov-files-ppc-y +=3D hw/timer/m48t59.c =20 check-qtest-ppc64-y =3D $(check-qtest-ppc-y) gcov-files-ppc64-y =3D $(subst ppc-softmmu/,ppc64-softmmu/,$(gcov-files-pp= c-y)) -check-qtest-ppc64-y +=3D tests/spapr-phb-test$(EXESUF) gcov-files-ppc64-y +=3D ppc64-softmmu/hw/ppc/spapr_pci.c check-qtest-ppc64-y +=3D tests/pnv-xscom-test$(EXESUF) check-qtest-ppc64-y +=3D tests/migration-test$(EXESUF) @@ -793,6 +792,7 @@ libqgraph-tests-obj-y +=3D tests/ipoctal232-test.o libqgraph-tests-obj-y +=3D tests/ne2000-test.o libqgraph-tests-obj-y +=3D tests/nvme-test.o libqgraph-tests-obj-y +=3D tests/pcnet-test.o +libqgraph-tests-obj-y +=3D tests/spapr-phb-test.o =20 check-unit-y +=3D tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) @@ -805,7 +805,6 @@ tests/device-introspect-test$(EXESUF): tests/device-int= rospect-test.o tests/rtc-test$(EXESUF): tests/rtc-test.o tests/m48t59-test$(EXESUF): tests/m48t59-test.o tests/endianness-test$(EXESUF): tests/endianness-test.o -tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y) tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y) tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y) tests/fdc-test$(EXESUF): tests/fdc-test.o diff --git a/tests/spapr-phb-test.c b/tests/spapr-phb-test.c index d3522ea093..5b754b777c 100644 --- a/tests/spapr-phb-test.c +++ b/tests/spapr-phb-test.c @@ -7,29 +7,23 @@ * This work is licensed under the terms of the GNU GPL, version 2 or late= r. * See the COPYING file in the top-level directory. */ -#include "qemu/osdep.h" =20 +#include "qemu/osdep.h" #include "libqtest.h" - -#define TYPE_SPAPR_PCI_HOST_BRIDGE "spapr-pci-host-bridge" +#include "libqos/qgraph.h" =20 /* Tests only initialization so far. TODO: Replace with functional tests */ -static void test_phb_device(void) +static void test_phb_device(void *obj, void *data, QGuestAllocator *alloc) { } =20 -int main(int argc, char **argv) +static void register_phb_test(void) { - int ret; - - g_test_init(&argc, &argv, NULL); - qtest_add_func("/spapr-phb/device", test_phb_device); - - qtest_start("-device " TYPE_SPAPR_PCI_HOST_BRIDGE ",index=3D30"); - - ret =3D g_test_run(); - - qtest_end(); - - return ret; + qos_add_test("spapr-phb-test", "ppc64/pseries", + test_phb_device, &(QOSGraphTestOptions) { + .edge.before_cmd_line =3D "-device spapr-pci-host-bri= dge" + ",index=3D30", + }); } + +libqos_init(register_phb_test); --=20 2.17.1