From 9698fead0e127336b0483ec2289affb308d7f505 Mon Sep 17 00:00:00 2001

Message-Id: <9698fead0e127336b0483ec2289affb308d7f505.1387298827.git.minovotn@redhat.com>

In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>

References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>

From: "Michael S. Tsirkin" <mst@redhat.com>

Date: Tue, 17 Dec 2013 15:17:11 +0100

Subject: [PATCH 09/56] refer to FWCfgState explicitly

RH-Author: Michael S. Tsirkin <mst@redhat.com>

Message-id: <1387293161-4085-10-git-send-email-mst@redhat.com>

Patchwork-id: 56314

O-Subject: [PATCH qemu-kvm RHEL7.0 v2 09/57] refer to FWCfgState explicitly

Bugzilla: 1034876

RH-Acked-by: Igor Mammedov <imammedo@redhat.com>

RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

From: Laszlo Ersek <lersek@redhat.com>

Currently some places use pointer-to-void even though they mean

pointer-to-FWCfgState. Clean them up.

Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

(cherry picked from commit a88b362c6ffbb7a802bf0ed5ef0e2447164dc989)

---

 hw/i386/multiboot.h  |  4 +++-

 include/hw/i386/pc.h | 19 ++++++++++---------

 include/hw/loader.h  |  3 ++-

 hw/acpi/piix4.c      |  2 +-

 hw/core/loader.c     |  2 +-

 hw/i386/multiboot.c  |  2 +-

 hw/i386/pc.c         | 24 ++++++++++++------------

 hw/i386/pc_piix.c    |  2 +-

 hw/sparc/sun4m.c     |  2 +-

 hw/sparc64/sun4u.c   |  2 +-

 10 files changed, 33 insertions(+), 29 deletions(-)

Signed-off-by: Michal Novotny <minovotn@redhat.com>

---

 hw/acpi/piix4.c      |  2 +-

 hw/core/loader.c     |  2 +-

 hw/i386/multiboot.c  |  2 +-

 hw/i386/multiboot.h  |  4 +++-

 hw/i386/pc.c         | 24 ++++++++++++------------

 hw/i386/pc_piix.c    |  2 +-

 hw/sparc/sun4m.c     |  2 +-

 hw/sparc64/sun4u.c   |  2 +-

 include/hw/i386/pc.h | 19 ++++++++++---------

 include/hw/loader.h  |  3 ++-

 10 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c

index 8af97cf..6882937 100644

--- a/hw/acpi/piix4.c

+++ b/hw/acpi/piix4.c

@@ -447,7 +447,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/core/loader.c b/hw/core/loader.c

index 8514eaf..7d61537 100644

--- a/hw/core/loader.c

+++ b/hw/core/loader.c

@@ -733,7 +733,7 @@ int rom_load_all(void)

     return 0;

 }

-void rom_set_fw(void *f)

+void rom_set_fw(FWCfgState *f)

 {

     fw_cfg = f;

 }

diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c

index d696507..09211e0 100644

--- a/hw/i386/multiboot.c

+++ b/hw/i386/multiboot.c

@@ -124,7 +124,7 @@ static void mb_add_mod(MultibootState *s,

     s->mb_mods_count++;

 }

-int load_multiboot(void *fw_cfg,

+int load_multiboot(FWCfgState *fw_cfg,

                    FILE *f,

                    const char *kernel_filename,

                    const char *initrd_filename,

diff --git a/hw/i386/multiboot.h b/hw/i386/multiboot.h

index 98fb1b7..60de309 100644

--- a/hw/i386/multiboot.h

+++ b/hw/i386/multiboot.h

@@ -1,7 +1,9 @@

 #ifndef QEMU_MULTIBOOT_H

 #define QEMU_MULTIBOOT_H

-int load_multiboot(void *fw_cfg,

+#include "hw/nvram/fw_cfg.h"

+

+int load_multiboot(FWCfgState *fw_cfg,

                    FILE *f,

                    const char *kernel_filename,

                    const char *initrd_filename,

diff --git a/hw/i386/pc.c b/hw/i386/pc.c

index 333e83f..2948781 100644

--- a/hw/i386/pc.c

+++ b/hw/i386/pc.c

@@ -598,9 +598,9 @@ static unsigned int pc_apic_id_limit(unsigned int max_cpus)

     return x86_cpu_apic_id_from_index(max_cpus - 1) + 1;

 }

-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;

@@ -677,7 +677,7 @@ 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,

@@ -1019,19 +1019,19 @@ void pc_acpi_init(const char *default_dsdt)

     }

 }

-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/i386/pc_piix.c b/hw/i386/pc_piix.c

index 8c3f2d6..b6f9288 100644

--- a/hw/i386/pc_piix.c

+++ b/hw/i386/pc_piix.c

@@ -85,7 +85,7 @@ static void pc_init1(QEMUMachineInitArgs *args,

     MemoryRegion *pci_memory;

     MemoryRegion *rom_memory;

     DeviceState *icc_bridge;

-    void *fw_cfg = NULL;

+    FWCfgState *fw_cfg = NULL;

     icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);

     object_property_add_child(qdev_get_machine(), "icc-bridge",

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c

index 635115f..7c5b8e7 100644

--- a/hw/sparc/sun4m.c

+++ b/hw/sparc/sun4m.c

@@ -873,7 +873,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,

     qemu_irq *cpu_halt;

     unsigned long kernel_size;

     DriveInfo *fd[MAX_FD];

-    void *fw_cfg;

+    FWCfgState *fw_cfg;

     unsigned int num_vsimms;

     /* init CPUs */

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c

index 5c2bbd4..5ce5ed6 100644

--- a/hw/sparc64/sun4u.c

+++ b/hw/sparc64/sun4u.c

@@ -818,7 +818,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,

     qemu_irq *ivec_irqs, *pbm_irqs;

     DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];

     DriveInfo *fd[MAX_FD];

-    void *fw_cfg;

+    FWCfgState *fw_cfg;

     /* init CPUs */

     cpu = cpu_devinit(cpu_model, hwdef);

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h

index 72f6882..4175c1b 100644

--- a/include/hw/i386/pc.h

+++ b/include/hw/i386/pc.h

@@ -9,6 +9,7 @@

 #include "net/net.h"

 #include "exec/memory.h"

 #include "hw/i386/ioapic.h"

+#include "hw/nvram/fw_cfg.h"

 /* PC-style peripherals (also used by other machines).  */

@@ -84,14 +85,14 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level);

 void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge);

 void pc_hot_add_cpu(const int64_t id, Error **errp);

 void pc_acpi_init(const char *default_dsdt);

-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,

@@ -115,7 +116,7 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name);

 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/include/hw/loader.h b/include/hw/loader.h

index 0958f06..15d4cc9 100644

--- a/include/hw/loader.h

+++ b/include/hw/loader.h

@@ -1,6 +1,7 @@

 #ifndef LOADER_H

 #define LOADER_H

 #include "qapi/qmp/qdict.h"

+#include "hw/nvram/fw_cfg.h"

 /* loader.c */

 int get_image_size(const char *filename);

@@ -30,7 +31,7 @@ int rom_add_blob(const char *name, const void *blob, size_t len,

 int rom_add_elf_program(const char *name, void *data, size_t datasize,

                         size_t romsize, hwaddr addr);

 int rom_load_all(void);

-void rom_set_fw(void *f);

+void rom_set_fw(FWCfgState *f);

 int rom_copy(uint8_t *dest, hwaddr addr, size_t size);

 void *rom_ptr(hwaddr addr);

 void do_info_roms(Monitor *mon, const QDict *qdict);

-- 

1.7.11.7