From 395e5fb4421a03c9d3a002bbb55d56b74024a568 Mon Sep 17 00:00:00 2001 From: Shannon Zhao Date: Fri, 3 Apr 2015 18:03:33 +0800 Subject: [PATCH] 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 --- hw/i386/acpi-build.c | 2 +- {hw/i386 => include/hw/acpi}/acpi-defs.h | 0 tests/bios-tables-test.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {hw/i386 => include/hw/acpi}/acpi-defs.h (100%) 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 similarity index 100% rename from hw/i386/acpi-defs.h rename to 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" -- 2.11.0