[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH v5 2/3] libqos: define SPAPR libqos functions
From: |
Greg Kurz |
Subject: |
Re: [Qemu-ppc] [PATCH v5 2/3] libqos: define SPAPR libqos functions |
Date: |
Thu, 8 Sep 2016 19:47:22 +0200 |
On Thu, 8 Sep 2016 10:30:33 +0200
Laurent Vivier <address@hidden> wrote:
> 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: Laurent Vivier <address@hidden>
> ---
Nice work ! Just a minor remark, see below.
> v5:
> - replace "ppc64" by "spapr"
> - Add test_spapr_vboot()/qtest_spapr_boot()/qtest_spapr_shutdown()
> and remove machine_alloc_XXX() fuctions
>
> tests/Makefile.include | 2 ++
> tests/libqos/libqos-pc.c | 2 ++
> tests/libqos/libqos-spapr.c | 30 ++++++++++++++++++++++++++++++
> tests/libqos/libqos-spapr.h | 10 ++++++++++
> tests/libqos/libqos.c | 1 -
> tests/libqos/libqos.h | 1 +
> tests/libqos/malloc-spapr.c | 38 ++++++++++++++++++++++++++++++++++++++
> tests/libqos/malloc-spapr.h | 17 +++++++++++++++++
> 8 files changed, 100 insertions(+), 1 deletion(-)
> create mode 100644 tests/libqos/libqos-spapr.c
> create mode 100644 tests/libqos/libqos-spapr.h
> create mode 100644 tests/libqos/malloc-spapr.c
> create mode 100644 tests/libqos/malloc-spapr.h
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 14be491..da17b9b 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -557,6 +557,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
> diff --git a/tests/libqos/libqos-pc.c b/tests/libqos/libqos-pc.c
> index 72b5e3b..df34092 100644
> --- a/tests/libqos/libqos-pc.c
> +++ b/tests/libqos/libqos-pc.c
> @@ -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;
> }
>
> diff --git a/tests/libqos/libqos-spapr.c b/tests/libqos/libqos-spapr.c
> new file mode 100644
> index 0000000..f19408b
> --- /dev/null
> +++ b/tests/libqos/libqos-spapr.c
> @@ -0,0 +1,30 @@
> +#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);
> +}
> diff --git a/tests/libqos/libqos-spapr.h b/tests/libqos/libqos-spapr.h
> new file mode 100644
> index 0000000..dcb5c43
> --- /dev/null
> +++ b/tests/libqos/libqos-spapr.h
> @@ -0,0 +1,10 @@
> +#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
> diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c
> index c7ba441..a852dc5 100644
> --- a/tests/libqos/libqos.c
> +++ b/tests/libqos/libqos.c
> @@ -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);
> }
> diff --git a/tests/libqos/libqos.h b/tests/libqos/libqos.h
> index 604980d..5022ce3 100644
> --- a/tests/libqos/libqos.h
> +++ b/tests/libqos/libqos.h
> @@ -4,6 +4,7 @@
> #include "libqtest.h"
> #include "libqos/pci.h"
> #include "libqos/malloc-pc.h"
> +#include "libqos/malloc-spapr.h"
>
Not sure this is actually needed, but it doesn't hurt and can be addressed in
a followup include cleaning patch.
Reviewed-by: Greg Kurz <address@hidden>
> typedef struct QOSOps {
> QGuestAllocator *(*init_allocator)(QAllocOpts);
> diff --git a/tests/libqos/malloc-spapr.c b/tests/libqos/malloc-spapr.c
> new file mode 100644
> index 0000000..006404a
> --- /dev/null
> +++ b/tests/libqos/malloc-spapr.c
> @@ -0,0 +1,38 @@
> +/*
> + * libqos malloc support for SPAPR
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "libqos/malloc-spapr.h"
> +
> +#include "qemu-common.h"
> +
> +#define PAGE_SIZE 4096
> +
> +/* Memory must be a multiple of 256 MB,
> + * so we have at least 256MB
> + */
> +#define SPAPR_MIN_SIZE 0x10000000
> +
> +void spapr_alloc_uninit(QGuestAllocator *allocator)
> +{
> + alloc_uninit(allocator);
> +}
> +
> +QGuestAllocator *spapr_alloc_init_flags(QAllocOpts flags)
> +{
> + QGuestAllocator *s;
> +
> + s = alloc_init_flags(flags, 1 << 20, SPAPR_MIN_SIZE);
> + alloc_set_page_size(s, PAGE_SIZE);
> +
> + return s;
> +}
> +
> +QGuestAllocator *spapr_alloc_init(void)
> +{
> + return spapr_alloc_init_flags(ALLOC_NO_FLAGS);
> +}
> diff --git a/tests/libqos/malloc-spapr.h b/tests/libqos/malloc-spapr.h
> new file mode 100644
> index 0000000..64d0e77
> --- /dev/null
> +++ b/tests/libqos/malloc-spapr.h
> @@ -0,0 +1,17 @@
> +/*
> + * libqos malloc support for SPAPR
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#ifndef LIBQOS_MALLOC_SPAPR_H
> +#define LIBQOS_MALLOC_SPAPR_H
> +
> +#include "libqos/malloc.h"
> +
> +QGuestAllocator *spapr_alloc_init(void);
> +QGuestAllocator *spapr_alloc_init_flags(QAllocOpts flags);
> +void spapr_alloc_uninit(QGuestAllocator *allocator);
> +
> +#endif