Re: [Qemu-devel] [PATCH v2 2/2] acpi-test: basic acpi unit-test

[Andreas Färber]

Am 06.11.2013 15:53, schrieb Michael S. Tsirkin:
> We run bios, and boot a minimal boot sector that immediately halts.
> Then poke at memory to find ACPI tables.
> 
> This only checks that RSDP is there.
> More will be added later.
> 
> Cc: Andreas Färber <address@hidden>
> Cc: Markus Armbruster <address@hidden>
> Cc: Paolo Bonzini <address@hidden>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
> ---
> 
> changes from v1:
>     address style comments by Markus, Andreas
>     add cli to disable interrupts as suggested by Paolo
> 
>  tests/acpi-test.c | 135 
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/Makefile    |   2 +
>  2 files changed, 137 insertions(+)
>  create mode 100644 tests/acpi-test.c
> 
> diff --git a/tests/acpi-test.c b/tests/acpi-test.c
> new file mode 100644
> index 0000000..468c4f5
> --- /dev/null
> +++ b/tests/acpi-test.c
> @@ -0,0 +1,135 @@
> +/*
> + * Boot order test cases.
> + *
> + * Copyright (c) 2013 Red Hat Inc.
> + *
> + * Authors:
> + *  Michael S. Tsirkin <address@hidden>,
> + *
> + * 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 <string.h>
> +#include <stdio.h>
> +#include <glib.h>
> +#include "libqtest.h"
> +
> +typedef struct {
> +    const char *args;
> +    uint64_t expected_boot;
> +    uint64_t expected_reboot;
> +} boot_order_test;
> +
> +#define LOW(x) ((x) & 0xff)
> +#define HIGH(x) ((x) >> 8)
> +
> +#define SIGNATURE 0xdead
> +#define SIGNATURE_OFFSET 0x10
> +#define BOOT_SECTOR_ADDRESS 0x7c00
> +
> +/* Boot sector code: write SIGNATURE into memory,
> + * then halt.
> + */
> +static uint8_t boot_sector[0x200] = {
> +    /* 7c00: mov $0xdead,%ax */
> +    [0x00] = 0xb8,
> +    [0x01] = LOW(SIGNATURE),
> +    [0x02] = HIGH(SIGNATURE),
> +    /* 7c03:  mov %ax,0x7c10 */
> +    [0x03] = 0xa3,
> +    [0x04] = LOW(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET),
> +    [0x05] = HIGH(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET),
> +    /* 7c06: cli */
> +    [0x06] = 0xfa,
> +    /* 7c07: hlt */
> +    [0x07] = 0xf4,
> +    /* 7c08: jmp 0x7c07=0x7c0a-3 */
> +    [0x08] = 0xeb,
> +    [0x09] = LOW(-3),
> +    /* We mov 0xdead here: set value to make debugging easier */
> +    [SIGNATURE_OFFSET] = LOW(0xface),
> +    [SIGNATURE_OFFSET + 1] = HIGH(0xface),
> +    /* End of boot sector marker */
> +    [0x1FE] = 0x55,
> +    [0x1FF] = 0xAA,
> +};
> +
> +static const char *disk = "tests/acpi-test-disk.raw";
> +
> +static void test_acpi_one(const char *params)
> +{
> +    char *args;
> +    uint8_t signature_low;
> +    uint8_t signature_high;
> +    uint16_t signature;
> +    int i;
> +    uint32_t off;
> +
> +
> +    args = g_strdup_printf("-net none -display none %s %s",
> +                           params ? params : "", disk);
> +    qtest_start(args);
> +
> +   /* Wait at most 1 minute */
> +#define TEST_DELAY (1 * G_USEC_PER_SEC / 10)
> +#define TEST_CYCLES MAX((60 * G_USEC_PER_SEC / TEST_DELAY), 1)
> +
> +    /* Poll until code has run and modified memory.  Once it has we know BIOS
> +     * initialization is done.  TODO: check that IP reached the halt
> +     * instruction.
> +     */
> +    for (i = 0; i < TEST_CYCLES; ++i) {
> +        signature_low = readb(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET);
> +        signature_high = readb(BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET + 1);
> +        signature = (signature_high << 8) | signature_low;
> +        if (signature == SIGNATURE) {
> +            break;
> +        }
> +        g_usleep(TEST_DELAY);
> +    }
> +    g_assert_cmphex(signature, ==, SIGNATURE);
> +
> +    /* OK, now find RSDP */
> +    for (off = 0xf0000; off < 0x100000; off += 0x10)
> +    {
> +        uint8_t sig[] = "RSD PTR ";
> +        int i;
> +
> +        for (i = 0; i < sizeof sig - 1; ++i) {
> +            sig[i] = readb(off + i);
> +        }
> +
> +        if (!memcmp(sig, "RSD PTR ", sizeof sig)) {
> +            break;
> +        }
> +    }
> +
> +    g_assert_cmphex(off, <, 0x100000);
> +
> +    qtest_quit(global_qtest);
> +    g_free(args);
> +}
> +
> +static void test_acpi_tcg(void)
> +{
> +    /* Supplying -machine accel argument overrides the default (qtest).
> +     * This is to make guest actually run.
> +     */
> +    test_acpi_one("-machine accel=tcg");
> +}
> +
> +int main(int argc, char *argv[])
> +{
> +    const char *arch = qtest_get_arch();
> +    FILE *f = fopen(disk, "w");
> +    fwrite(boot_sector, 1, sizeof boot_sector, f);
> +    fclose(f);
> +
> +    g_test_init(&argc, &argv, NULL);
> +
> +    if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
> +        qtest_add_func("acpi/tcg", test_acpi_tcg);

Minor observation: Stefan's patch had "/qdev/..." whereas this is
"acpi/..." - please compare the in-tree qtests and/or make check V=1.

Other than that looks okay, although I have mixed feelings about
executing TCG code inside qtest - pro gives it some more testing, con
requires it to work on the host platform.

Andreas

> +    }
> +    return g_test_run();
> +}
> diff --git a/tests/Makefile b/tests/Makefile
> index fa4c9f0..62a0a5d 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -64,6 +64,7 @@ check-qtest-i386-y += tests/ide-test$(EXESUF)
>  check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
>  gcov-files-i386-y += hw/hd-geometry.c
>  check-qtest-i386-y += tests/boot-order-test$(EXESUF)
> +check-qtest-i386-y += tests/acpi-test$(EXESUF)
>  check-qtest-i386-y += tests/rtc-test$(EXESUF)
>  check-qtest-i386-y += tests/i440fx-test$(EXESUF)
>  check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
> @@ -171,6 +172,7 @@ tests/fdc-test$(EXESUF): tests/fdc-test.o
>  tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
>  tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
>  tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
> +tests/acpi-test$(EXESUF): tests/acpi-test.o $(libqos-obj-y)
>  tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
>  tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
>  tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg