[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/5] pc: fw_cfg: move ioport base constant to pc.
From: |
Gabriel L. Somlo |
Subject: |
[Qemu-devel] [PATCH v3 2/5] pc: fw_cfg: move ioport base constant to pc.h |
Date: |
Thu, 17 Sep 2015 10:56:31 -0400 |
Move BIOS_CFG_IOPORT define from pc.c to pc.h, and rename
it to FW_CFG_IO_BASE.
Signed-off-by: Gabriel Somlo <address@hidden>
---
hw/i386/pc.c | 5 ++---
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 56aecce..c7ee828 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -86,7 +86,6 @@ void pc_set_legacy_acpi_data_size(void)
acpi_data_size = 0x10000;
}
-#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)
@@ -760,7 +759,7 @@ static FWCfgState *bochs_bios_init(void)
int i, j;
unsigned int apic_id_limit = pc_apic_id_limit(max_cpus);
- fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT);
+ fw_cfg = fw_cfg_init_io(FW_CFG_IO_BASE);
/* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86:
*
* SeaBIOS needs FW_CFG_MAX_CPUS for CPU hotplug, but the CPU hotplug
@@ -1292,7 +1291,7 @@ FWCfgState *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 3e002c9..fadcaa4 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -206,6 +206,8 @@ typedef void (*cpu_set_smm_t)(int smm, void *arg);
void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name);
+#define FW_CFG_IO_BASE 0x510
+
/* acpi_piix.c */
I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
--
2.4.3
- [Qemu-devel] [PATCH v3 0/5] add ACPI node for fw_cfg on pc and arm, Gabriel L. Somlo, 2015/09/17
- [Qemu-devel] [PATCH v3 4/5] acpi: arm: add fw_cfg device node to dsdt, Gabriel L. Somlo, 2015/09/17
- [Qemu-devel] [PATCH v3 5/5] fw_cfg: document ACPI device node information, Gabriel L. Somlo, 2015/09/17
- [Qemu-devel] [PATCH v3 2/5] pc: fw_cfg: move ioport base constant to pc.h,
Gabriel L. Somlo <=
- [Qemu-devel] [PATCH v3 3/5] acpi: pc: add fw_cfg device node to ssdt, Gabriel L. Somlo, 2015/09/17
- [Qemu-devel] [PATCH v3 1/5] fw_cfg: expose control register size in fw_cfg.h, Gabriel L. Somlo, 2015/09/17
- Re: [Qemu-devel] [PATCH v3 0/5] add ACPI node for fw_cfg on pc and arm, Michael S. Tsirkin, 2015/09/17
- Re: [Qemu-devel] [PATCH v3 0/5] add ACPI node for fw_cfg on pc and arm, Igor Mammedov, 2015/09/23