[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] pc: fw_cfg: move ioport base constant to pc.h
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/6] pc: fw_cfg: move ioport base constant to pc.h |
Date: |
Tue, 8 Mar 2016 12:18:57 +0100 |
From: "Gabriel L. Somlo" <address@hidden>
Move BIOS_CFG_IOPORT define from pc.c to pc.h, and rename
it to FW_CFG_IO_BASE.
Cc: Marc MarĂ <address@hidden>
Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Marc MarĂ <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <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 0aeefd2..56ec6cd 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 8b3546e..79ffe5b 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,
--
1.8.3.1
- [Qemu-devel] [PULL 0/6] acpi: add fw_cfg device node to dsdt, Gerd Hoffmann, 2016/03/08
- [Qemu-devel] [PULL 1/6] fw_cfg: expose control register size in fw_cfg.h, Gerd Hoffmann, 2016/03/08
- [Qemu-devel] [PULL 5/6] fw_cfg: document ACPI device node information, Gerd Hoffmann, 2016/03/08
- [Qemu-devel] [PULL 6/6] tests: update acpi test data, Gerd Hoffmann, 2016/03/08
- [Qemu-devel] [PULL 2/6] pc: fw_cfg: move ioport base constant to pc.h,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/6] acpi: pc: add fw_cfg device node to dsdt, Gerd Hoffmann, 2016/03/08
- [Qemu-devel] [PULL 4/6] acpi: arm: add fw_cfg device node to dsdt, Gerd Hoffmann, 2016/03/08
- Re: [Qemu-devel] [PULL 0/6] acpi: add fw_cfg device node to dsdt, Peter Maydell, 2016/03/08