[Qemu-devel] [PATCH v2 1/2] qtest: split configuration of qtest accelerator and chardev

[Qemu-devel] [PATCH v2 1/2] qtest: split configuration of qtest accelerator and chardev

[Michael S. Tsirkin]

From: Paolo Bonzini <pbonzini@redhat.com>

qtest uses the icount infrastructure to implement a test-driven vm_clock.  This
however is not necessary when using -qtest as a "probe" together with a normal
TCG-, KVM- or Xen-based virtual machine.  Hence, split out the call to
configure_icount into a new function that is called only for "-machine
accel=qtest"; and disable those commands when running with an accelerator
other than qtest.

This also fixes an assertion failure with "qemu-system-x86_64 -machine
accel=qtest" but no -qtest option.  This is a valid case, albeit somewhat
weird; nothing will happen in the VM but you'll still be able to
interact with the monitor or the GUI.

Now that qtest_init is not limited to an int(void) function, change
global variables that are not used outside qtest_init to arguments.

And finally, cleanup useless parts of include/sysemu/qtest.h.  The file
is not used at all for user-only emulation, and qtest is not available
on Win32 due to its usage of sigwait.

Reported-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/sysemu/qtest.h | 25 +++++--------------------
 qtest.c                | 20 ++++++++++----------
 vl.c                   |  8 +++++---
 3 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h
index 9a0c6b3..112a661 100644
--- a/include/sysemu/qtest.h
+++ b/include/sysemu/qtest.h
@@ -16,38 +16,23 @@
 
 #include "qemu-common.h"
 
-#if !defined(CONFIG_USER_ONLY)
 extern bool qtest_allowed;
-extern const char *qtest_chrdev;
-extern const char *qtest_log;
 
 static inline bool qtest_enabled(void)
 {
     return qtest_allowed;
 }
 
+int qtest_init_accel(void);
+void qtest_init(const char *qtest_chrdev, const char *qtest_log);
+
 static inline int qtest_available(void)
 {
+#ifdef CONFIG_POSIX
     return 1;
-}
-
-int qtest_init(void);
 #else
-static inline bool qtest_enabled(void)
-{
-    return false;
-}
-
-static inline int qtest_available(void)
-{
-    return 0;
-}
-
-static inline int qtest_init(void)
-{
     return 0;
-}
-
 #endif
+}
 
 #endif
diff --git a/qtest.c b/qtest.c
index 584c707..dcf1301 100644
--- a/qtest.c
+++ b/qtest.c
@@ -22,8 +22,6 @@
 
 #define MAX_IRQ 256
 
-const char *qtest_chrdev;
-const char *qtest_log;
 bool qtest_allowed;
 
 static DeviceState *irq_intercept_dev;
@@ -406,7 +404,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
 
         qtest_send_prefix(chr);
         qtest_send(chr, "OK\n");
-    } else if (strcmp(words[0], "clock_step") == 0) {
+    } else if (qtest_enabled() && strcmp(words[0], "clock_step") == 0) {
         int64_t ns;
 
         if (words[1]) {
@@ -417,7 +415,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words)
         qtest_clock_warp(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + ns);
         qtest_send_prefix(chr);
         qtest_send(chr, "OK %"PRIi64"\n", (int64_t)qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL));
-    } else if (strcmp(words[0], "clock_set") == 0) {
+    } else if (qtest_enabled() && strcmp(words[0], "clock_set") == 0) {
         int64_t ns;
 
         g_assert(words[1]);
@@ -502,13 +500,17 @@ static void qtest_event(void *opaque, int event)
     }
 }
 
-int qtest_init(void)
+int qtest_init_accel(void)
 {
-    CharDriverState *chr;
+    configure_icount("0");
 
-    g_assert(qtest_chrdev != NULL);
+    return 0;
+}
+
+void qtest_init(const char *qtest_chrdev, const char *qtest_log)
+{
+    CharDriverState *chr;
 
-    configure_icount("0");
     chr = qemu_chr_new("qtest", qtest_chrdev, NULL);
 
     qemu_chr_add_handlers(chr, qtest_can_read, qtest_read, qtest_event, chr);
@@ -525,6 +527,4 @@ int qtest_init(void)
     }
 
     qtest_chr = chr;
-
-    return 0;
 }
diff --git a/vl.c b/vl.c
index bf03524..f28674f 100644
--- a/vl.c
+++ b/vl.c
@@ -2622,7 +2622,7 @@ static struct {
     { "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed },
     { "xen", "Xen", xen_available, xen_init, &xen_allowed },
     { "kvm", "KVM", kvm_available, kvm_init, &kvm_allowed },
-    { "qtest", "QTest", qtest_available, qtest_init, &qtest_allowed },
+    { "qtest", "QTest", qtest_available, qtest_init_accel, &qtest_allowed },
 };
 
 static int configure_accelerator(void)
@@ -2834,6 +2834,8 @@ int main(int argc, char **argv, char **envp)
     QEMUMachine *machine;
     const char *cpu_model;
     const char *vga_model = "none";
+    const char *qtest_chrdev = NULL;
+    const char *qtest_log = NULL;
     const char *pid_file = NULL;
     const char *incoming = NULL;
 #ifdef CONFIG_VNC
@@ -4039,8 +4041,8 @@ int main(int argc, char **argv, char **envp)
 
     configure_accelerator();
 
-    if (!qtest_enabled() && qtest_chrdev) {
-        qtest_init();
+    if (qtest_chrdev) {
+        qtest_init(qtest_chrdev, qtest_log);
     }
 
     machine_opts = qemu_get_machine_opts();
-- 
MST

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

[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 <afaerber@suse.de>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

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 <mst@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.
+ */
+
+#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);
+    }
+    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)
-- 
MST

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 <afaerber@suse.de>
> Cc: Markus Armbruster <armbru@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> 
> 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 <mst@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.
> + */
> +
> +#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

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

[Michael S. Tsirkin]

On Wed, Nov 06, 2013 at 06:00:03PM +0100, Andreas Färber wrote:
> 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 <afaerber@suse.de>
> > Cc: Markus Armbruster <armbru@redhat.com>
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> > 
> > 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 <mst@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.
> > + */
> > +
> > +#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.

Is there a lot of value in qemu that can't run guest code?

> 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