[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/27] pc: use FWCfgState* instead of void* for fw_c
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 14/27] pc: use FWCfgState* instead of void* for fw_cfg data |
Date: |
Wed, 24 Oct 2012 15:49:48 -0200 |
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 <address@hidden>
---
hw/pc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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);
--
1.7.11.7
- [Qemu-devel] Subject: [PATCH 00/27] Fix APIC-ID-based CPU topology, take 3, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 03/27] hw/apic.c: rename bit functions to not conflict with bitops.h, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 04/27] target-i386: initialize APIC at CPU level, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 19/27] cpu_x86_init: check for x86_cpu_realize() errors, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 14/27] pc: use FWCfgState* instead of void* for fw_cfg data,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 26/27] pc: create separate init function for pc-1.3, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 05/27] kvm: create kvm_arch_vcpu_id() function, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 11/27] pc: add PC_DEFAULT_CPU_MODEL #define, Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 01/27] move I/O-related definitions from qemu-common.h to a new header (qemu-stdio.h), Eduardo Habkost, 2012/10/24
- [Qemu-devel] [PATCH 20/27] target-i386: do not call x86_cpu_realize() on cpu_x86_init(), Eduardo Habkost, 2012/10/24