summaryrefslogtreecommitdiffstats
path: root/qemu/tests/acpi-test-data
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:18:31 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:42:15 +0300
commit437fd90c0250dee670290f9b714253671a990160 (patch)
treeb871786c360704244a07411c69fb58da9ead4a06 /qemu/tests/acpi-test-data
parent5bbd6fe9b8bab2a93e548c5a53b032d1939eec05 (diff)
These changes are the raw update to qemu-2.6.
Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'qemu/tests/acpi-test-data')
-rw-r--r--qemu/tests/acpi-test-data/pc/DSDTbin3028 -> 5587 bytes
-rw-r--r--qemu/tests/acpi-test-data/pc/DSDT.bridge (renamed from qemu/tests/acpi-test-data/pc/SSDT.bridge)bin4345 -> 7446 bytes
-rw-r--r--qemu/tests/acpi-test-data/pc/SSDTbin2486 -> 0 bytes
-rw-r--r--qemu/tests/acpi-test-data/q35/DSDTbin7666 -> 8357 bytes
-rw-r--r--qemu/tests/acpi-test-data/q35/DSDT.bridgebin0 -> 8374 bytes
-rw-r--r--qemu/tests/acpi-test-data/q35/SSDTbin691 -> 0 bytes
-rw-r--r--qemu/tests/acpi-test-data/q35/SSDT.bridgebin708 -> 0 bytes
7 files changed, 0 insertions, 0 deletions
diff --git a/qemu/tests/acpi-test-data/pc/DSDT b/qemu/tests/acpi-test-data/pc/DSDT
index c658203db..9d1274d3c 100644
--- a/qemu/tests/acpi-test-data/pc/DSDT
+++ b/qemu/tests/acpi-test-data/pc/DSDT
Binary files differ
diff --git a/qemu/tests/acpi-test-data/pc/SSDT.bridge b/qemu/tests/acpi-test-data/pc/DSDT.bridge
index 6e6660b1f..cf48c62aa 100644
--- a/qemu/tests/acpi-test-data/pc/SSDT.bridge
+++ b/qemu/tests/acpi-test-data/pc/DSDT.bridge
Binary files differ
diff --git a/qemu/tests/acpi-test-data/pc/SSDT b/qemu/tests/acpi-test-data/pc/SSDT
deleted file mode 100644
index 210d6a71e..000000000
--- a/qemu/tests/acpi-test-data/pc/SSDT
+++ /dev/null
Binary files differ
diff --git a/qemu/tests/acpi-test-data/q35/DSDT b/qemu/tests/acpi-test-data/q35/DSDT
index 4723e5954..1c089c34b 100644
--- a/qemu/tests/acpi-test-data/q35/DSDT
+++ b/qemu/tests/acpi-test-data/q35/DSDT
Binary files differ
diff --git a/qemu/tests/acpi-test-data/q35/DSDT.bridge b/qemu/tests/acpi-test-data/q35/DSDT.bridge
new file mode 100644
index 000000000..b29fcda0b
--- /dev/null
+++ b/qemu/tests/acpi-test-data/q35/DSDT.bridge
Binary files differ
diff --git a/qemu/tests/acpi-test-data/q35/SSDT b/qemu/tests/acpi-test-data/q35/SSDT
deleted file mode 100644
index 0970c67dd..000000000
--- a/qemu/tests/acpi-test-data/q35/SSDT
+++ /dev/null
Binary files differ
diff --git a/qemu/tests/acpi-test-data/q35/SSDT.bridge b/qemu/tests/acpi-test-data/q35/SSDT.bridge
deleted file mode 100644
index a77868861..000000000
--- a/qemu/tests/acpi-test-data/q35/SSDT.bridge
+++ /dev/null
Binary files differ