From 395e5fb4421a03c9d3a002bbb55d56b74024a568 Mon Sep 17 00:00:00 2001 From: Shannon Zhao Date: Fri, 3 Apr 2015 18:03:33 +0800 Subject: hw/i386: Move ACPI header definitions in an arch-independent location The ACPI related header file acpi-defs.h, includes definitions that apply on other architectures as well. Move it in `include/hw/acpi/` to sanely include it from other architectures. Signed-off-by: Alvise Rigo Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/bios-tables-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 735ac610be..7e85dc45e3 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -17,7 +17,7 @@ #include "qemu-common.h" #include "libqtest.h" #include "qemu/compiler.h" -#include "hw/i386/acpi-defs.h" +#include "hw/acpi/acpi-defs.h" #include "hw/i386/smbios.h" #include "qemu/bitmap.h" -- cgit v1.2.3 From bc1f7c4c915a7c727741c4d27a2795e1039eacd3 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Mon, 11 May 2015 09:21:37 +0200 Subject: acpi: update expected files for memory unplug commit c06b2ffb02bfcc642c67300d2c4dffd5aa54932b acpi: add hardware implementation for memory hot unplug Changed both the DSDT and the SSDT. Update the expected files accordingly. Signed-off-by: Michael S. Tsirkin --- tests/acpi-test-data/pc/DSDT | Bin 2970 -> 3028 bytes tests/acpi-test-data/pc/SSDT | Bin 2475 -> 2486 bytes tests/acpi-test-data/pc/SSDT.bridge | Bin 4334 -> 4345 bytes tests/acpi-test-data/q35/DSDT | Bin 7608 -> 7666 bytes tests/acpi-test-data/q35/SSDT | Bin 680 -> 691 bytes tests/acpi-test-data/q35/SSDT.bridge | Bin 697 -> 708 bytes 6 files changed, 0 insertions(+), 0 deletions(-) (limited to 'tests') diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT index 1693c3783b..c658203db9 100644 Binary files a/tests/acpi-test-data/pc/DSDT and b/tests/acpi-test-data/pc/DSDT differ diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT index 59be315237..210d6a71e5 100644 Binary files a/tests/acpi-test-data/pc/SSDT and b/tests/acpi-test-data/pc/SSDT differ diff --git a/tests/acpi-test-data/pc/SSDT.bridge b/tests/acpi-test-data/pc/SSDT.bridge index fa6136935c..6e6660b1fb 100644 Binary files a/tests/acpi-test-data/pc/SSDT.bridge and b/tests/acpi-test-data/pc/SSDT.bridge differ diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT index e9ac11c38f..4723e5954d 100644 Binary files a/tests/acpi-test-data/q35/DSDT and b/tests/acpi-test-data/q35/DSDT differ diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT index e87f5a35c1..0970c67ddb 100644 Binary files a/tests/acpi-test-data/q35/SSDT and b/tests/acpi-test-data/q35/SSDT differ diff --git a/tests/acpi-test-data/q35/SSDT.bridge b/tests/acpi-test-data/q35/SSDT.bridge index b3cac34d70..a778688617 100644 Binary files a/tests/acpi-test-data/q35/SSDT.bridge and b/tests/acpi-test-data/q35/SSDT.bridge differ -- cgit v1.2.3