motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/loongarch: move memory map to boot.c

Browse source 
Ensure that it can be used even if virt.c is not included in the build, as
is the case for --without-default-devices.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240507145135.270803-1-pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Paolo Bonzini 2024-05-07 16:51:35 +02:00 • committed by Philippe Mathieu-Daudé
parent ed95bdd1e5
commit 72674db080
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.d/buildtest.yml
View file

@ -650,7 +650,7 @@ build-tci:
# Check our reduced build configurations # Check our reduced build configurations
# requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
# mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64 # mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64
# does not build without boards: i386, loongarch64, s390x, sh4, sh4eb, x86_64 # does not build without boards: i386, s390x, sh4, sh4eb, x86_64
build-without-defaults: build-without-defaults:
extends: .native_build_job_template extends: .native_build_job_template
needs: needs:

3
hw/loongarch/boot.c
View file

@ -15,6 +15,9 @@
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
struct memmap_entry *memmap_table;
unsigned memmap_entries;
ram_addr_t initrd_offset; ram_addr_t initrd_offset;
uint64_t initrd_size; uint64_t initrd_size;

3
hw/loongarch/virt.c
View file

@ -516,9 +516,6 @@ static void virt_powerdown_req(Notifier *notifier, void *opaque)
acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS); acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS);
} }
struct memmap_entry *memmap_table;
unsigned memmap_entries;
static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type) static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type)
{ {
/* Ensure there are no duplicate entries. */ /* Ensure there are no duplicate entries. */

10
include/hw/loongarch/boot.h
View file

@ -104,6 +104,16 @@ struct loongarch_boot_info {
uint64_t a0, a1, a2; uint64_t a0, a1, a2;
}; };
extern struct memmap_entry *memmap_table;
extern unsigned memmap_entries;
struct memmap_entry {
uint64_t address;
uint64_t length;
uint32_t type;
uint32_t reserved;
};
void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info); void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info);
#endif /* HW_LOONGARCH_BOOT_H */ #endif /* HW_LOONGARCH_BOOT_H */

10
include/hw/loongarch/virt.h
View file

@ -37,16 +37,6 @@
#define FDT_BASE 0x100000 #define FDT_BASE 0x100000
extern struct memmap_entry *memmap_table;
extern unsigned memmap_entries;
struct memmap_entry {
uint64_t address;
uint64_t length;
uint32_t type;
uint32_t reserved;
};
struct LoongArchMachineState { struct LoongArchMachineState {
/*< private >*/ /*< private >*/
MachineState parent_obj; MachineState parent_obj;