From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th0RM-0006l7-Oh for qemu-devel@nongnu.org; Fri, 07 Dec 2012 11:06:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Th0RH-0006YI-4Y for qemu-devel@nongnu.org; Fri, 07 Dec 2012 11:06:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:18535) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th0RG-0006Xt-Ss for qemu-devel@nongnu.org; Fri, 07 Dec 2012 11:06:11 -0500 From: Eduardo Habkost Date: Fri, 7 Dec 2012 14:07:34 -0200 Message-Id: <1354896456-21120-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1354896456-21120-1-git-send-email-ehabkost@redhat.com> References: <1354896456-21120-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] pc: use FWCfgState* instead of void* for fw_cfg data List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Anthony Liguori There's no point in using void* if all functions dealing with that data use FWCfgState*. Signed-off-by: Eduardo Habkost --- Cc: Anthony Liguori --- hw/acpi_piix4.c | 2 +- hw/pc.c | 28 ++++++++++++++-------------- hw/pc.h | 19 ++++++++++--------- hw/pc_piix.c | 2 +- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 519269a..6ddee93 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -473,7 +473,7 @@ static int piix4_pm_initfn(PCIDevice *dev) i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, - int kvm_enabled, void *fw_cfg) + int kvm_enabled, FWCfgState *fw_cfg) { PCIDevice *dev; PIIX4PMState *s; diff --git a/hw/pc.c b/hw/pc.c index 2b5bbbf..70d3394 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -567,9 +567,9 @@ int e820_add_entry(uint64_t address, uint64_t length, uint32_t type) return index; } -static void *bochs_bios_init(void) +static FWCfgState *bochs_bios_init(void) { - void *fw_cfg; + FWCfgState *fw_cfg; uint8_t *smbios_table; size_t smbios_len; uint64_t *numa_fw_cfg; @@ -635,10 +635,10 @@ static long get_file_size(FILE *f) return size; } -static void load_linux(void *fw_cfg, +static void load_linux(FWCfgState *fw_cfg, const char *kernel_filename, - const char *initrd_filename, - const char *kernel_cmdline, + const char *initrd_filename, + const char *kernel_cmdline, hwaddr max_ram_size) { uint16_t protocol; @@ -877,19 +877,19 @@ void pc_cpus_init(const char *cpu_model) } } -void *pc_memory_init(MemoryRegion *system_memory, - const char *kernel_filename, - const char *kernel_cmdline, - const char *initrd_filename, - ram_addr_t below_4g_mem_size, - ram_addr_t above_4g_mem_size, - MemoryRegion *rom_memory, - MemoryRegion **ram_memory) +FWCfgState *pc_memory_init(MemoryRegion *system_memory, + const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + ram_addr_t above_4g_mem_size, + MemoryRegion *rom_memory, + MemoryRegion **ram_memory) { int linux_boot, i; MemoryRegion *ram, *option_rom_mr; MemoryRegion *ram_below_4g, *ram_above_4g; - void *fw_cfg; + FWCfgState *fw_cfg; linux_boot = (kernel_filename != NULL); diff --git a/hw/pc.h b/hw/pc.h index 2237e86..0fc97ea 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -9,6 +9,7 @@ #include "net.h" #include "memory.h" #include "ioapic.h" +#include "fw_cfg.h" /* PC-style peripherals (also used by other machines). */ @@ -79,14 +80,14 @@ void pc_register_ferr_irq(qemu_irq irq); void pc_acpi_smi_interrupt(void *opaque, int irq, int level); void pc_cpus_init(const char *cpu_model); -void *pc_memory_init(MemoryRegion *system_memory, - const char *kernel_filename, - const char *kernel_cmdline, - const char *initrd_filename, - ram_addr_t below_4g_mem_size, - ram_addr_t above_4g_mem_size, - MemoryRegion *rom_memory, - MemoryRegion **ram_memory); +FWCfgState *pc_memory_init(MemoryRegion *system_memory, + const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + ram_addr_t above_4g_mem_size, + MemoryRegion *rom_memory, + MemoryRegion **ram_memory); qemu_irq *pc_allocate_cpu_irq(void); DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, @@ -118,7 +119,7 @@ int acpi_table_add(const char *table_desc); i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, - int kvm_enabled, void *fw_cfg); + int kvm_enabled, FWCfgState *fw_cfg); void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr); /* hpet.c */ diff --git a/hw/pc_piix.c b/hw/pc_piix.c index aa3e7f4..d636bcf 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -84,7 +84,7 @@ static void pc_init1(MemoryRegion *system_memory, MemoryRegion *ram_memory; MemoryRegion *pci_memory; MemoryRegion *rom_memory; - void *fw_cfg = NULL; + FWCfgState *fw_cfg = NULL; pc_cpus_init(cpu_model); -- 1.7.11.7