16 files changed, 36 insertions, 0 deletions
diff --git a/qemu/tests/acpi-test-data/pc/APIC b/qemu/tests/acpi-test-data/pc/APIC
new file mode 100644
index 000000000..84509e0ae
--- /dev/null
+++ b/qemu/tests/acpi-test-data/pc/APIC
diff --git a/qemu/tests/acpi-test-data/pc/DSDT b/qemu/tests/acpi-test-data/pc/DSDT
new file mode 100644
index 000000000..c658203db
--- /dev/null
+++ b/qemu/tests/acpi-test-data/pc/DSDT
diff --git a/qemu/tests/acpi-test-data/pc/FACP b/qemu/tests/acpi-test-data/pc/FACP
new file mode 100644
index 000000000..0639999ed
--- /dev/null
+++ b/qemu/tests/acpi-test-data/pc/FACP
diff --git a/qemu/tests/acpi-test-data/pc/FACS b/qemu/tests/acpi-test-data/pc/FACS
new file mode 100644
index 000000000..fc67ecc40
--- /dev/null
+++ b/qemu/tests/acpi-test-data/pc/FACS
diff --git a/qemu/tests/acpi-test-data/pc/HPET b/qemu/tests/acpi-test-data/pc/HPET
new file mode 100644
index 000000000..df689b8f9
--- /dev/null
+++ b/qemu/tests/acpi-test-data/pc/HPET
diff --git a/qemu/tests/acpi-test-data/pc/SSDT b/qemu/tests/acpi-test-data/pc/SSDT
new file mode 100644
index 000000000..210d6a71e
--- /dev/null
+++ b/qemu/tests/acpi-test-data/pc/SSDT
diff --git a/qemu/tests/acpi-test-data/pc/SSDT.bridge b/qemu/tests/acpi-test-data/pc/SSDT.bridge
new file mode 100644
index 000000000..6e6660b1f
--- /dev/null
+++ b/qemu/tests/acpi-test-data/pc/SSDT.bridge
diff --git a/qemu/tests/acpi-test-data/q35/APIC b/qemu/tests/acpi-test-data/q35/APIC
new file mode 100644
index 000000000..84509e0ae
--- /dev/null
+++ b/qemu/tests/acpi-test-data/q35/APIC
diff --git a/qemu/tests/acpi-test-data/q35/DSDT b/qemu/tests/acpi-test-data/q35/DSDT
new file mode 100644
index 000000000..4723e5954
--- /dev/null
+++ b/qemu/tests/acpi-test-data/q35/DSDT
diff --git a/qemu/tests/acpi-test-data/q35/FACP b/qemu/tests/acpi-test-data/q35/FACP
new file mode 100644
index 000000000..19f3ac3ce
--- /dev/null
+++ b/qemu/tests/acpi-test-data/q35/FACP
diff --git a/qemu/tests/acpi-test-data/q35/FACS b/qemu/tests/acpi-test-data/q35/FACS
new file mode 100644
index 000000000..fc67ecc40
--- /dev/null
+++ b/qemu/tests/acpi-test-data/q35/FACS
diff --git a/qemu/tests/acpi-test-data/q35/HPET b/qemu/tests/acpi-test-data/q35/HPET
new file mode 100644
index 000000000..df689b8f9
--- /dev/null
+++ b/qemu/tests/acpi-test-data/q35/HPET
diff --git a/qemu/tests/acpi-test-data/q35/MCFG b/qemu/tests/acpi-test-data/q35/MCFG
new file mode 100644
index 000000000..79ceb27a0
--- /dev/null
+++ b/qemu/tests/acpi-test-data/q35/MCFG
diff --git a/qemu/tests/acpi-test-data/q35/SSDT b/qemu/tests/acpi-test-data/q35/SSDT
new file mode 100644
index 000000000..0970c67dd
--- /dev/null
+++ b/qemu/tests/acpi-test-data/q35/SSDT
diff --git a/qemu/tests/acpi-test-data/q35/SSDT.bridge b/qemu/tests/acpi-test-data/q35/SSDT.bridge
new file mode 100644
index 000000000..a77868861
--- /dev/null
+++ b/qemu/tests/acpi-test-data/q35/SSDT.bridge
diff --git a/qemu/tests/acpi-test-data/rebuild-expected-aml.sh b/qemu/tests/acpi-test-data/rebuild-expected-aml.sh
new file mode 100755
index 000000000..11bf74391
--- /dev/null
+++ b/qemu/tests/acpi-test-data/rebuild-expected-aml.sh
@@ -0,0 +1,36 @@
+#! /bin/bash
+
+#
+# Rebuild expected AML files for acpi unit-test
+#
+# Copyright (c) 2013 Red Hat Inc.
+#
+# Authors:
+#  Marcel Apfelbaum <marcel.a@redhat.com>
+#
+# This work is licensed under the terms of the GNU GPLv2.
+# See the COPYING.LIB file in the top-level directory.
+
+qemu=
+
+if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
+    qemu="x86_64-softmmu/qemu-system-x86_64"
+elif [ -e i386-softmmu/qemu-system-i386 ]; then
+    qemu="i386-softmmu/qemu-system-i386"
+else
+    echo "Run 'make' to build the qemu exectutable!"
+    echo "Run this script from the build directory."
+    exit 1;
+fi
+
+if [ ! -e "tests/bios-tables-test" ]; then
+    echo "Test: bios-tables-test is required! Run make check before this script."
+    echo "Run this script from the build directory."
+    exit 1;
+fi
+
+TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
+
+echo "The files were rebuilt and can be added to git."
+echo "However, if new files were created, please copy them manually" \
+     "to tests/acpi-test-data/pc/ or tests/acpi-test-data/q35/ ."