Patchwork [14/27] pc: use FWCfgState* instead of void* for fw_cfg data

login
register
mail settings
Submitter Eduardo Habkost
Date Oct. 24, 2012, 5:49 p.m.
Message ID <1351101001-14589-15-git-send-email-ehabkost@redhat.com>
Download mbox | patch
Permalink /patch/193910/
State New
Headers show

Comments

Eduardo Habkost - Oct. 24, 2012, 5:49 p.m.
I don't know why the code uses void* if the FWCfgState typedef is declared at
the same header where fw_cfg_init() and other fw_cfg_*() functions are
declared.  This changes the code to use FWCfgState* instead of void* in the PC
initialization code.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/pc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/hw/pc.c b/hw/pc.c
index dce9ce1..4e971c8 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -570,9 +570,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;
@@ -638,7 +638,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,
@@ -881,7 +881,7 @@  void *pc_memory_init(PCInitArgs *args)
     int linux_boot, i;
     MemoryRegion *ram, *option_rom_mr;
     MemoryRegion *ram_below_4g, *ram_above_4g;
-    void *fw_cfg;
+    FWCfgState *fw_cfg;
 
     linux_boot = (args->qemu_args->kernel_filename != NULL);