"Michael S. Tsirkin" <m...@redhat.com> writes: > 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. > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > --- > tests/acpi-test.c | 129 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/Makefile | 2 + > 2 files changed, 131 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..42de248 > --- /dev/null > +++ b/tests/acpi-test.c > @@ -0,0 +1,129 @@ > +/* > + * Boot order test cases. > + * > + * Copyright (c) 2013 Red Hat Inc. > + * > + * Authors: > + * Markus Armbruster <arm...@redhat.com>, > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */
Please update the file comment :) > + > +#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 > + > +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: hlt */ > + [0x06] = 0xf4, > + /* 7c07: jmp 0x7c06=0x7c09-3 */ > + [0x07] = 0xeb, > + [0x08] = 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); Never called with null params. > + qtest_start(args); > + > + /* Wait at most 1 minute */ > +#define TEST_DELAY (1 * G_USEC_PER_SEC / 10) > +#define TEST_CYCLES (60 * G_USEC_PER_SEC / TEST_DELAY) > + > + 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) > +{ > + test_acpi_one("-machine accel=tcg"); > +} Since qtest_init() adds your parameters at the end, this should result in a command line ending with "-machine accel=qtest -machine accel=tcg", which should result in qtest. How does this work? > + > +static void test_acpi_kvm(void) > +{ > + test_acpi_one("-enable-kvm -machine accel=kvm"); > +} Isn't -enable-kvm redundant? > + > +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); > + qtest_add_func("acpi/kvm", test_acpi_kvm); > + } > + return g_test_run(); > +} > diff --git a/tests/Makefile b/tests/Makefile > index c13fefc..a81a005 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)