diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2015-01-19 23:58:55 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-01-27 14:46:17 +0200 |
| commit | 0058ae1d9483f5f96c7798e2ae51cce42c69abfb (patch) | |
| tree | 1651bb3abc212fcf5c6ef74635b2c355d635ae45 /hw | |
| parent | 91d5c57a2e98845c02cda026f3f6a88cb5e14225 (diff) | |
bios-linker-loader: move header to common location
Will be usable by MIPS, ARM.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/acpi-build.c | 2 | ||||
| -rw-r--r-- | hw/i386/bios-linker-loader.c | 2 | ||||
| -rw-r--r-- | hw/i386/bios-linker-loader.h | 27 |
3 files changed, 2 insertions, 29 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2f1daf701c..4944249b84 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -36,7 +36,7 @@ #include "hw/i386/acpi-defs.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" -#include "bios-linker-loader.h" +#include "hw/acpi/bios-linker-loader.h" #include "hw/loader.h" #include "hw/isa/isa.h" #include "hw/acpi/memory_hotplug.h" diff --git a/hw/i386/bios-linker-loader.c b/hw/i386/bios-linker-loader.c index aa56184e9a..5cc4d90c16 100644 --- a/hw/i386/bios-linker-loader.c +++ b/hw/i386/bios-linker-loader.c @@ -19,7 +19,7 @@ */ #include "qemu-common.h" -#include "bios-linker-loader.h" +#include "hw/acpi/bios-linker-loader.h" #include "hw/nvram/fw_cfg.h" #include "qemu/bswap.h" diff --git a/hw/i386/bios-linker-loader.h b/hw/i386/bios-linker-loader.h deleted file mode 100644 index 498c0af773..0000000000 --- a/hw/i386/bios-linker-loader.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef BIOS_LINKER_LOADER_H -#define BIOS_LINKER_LOADER_H - -#include <glib.h> -#include <stdbool.h> -#include <inttypes.h> - -GArray *bios_linker_loader_init(void); - -void bios_linker_loader_alloc(GArray *linker, - const char *file, - uint32_t alloc_align, - bool alloc_fseg); - -void bios_linker_loader_add_checksum(GArray *linker, const char *file, - void *table, - void *start, unsigned size, - uint8_t *checksum); - -void bios_linker_loader_add_pointer(GArray *linker, - const char *dest_file, - const char *src_file, - GArray *table, void *pointer, - uint8_t pointer_size); - -void *bios_linker_loader_cleanup(GArray *linker); -#endif |