From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxR1p-0002s8-8g for qemu-devel@nongnu.org; Fri, 13 Nov 2015 21:57:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxR1m-0000n8-1J for qemu-devel@nongnu.org; Fri, 13 Nov 2015 21:57:25 -0500 Received: from relay-04.andrew.cmu.edu ([128.2.105.169]:45336 helo=relay.andrew.cmu.edu) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxR1l-0000mm-Sj for qemu-devel@nongnu.org; Fri, 13 Nov 2015 21:57:21 -0500 From: "Gabriel L. Somlo" Date: Fri, 13 Nov 2015 21:57:15 -0500 Message-Id: <1447469838-13533-3-git-send-email-somlo@cmu.edu> In-Reply-To: <1447469838-13533-1-git-send-email-somlo@cmu.edu> References: <1447469838-13533-1-git-send-email-somlo@cmu.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 2/5] 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: peter.maydell@linaro.org, matt.fleming@intel.com, ehabkost@redhat.com, mst@redhat.com, ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, kraxel@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, markmb@redhat.com, lersek@redhat.com, rth@twiddle.net 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 --- 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 5e20e07..5763d20 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -85,7 +85,6 @@ void pc_set_legacy_acpi_data_size(void) acpi_data_size =3D 0x10000; } =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) @@ -759,7 +758,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: * @@ -1278,7 +1277,7 @@ FWCfgState *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 4bbc0ff..8f89f07 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -211,6 +211,8 @@ typedef void (*cpu_set_smm_t)(int smm, void *arg); =20 void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name); =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 2.4.3