[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] pc: Clean up bochs_bios_init()'s (non-)use of s
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 6/8] pc: Clean up bochs_bios_init()'s (non-)use of sizeof |
Date: |
Wed, 16 Jan 2013 14:50:27 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/pc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index bc5c33f..34cf79d 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -572,7 +572,7 @@ static void *bochs_bios_init(void)
fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES,
smbios_table, smbios_len);
fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, (uint8_t *)&e820_table,
- sizeof(struct e820_table));
+ sizeof(e820_table));
fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, (uint8_t *)&hpet_cfg,
sizeof(struct hpet_fw_config));
@@ -580,7 +580,7 @@ static void *bochs_bios_init(void)
* of nodes, one word for each VCPU->node and one word for each node to
* hold the amount of memory.
*/
- numa_fw_cfg = g_malloc0((1 + max_cpus + nb_numa_nodes) * 8);
+ numa_fw_cfg = g_new0(uint64_t, 1 + max_cpus + nb_numa_nodes);
numa_fw_cfg[0] = cpu_to_le64(nb_numa_nodes);
for (i = 0; i < max_cpus; i++) {
for (j = 0; j < nb_numa_nodes; j++) {
@@ -594,7 +594,7 @@ static void *bochs_bios_init(void)
numa_fw_cfg[max_cpus + 1 + i] = cpu_to_le64(node_mem[i]);
}
fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, (uint8_t *)numa_fw_cfg,
- (1 + max_cpus + nb_numa_nodes) * 8);
+ (1 + max_cpus + nb_numa_nodes) * sizeof(*numa_fw_cfg));
return fw_cfg;
}
--
1.7.11.7
- [Qemu-devel] [PATCH 0/8] Fixes and cleanups around fw_cfg, Markus Armbruster, 2013/01/16
- [Qemu-devel] [PATCH 3/8] fw_cfg: New fw_cfg_add_string(), Markus Armbruster, 2013/01/16
- [Qemu-devel] [PATCH 4/8] pc: Fix unchecked strdup() by switching to fw_cfg_add_string(), Markus Armbruster, 2013/01/16
- [Qemu-devel] [PATCH 7/8] fw_cfg: Use void *, size_t instead of uint8_t *, uint32_t for blobs, Markus Armbruster, 2013/01/16
- [Qemu-devel] [PATCH 1/8] fw_cfg: Replace debug prints by tracepoints, Markus Armbruster, 2013/01/16
- [Qemu-devel] [PATCH 8/8] vl: Use size_t for sizes in get_boot_devices_list(), Markus Armbruster, 2013/01/16
- [Qemu-devel] [PATCH 2/8] fw_cfg: Dumb down fw_cfg_add_*() not to return success / failure, Markus Armbruster, 2013/01/16
- [Qemu-devel] [PATCH 5/8] sun4: Fix unchecked strdup() by switching to fw_cfg_add_string(), Markus Armbruster, 2013/01/16
- [Qemu-devel] [PATCH 6/8] pc: Clean up bochs_bios_init()'s (non-)use of sizeof,
Markus Armbruster <=
- Re: [Qemu-devel] [PATCH 0/8] Fixes and cleanups around fw_cfg, Gleb Natapov, 2013/01/17