From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxbry-0006jm-C3 for qemu-devel@nongnu.org; Thu, 19 Jun 2014 08:55:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wxbrt-0005zw-6P for qemu-devel@nongnu.org; Thu, 19 Jun 2014 08:55:10 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46204 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxbrs-0005xa-TQ for qemu-devel@nongnu.org; Thu, 19 Jun 2014 08:55:05 -0400 Message-ID: <53A2DDA6.7090800@suse.de> Date: Thu, 19 Jun 2014 14:55:02 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1402992243-10224-1-git-send-email-arei.gonglei@huawei.com> <1402992243-10224-5-git-send-email-arei.gonglei@huawei.com> In-Reply-To: <1402992243-10224-5-git-send-email-arei.gonglei@huawei.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 4/5] usb-hcd-ehci-test: change ehci qtest more expansively List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: arei.gonglei@huawei.com, qemu-devel@nongnu.org Cc: luonengjun@huawei.com, akong@redhat.com, weidong.huang@huawei.com, kraxel@redhat.com, stefanha@redhat.com Am 17.06.2014 10:04, schrieb arei.gonglei@huawei.com: > From: Gonglei >=20 > For simply add a new subtest in usb-hcd-ehci-test.c, > remove qtest_start and qtest_end to an absolute method > from main function. >=20 > Signed-off-by: Gonglei > --- > tests/usb-hcd-ehci-test.c | 38 +++++++++++++++++++++++++------------- > 1 file changed, 25 insertions(+), 13 deletions(-) >=20 > diff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c > index bcdf62f..e1427f5 100644 > --- a/tests/usb-hcd-ehci-test.c > +++ b/tests/usb-hcd-ehci-test.c > @@ -154,32 +154,44 @@ static void pci_ehci_port_2(void) > } > } > =20 > +static void pci_qtest_start(void) > +{ > + qtest_start("-machine q35 -device ich9-usb-ehci1,bus=3Dpcie.0,addr= =3D1d.7," > + "multifunction=3Don,id=3Dich9-ehci-1 " > + "-device ich9-usb-uhci1,bus=3Dpcie.0,addr=3D1d.0," > + "multifunction=3Don,masterbus=3Dich9-ehci-1.0,firs= tport=3D0 " > + "-device ich9-usb-uhci2,bus=3Dpcie.0,addr=3D1d.1," > + "multifunction=3Don,masterbus=3Dich9-ehci-1.0,firs= tport=3D2 " > + "-device ich9-usb-uhci3,bus=3Dpcie.0,addr=3D1d.2," > + "multifunction=3Don,masterbus=3Dich9-ehci-1.0,firs= tport=3D4 " > + "-drive if=3Dnone,id=3Dusbcdrom,media=3Dcdrom " > + "-device usb-tablet,bus=3Dich9-ehci-1.0,port=3D1,u= sb_version=3D1 " > + "-device usb-storage,bus=3Dich9-ehci-1.0,port=3D2,= drive=3Dusbcdrom "); > + > +} > + > +static void pci_qtest_stop(void) > +{ > + qtest_end(); > +} > + > int main(int argc, char **argv) > { > int ret; > =20 > g_test_init(&argc, &argv, NULL); > + > + /* NB: pci_qtest_start() must match with pci_qtest_stop() */ > + qtest_add_func("/ehci/pci/qtest_start", pci_qtest_start); > qtest_add_func("/ehci/pci/init", pci_init); > qtest_add_func("/ehci/pci/uhci-port-1", pci_uhci_port_1); > qtest_add_func("/ehci/pci/ehci-port-1", pci_ehci_port_1); > qtest_add_func("/ehci/pci/ehci-config", pci_ehci_config); > qtest_add_func("/ehci/pci/uhci-port-2", pci_uhci_port_2); > qtest_add_func("/ehci/pci/ehci-port-2", pci_ehci_port_2); > + qtest_add_func("/ehci/pci/qtest_stop", pci_qtest_stop); This is wrong, see https://developer.gnome.org/glib/stable/glib-Testing.html#g-test-run Look for g_test_add() and similar functions that allow to specify proper setup and teardown functions with ordering guarantees. Do note that when using g_test_* functions directly, the QEMU architecture needs to be prepended to the path manually. Regards, Andreas > =20 > - qtest_start("-machine q35 -device ich9-usb-ehci1,bus=3Dpcie.0,addr= =3D1d.7," > - "multifunction=3Don,id=3Dich9-ehci-1 " > - "-device ich9-usb-uhci1,bus=3Dpcie.0,addr=3D1d.0," > - "multifunction=3Don,masterbus=3Dich9-ehci-1.0,firstpor= t=3D0 " > - "-device ich9-usb-uhci2,bus=3Dpcie.0,addr=3D1d.1," > - "multifunction=3Don,masterbus=3Dich9-ehci-1.0,firstpor= t=3D2 " > - "-device ich9-usb-uhci3,bus=3Dpcie.0,addr=3D1d.2," > - "multifunction=3Don,masterbus=3Dich9-ehci-1.0,firstpor= t=3D4 " > - "-drive if=3Dnone,id=3Dusbcdrom,media=3Dcdrom " > - "-device usb-tablet,bus=3Dich9-ehci-1.0,port=3D1,usb_v= ersion=3D1 " > - "-device usb-storage,bus=3Dich9-ehci-1.0,port=3D2,driv= e=3Dusbcdrom "); > ret =3D g_test_run(); > =20 > - qtest_end(); > - > return ret; > } >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg