From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpU0m-0005h1-EL for qemu-devel@nongnu.org; Thu, 29 Sep 2016 01:36:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpU0k-0007sJ-2u for qemu-devel@nongnu.org; Thu, 29 Sep 2016 01:35:59 -0400 Date: Thu, 29 Sep 2016 15:31:13 +1000 From: David Gibson Message-ID: <20160929053113.GS8390@umbus.fritz.box> References: <1475088693-29091-1-git-send-email-lvivier@redhat.com> <1475088693-29091-4-git-send-email-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="MT9SxUWSsctiw0kG" Content-Disposition: inline In-Reply-To: <1475088693-29091-4-git-send-email-lvivier@redhat.com> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH v3 3/6] libqos: use generic qtest_shutdown() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laurent Vivier Cc: qemu-devel@nongnu.org, thuth@redhat.com, Greg Kurz , qemu-ppc@nongnu.org, Gerd Hoffmann , dgibson@redhat.com --MT9SxUWSsctiw0kG Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 28, 2016 at 08:51:30PM +0200, Laurent Vivier wrote: > Machine specific shutdown function can be registered by > the machine specific qtest_XXX_boot() if needed. >=20 > So we will not have to test twice the architecture (on boot and on > shutdown) if the test can be run on several architectures. >=20 > Signed-off-by: Laurent Vivier > Reviewed-by: Greg Kurz Reviewed-by: David Gibson > --- > tests/libqos/libqos-pc.c | 3 ++- > tests/libqos/libqos-spapr.c | 3 ++- > tests/libqos/libqos.c | 11 ++++++++++- > tests/libqos/libqos.h | 8 ++++++-- > tests/rtas-test.c | 2 +- > 5 files changed, 21 insertions(+), 6 deletions(-) >=20 > diff --git a/tests/libqos/libqos-pc.c b/tests/libqos/libqos-pc.c > index aa17c98..b554758 100644 > --- a/tests/libqos/libqos-pc.c > +++ b/tests/libqos/libqos-pc.c > @@ -8,6 +8,7 @@ static QOSOps qos_ops =3D { > .uninit_allocator =3D pc_alloc_uninit, > .qpci_init =3D qpci_init_pc, > .qpci_free =3D qpci_free_pc, > + .shutdown =3D qtest_pc_shutdown, > }; > =20 > QOSState *qtest_pc_vboot(const char *cmdline_fmt, va_list ap) > @@ -31,5 +32,5 @@ QOSState *qtest_pc_boot(const char *cmdline_fmt, ...) > =20 > void qtest_pc_shutdown(QOSState *qs) > { > - return qtest_shutdown(qs); > + return qtest_common_shutdown(qs); > } > diff --git a/tests/libqos/libqos-spapr.c b/tests/libqos/libqos-spapr.c > index 333e6fb..a37791e 100644 > --- a/tests/libqos/libqos-spapr.c > +++ b/tests/libqos/libqos-spapr.c > @@ -8,6 +8,7 @@ static QOSOps qos_ops =3D { > .uninit_allocator =3D spapr_alloc_uninit, > .qpci_init =3D qpci_init_spapr, > .qpci_free =3D qpci_free_spapr, > + .shutdown =3D qtest_spapr_shutdown, > }; > =20 > QOSState *qtest_spapr_vboot(const char *cmdline_fmt, va_list ap) > @@ -29,5 +30,5 @@ QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...) > =20 > void qtest_spapr_shutdown(QOSState *qs) > { > - return qtest_shutdown(qs); > + return qtest_common_shutdown(qs); > } > diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c > index d842bf5..7abb482 100644 > --- a/tests/libqos/libqos.c > +++ b/tests/libqos/libqos.c > @@ -52,7 +52,7 @@ QOSState *qtest_boot(QOSOps *ops, const char *cmdline_f= mt, ...) > /** > * Tear down the QEMU instance. > */ > -void qtest_shutdown(QOSState *qs) > +void qtest_common_shutdown(QOSState *qs) > { > if (qs->ops) { > if (qs->pcibus && qs->ops->qpci_free) { > @@ -68,6 +68,15 @@ void qtest_shutdown(QOSState *qs) > g_free(qs); > } > =20 > +void qtest_shutdown(QOSState *qs) > +{ > + if (qs->ops && qs->ops->shutdown) { > + qs->ops->shutdown(qs); > + } else { > + qtest_common_shutdown(qs); > + } > +} > + > void set_context(QOSState *s) > { > global_qtest =3D s->qts; > diff --git a/tests/libqos/libqos.h b/tests/libqos/libqos.h > index a9f6990..2319697 100644 > --- a/tests/libqos/libqos.h > +++ b/tests/libqos/libqos.h > @@ -5,22 +5,26 @@ > #include "libqos/pci.h" > #include "libqos/malloc-pc.h" > =20 > +typedef struct QOSState QOSState; > + > typedef struct QOSOps { > QGuestAllocator *(*init_allocator)(QAllocOpts); > void (*uninit_allocator)(QGuestAllocator *); > QPCIBus *(*qpci_init)(QGuestAllocator *alloc); > void (*qpci_free)(QPCIBus *bus); > + void (*shutdown)(QOSState *); > } QOSOps; > =20 > -typedef struct QOSState { > +struct QOSState { > QTestState *qts; > QGuestAllocator *alloc; > QPCIBus *pcibus; > QOSOps *ops; > -} QOSState; > +}; > =20 > QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap); > QOSState *qtest_boot(QOSOps *ops, const char *cmdline_fmt, ...); > +void qtest_common_shutdown(QOSState *qs); > void qtest_shutdown(QOSState *qs); > bool have_qemu_img(void); > void mkimg(const char *file, const char *fmt, unsigned size_mb); > diff --git a/tests/rtas-test.c b/tests/rtas-test.c > index 73c7803..ba0867a 100644 > --- a/tests/rtas-test.c > +++ b/tests/rtas-test.c > @@ -22,7 +22,7 @@ static void test_rtas_get_time_of_day(void) > t2 =3D mktimegm(&tm); > g_assert(t2 - t1 < 5); /* 5 sec max to run the test */ > =20 > - qtest_spapr_shutdown(qs); > + qtest_shutdown(qs); > } > =20 > int main(int argc, char *argv[]) --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --MT9SxUWSsctiw0kG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX7KchAAoJEGw4ysog2bOSiSwP/2GAvkLq+c3aHk+9EfiobTSQ iaD8mrcoUo6FQgt4Otg3Vo09B+8UuMSMH4/sK8665PpFNgHL1KMz/0EGoz/4l3qB GgxTNRFiuwohoYpoIYDegw2JpCBjoVc+acEcPXo2WLUEcvfYyvkVaqzbe8zsfETS gRBoRJZEVPsCkXvfZgTNzCJxG0hH2WtUQjYO9ZApxyS7WXf41izcHQDVH3g7eNDG DOOEVilPCw+fBdjuHyqhx50XqN4nK14m40TBl6UJ9xBt72IM0+Yu7tuyEYOVMBaP do5aKy3R0GoVBvDlxTS1a1dYodsEYxbeM/OPxpuVtbTuKyjiizM5uhpp62OoLp81 1vm9WtHh/qwmp7nZY19yMwHpDzymu1mVNrVejkw9c2Q5YHQKD1FJOeaLB+ueRAZm tlvOOh9vZjFZn8uyykaYx3sLP2ca1htRWz+F9efhGmMMKUjfpC67U4Kj87hgZPNf m5vRLP25Cjla/3xzKIJ/fP4xbO/WsKO7zYPZEfdRnmw3iE+T0PgB9kcMDsZALDAm CH6fJaCj/X6m/6w7Xyv2vBaOP/fr99CvMe3Ao8v1ZAopmkdOOWEAcAdOrJ5JakGS TE83siSwfMxnsab3999E9dQrOCrao2FQyKxNj5T/3NdZbIXfvqb1DqgPaRN2UDy8 MJ4j+ACqCgdlrIZrggAf =gaPX -----END PGP SIGNATURE----- --MT9SxUWSsctiw0kG--