Commit 8d6ef7c9 authored by Laurent Vivier's avatar Laurent Vivier Committed by David Gibson
Browse files

libqos: define SPAPR libqos functions 



Define spapr_alloc_init()/spapr_alloc_init_flags()/spapr_alloc_uninit()

  to allocate and use SPAPR guest memory

Define qtest_spapr_vboot()/qtest_spapr_boot()/qtest_spapr_shutdown()

  to start SPAPR guest with QOSState initialized for it (memory management)

Move qtest_irq_intercept_in() from generic part to PC part.

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 aa15f497

tests/Makefile.include

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ tests/test-crypto-block$(EXESUF): tests/test-crypto-block.o $(test-crypto-obj-y) 


libqos-obj-y = tests/libqos/pci.o tests/libqos/fw_cfg.o tests/libqos/malloc.o

libqos-obj-y += tests/libqos/i2c.o tests/libqos/libqos.o

libqos-spapr-obj-y = $(libqos-obj-y) tests/libqos/malloc-spapr.o

libqos-spapr-obj-y += tests/libqos/libqos-spapr.o

libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o

libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o

libqos-pc-obj-y += tests/libqos/ahci.o

tests/libqos/libqos-pc.c

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ QOSState *qtest_pc_boot(const char *cmdline_fmt, ...) 
    qs = qtest_vboot(&qos_ops, cmdline_fmt, ap);

    va_end(ap);



    qtest_irq_intercept_in(global_qtest, "ioapic");



    return qs;

}

tests/libqos/libqos-spapr.c

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "libqos/libqos-spapr.h"

#include "libqos/malloc-spapr.h"



static QOSOps qos_ops = {

    .init_allocator = spapr_alloc_init_flags,

    .uninit_allocator = spapr_alloc_uninit

};



QOSState *qtest_spapr_vboot(const char *cmdline_fmt, va_list ap)

{

    return qtest_vboot(&qos_ops, cmdline_fmt, ap);

}



QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...)

{

    QOSState *qs;

    va_list ap;



    va_start(ap, cmdline_fmt);

    qs = qtest_vboot(&qos_ops, cmdline_fmt, ap);

    va_end(ap);



    return qs;

}



void qtest_spapr_shutdown(QOSState *qs)

{

    return qtest_shutdown(qs);

}

tests/libqos/libqos-spapr.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef LIBQOS_SPAPR_H

#define LIBQOS_SPAPR_H



#include "libqos/libqos.h"



QOSState *qtest_spapr_vboot(const char *cmdline_fmt, va_list ap);

QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...);

void qtest_spapr_shutdown(QOSState *qs);



#endif

tests/libqos/libqos.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap) 
    cmdline = g_strdup_vprintf(cmdline_fmt, ap);

    qs->qts = qtest_start(cmdline);

    qs->ops = ops;

    qtest_irq_intercept_in(global_qtest, "ioapic");

    if (ops && ops->init_allocator) {

        qs->alloc = ops->init_allocator(ALLOC_NO_FLAGS);

    }