Commit 61ae5cf3 authored by Laurent Vivier's avatar Laurent Vivier Committed by David Gibson
Browse files

libqos: use generic qtest_shutdown() 



Machine specific shutdown function can be registered by
the machine specific qtest_XXX_boot() if needed.

So we will not have to test twice the architecture (on boot and on
shutdown) if the test can be run on several architectures.

Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 2ecd7e2f

tests/libqos/libqos-pc.c

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ static QOSOps qos_ops = { 
    .uninit_allocator = pc_alloc_uninit,

    .qpci_init = qpci_init_pc,

    .qpci_free = qpci_free_pc,

    .shutdown = qtest_pc_shutdown,

};



QOSState *qtest_pc_vboot(const char *cmdline_fmt, va_list ap)
@@ -31,5 +32,5 @@ QOSState *qtest_pc_boot(const char *cmdline_fmt, ...) 


void qtest_pc_shutdown(QOSState *qs)

{

    return qtest_shutdown(qs);

    return qtest_common_shutdown(qs);

}

tests/libqos/libqos-spapr.c

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ static QOSOps qos_ops = { 
    .uninit_allocator = spapr_alloc_uninit,

    .qpci_init = qpci_init_spapr,

    .qpci_free = qpci_free_spapr,

    .shutdown = qtest_spapr_shutdown,

};



QOSState *qtest_spapr_vboot(const char *cmdline_fmt, va_list ap)
@@ -29,5 +30,5 @@ QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...) 


void qtest_spapr_shutdown(QOSState *qs)

{

    return qtest_shutdown(qs);

    return qtest_common_shutdown(qs);

}

tests/libqos/libqos.c

+10 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ QOSState *qtest_boot(QOSOps *ops, const char *cmdline_fmt, ...) 
/**

 * 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);

}



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 = s->qts;

tests/libqos/libqos.h

+6 −2
Original line number Diff line number Diff line
@@ -5,22 +5,26 @@ 
#include "libqos/pci.h"

#include "libqos/malloc-pc.h"



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;



typedef struct QOSState {

struct QOSState {

    QTestState *qts;

    QGuestAllocator *alloc;

    QPCIBus *pcibus;

    QOSOps *ops;

} QOSState;

};



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);

tests/rtas-test.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static void test_rtas_get_time_of_day(void) 
    t2 = mktimegm(&tm);

    g_assert(t2 - t1 < 5); /* 5 sec max to run the test */



    qtest_spapr_shutdown(qs);

    qtest_shutdown(qs);

}



int main(int argc, char *argv[])