diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2021-09-17 20:59:49 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2021-09-27 10:57:21 +0200 |
| commit | 72686c586dd655ef7b946a1295ab8cfbbbcae0ff (patch) | |
| tree | de665dcddd6c4e7a168367f3f6168278f33f54fb | |
| parent | ca577afc683d0380b5366bdba4c7f0fe5423d809 (diff) | |
| download | focaccia-qemu-72686c586dd655ef7b946a1295ab8cfbbbcae0ff.tar.gz focaccia-qemu-72686c586dd655ef7b946a1295ab8cfbbbcae0ff.zip | |
hw/loader: Restrict PC_ROM_* definitions to hw/i386/pc
The PC_ROM_* definitions are only used by the PC machine, and are irrelevant to the other architectures / machines. Reduce their scope by moving them to hw/i386/pc.c. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20210917185949.2244956-1-philmd@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | hw/i386/pc.c | 6 | ||||
| -rw-r--r-- | include/hw/loader.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 7e523b913c..557d49c9f8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -843,6 +843,12 @@ void xen_load_linux(PCMachineState *pcms) x86ms->fw_cfg = fw_cfg; } +#define PC_ROM_MIN_VGA 0xc0000 +#define PC_ROM_MIN_OPTION 0xc8000 +#define PC_ROM_MAX 0xe0000 +#define PC_ROM_ALIGN 0x800 +#define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA) + void pc_memory_init(PCMachineState *pcms, MemoryRegion *system_memory, MemoryRegion *rom_memory, diff --git a/include/hw/loader.h b/include/hw/loader.h index cbfc184873..81104cb02f 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -336,12 +336,6 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict); #define rom_add_blob_fixed_as(_f, _b, _l, _a, _as) \ rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, _as, true) -#define PC_ROM_MIN_VGA 0xc0000 -#define PC_ROM_MIN_OPTION 0xc8000 -#define PC_ROM_MAX 0xe0000 -#define PC_ROM_ALIGN 0x800 -#define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA) - int rom_add_vga(const char *file); int rom_add_option(const char *file, int32_t bootindex); |