diff options
| author | Gabriel L. Somlo <somlo@cmu.edu> | 2016-02-19 13:20:26 -0500 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-03-08 12:14:49 +0100 |
| commit | 305ae88895ebc2cb16565e5cb1fa0c87b66ea8d4 (patch) | |
| tree | 417b39ae000cb8e5fc131ecebb0e52f0eb768455 | |
| parent | ce9a2aa372f567d1a19417ab02789706d132daf7 (diff) | |
pc: fw_cfg: move ioport base constant to pc.h
Move BIOS_CFG_IOPORT define from pc.c to pc.h, and rename
it to FW_CFG_IO_BASE.
Cc: Marc Marí <markmb@redhat.com>
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Marc Marí <markmb@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1455906029-25565-3-git-send-email-somlo@cmu.edu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | hw/i386/pc.c | 5 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 0aeefd2c0d..56ec6cd6c6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -78,7 +78,6 @@ #define DPRINTF(fmt, ...) #endif -#define BIOS_CFG_IOPORT 0x510 #define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0) #define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1) #define FW_CFG_IRQ0_OVERRIDE (FW_CFG_ARCH_LOCAL + 2) @@ -756,7 +755,7 @@ static FWCfgState *bochs_bios_init(AddressSpace *as) int i, j; unsigned int apic_id_limit = pc_apic_id_limit(max_cpus); - fw_cfg = fw_cfg_init_io_dma(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 4, as); + fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, as); /* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86: * @@ -1258,7 +1257,7 @@ void xen_load_linux(PCMachineState *pcms) assert(MACHINE(pcms)->kernel_filename != NULL); - fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT); + fw_cfg = fw_cfg_init_io(FW_CFG_IO_BASE); rom_set_fw(fw_cfg); load_linux(pcms, fw_cfg); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8b3546ed5c..79ffe5b3ee 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -266,6 +266,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name); ISADevice *pc_find_fdc0(void); +#define FW_CFG_IO_BASE 0x510 + /* acpi_piix.c */ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, |