[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] hw/loader: Restrict PC_ROM_* definitions to hw/i386/pc
From: |
Laurent Vivier |
Subject: |
Re: [PATCH] hw/loader: Restrict PC_ROM_* definitions to hw/i386/pc |
Date: |
Thu, 23 Sep 2021 17:00:36 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 |
Le 17/09/2021 à 20:59, Philippe Mathieu-Daudé a écrit :
> 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>
> ---
> include/hw/loader.h | 6 ------
> hw/i386/pc.c | 6 ++++++
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/loader.h b/include/hw/loader.h
> index cbfc1848737..81104cb02fe 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);
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 7e523b913ca..557d49c9f8f 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,
>
Applied to my trivial-patches branch.
Thanks,
Laurent