summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShannon Zhao <shannon.zhao@linaro.org>2015-04-03 18:03:33 +0800
committerMichael S. Tsirkin <mst@redhat.com>2015-04-27 20:49:45 +0200
commit395e5fb4421a03c9d3a002bbb55d56b74024a568 (patch)
tree2067642889d13e3245a163266f8d078953b6f724
parent853cff8e2815c99429d53baa71110416c1de2798 (diff)
downloadqemu-395e5fb4421a03c9d3a002bbb55d56b74024a568.tar.gz
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 <a.rigo@virtualopensystems.com> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/i386/acpi-build.c2
-rw-r--r--include/hw/acpi/acpi-defs.h (renamed from hw/i386/acpi-defs.h)0
-rw-r--r--tests/bios-tables-test.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 1cfe265e63..c6c0b72beb 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -33,7 +33,7 @@
#include "hw/i386/pc.h"
#include "target-i386/cpu.h"
#include "hw/timer/hpet.h"
-#include "hw/i386/acpi-defs.h"
+#include "hw/acpi/acpi-defs.h"
#include "hw/acpi/acpi.h"
#include "hw/nvram/fw_cfg.h"
#include "hw/acpi/bios-linker-loader.h"
diff --git a/hw/i386/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index c4468f84e8..c4468f84e8 100644
--- a/hw/i386/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
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"