From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adFfU-00007P-IK for qemu-devel@nongnu.org; Tue, 08 Mar 2016 06:19:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adFfQ-0001Bj-AC for qemu-devel@nongnu.org; Tue, 08 Mar 2016 06:19:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36122) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adFfQ-0001Aj-4e for qemu-devel@nongnu.org; Tue, 08 Mar 2016 06:19:08 -0500 From: Gerd Hoffmann Date: Tue, 8 Mar 2016 12:18:57 +0100 Message-Id: <1457435941-17578-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1457435941-17578-1-git-send-email-kraxel@redhat.com> References: <1457435941-17578-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/6] pc: fw_cfg: move ioport base constant to pc.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , "Gabriel L. Somlo" , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Marc=20Mar=C3=AD?= , Richard Henderson From: "Gabriel L. Somlo" Move BIOS_CFG_IOPORT define from pc.c to pc.h, and rename it to FW_CFG_IO_BASE. Cc: Marc Mar=C3=AD Signed-off-by: Gabriel Somlo Reviewed-by: Laszlo Ersek Reviewed-by: Marc Mar=C3=AD Reviewed-by: Michael S. Tsirkin Message-id: 1455906029-25565-3-git-send-email-somlo@cmu.edu Signed-off-by: Gerd Hoffmann --- 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 =20 -#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 =3D pc_apic_id_limit(max_cpus); =20 - fw_cfg =3D fw_cfg_init_io_dma(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 4, = as); + fw_cfg =3D fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, as= ); =20 /* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86: * @@ -1258,7 +1257,7 @@ void xen_load_linux(PCMachineState *pcms) =20 assert(MACHINE(pcms)->kernel_filename !=3D NULL); =20 - fw_cfg =3D fw_cfg_init_io(BIOS_CFG_IOPORT); + fw_cfg =3D fw_cfg_init_io(FW_CFG_IO_BASE); rom_set_fw(fw_cfg); =20 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); =20 ISADevice *pc_find_fdc0(void); =20 +#define FW_CFG_IO_BASE 0x510 + /* acpi_piix.c */ =20 I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, --=20 1.8.3.1