Revision 7267c094 hw/pc.c
| b/hw/pc.c | ||
|---|---|---|
| 617 | 617 |
* of nodes, one word for each VCPU->node and one word for each node to |
| 618 | 618 |
* hold the amount of memory. |
| 619 | 619 |
*/ |
| 620 |
numa_fw_cfg = qemu_mallocz((1 + smp_cpus + nb_numa_nodes) * 8);
|
|
| 620 |
numa_fw_cfg = g_malloc0((1 + smp_cpus + nb_numa_nodes) * 8);
|
|
| 621 | 621 |
numa_fw_cfg[0] = cpu_to_le64(nb_numa_nodes); |
| 622 | 622 |
for (i = 0; i < smp_cpus; i++) {
|
| 623 | 623 |
for (j = 0; j < nb_numa_nodes; j++) {
|
| ... | ... | |
| 788 | 788 |
|
| 789 | 789 |
initrd_addr = (initrd_max-initrd_size) & ~4095; |
| 790 | 790 |
|
| 791 |
initrd_data = qemu_malloc(initrd_size);
|
|
| 791 |
initrd_data = g_malloc(initrd_size);
|
|
| 792 | 792 |
load_image(initrd_filename, initrd_data); |
| 793 | 793 |
|
| 794 | 794 |
fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, initrd_addr); |
| ... | ... | |
| 806 | 806 |
setup_size = (setup_size+1)*512; |
| 807 | 807 |
kernel_size -= setup_size; |
| 808 | 808 |
|
| 809 |
setup = qemu_malloc(setup_size);
|
|
| 810 |
kernel = qemu_malloc(kernel_size);
|
|
| 809 |
setup = g_malloc(setup_size);
|
|
| 810 |
kernel = g_malloc(kernel_size);
|
|
| 811 | 811 |
fseek(f, 0, SEEK_SET); |
| 812 | 812 |
if (fread(setup, 1, setup_size, f) != setup_size) {
|
| 813 | 813 |
fprintf(stderr, "fread() failed\n"); |
| ... | ... | |
| 978 | 978 |
* aliases to address portions of it, mostly for backwards compatiblity |
| 979 | 979 |
* with older qemus that used qemu_ram_alloc(). |
| 980 | 980 |
*/ |
| 981 |
ram = qemu_malloc(sizeof(*ram));
|
|
| 981 |
ram = g_malloc(sizeof(*ram));
|
|
| 982 | 982 |
memory_region_init_ram(ram, NULL, "pc.ram", |
| 983 | 983 |
below_4g_mem_size + above_4g_mem_size); |
| 984 |
ram_below_4g = qemu_malloc(sizeof(*ram_below_4g));
|
|
| 984 |
ram_below_4g = g_malloc(sizeof(*ram_below_4g));
|
|
| 985 | 985 |
memory_region_init_alias(ram_below_4g, "ram-below-4g", ram, |
| 986 | 986 |
0, below_4g_mem_size); |
| 987 | 987 |
memory_region_add_subregion(system_memory, 0, ram_below_4g); |
| 988 | 988 |
if (above_4g_mem_size > 0) {
|
| 989 |
ram_above_4g = qemu_malloc(sizeof(*ram_above_4g));
|
|
| 989 |
ram_above_4g = g_malloc(sizeof(*ram_above_4g));
|
|
| 990 | 990 |
memory_region_init_alias(ram_above_4g, "ram-above-4g", ram, |
| 991 | 991 |
below_4g_mem_size, above_4g_mem_size); |
| 992 | 992 |
memory_region_add_subregion(system_memory, 0x100000000ULL, |
| ... | ... | |
| 1006 | 1006 |
(bios_size % 65536) != 0) {
|
| 1007 | 1007 |
goto bios_error; |
| 1008 | 1008 |
} |
| 1009 |
bios = qemu_malloc(sizeof(*bios));
|
|
| 1009 |
bios = g_malloc(sizeof(*bios));
|
|
| 1010 | 1010 |
memory_region_init_ram(bios, NULL, "pc.bios", bios_size); |
| 1011 | 1011 |
memory_region_set_readonly(bios, true); |
| 1012 | 1012 |
ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1); |
| ... | ... | |
| 1016 | 1016 |
exit(1); |
| 1017 | 1017 |
} |
| 1018 | 1018 |
if (filename) {
|
| 1019 |
qemu_free(filename);
|
|
| 1019 |
g_free(filename);
|
|
| 1020 | 1020 |
} |
| 1021 | 1021 |
/* map the last 128KB of the BIOS in ISA space */ |
| 1022 | 1022 |
isa_bios_size = bios_size; |
| 1023 | 1023 |
if (isa_bios_size > (128 * 1024)) |
| 1024 | 1024 |
isa_bios_size = 128 * 1024; |
| 1025 |
isa_bios = qemu_malloc(sizeof(*isa_bios));
|
|
| 1025 |
isa_bios = g_malloc(sizeof(*isa_bios));
|
|
| 1026 | 1026 |
memory_region_init_alias(isa_bios, "isa-bios", bios, |
| 1027 | 1027 |
bios_size - isa_bios_size, isa_bios_size); |
| 1028 | 1028 |
memory_region_add_subregion_overlap(system_memory, |
| ... | ... | |
| 1031 | 1031 |
1); |
| 1032 | 1032 |
memory_region_set_readonly(isa_bios, true); |
| 1033 | 1033 |
|
| 1034 |
option_rom_mr = qemu_malloc(sizeof(*option_rom_mr));
|
|
| 1034 |
option_rom_mr = g_malloc(sizeof(*option_rom_mr));
|
|
| 1035 | 1035 |
memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE); |
| 1036 | 1036 |
memory_region_add_subregion_overlap(system_memory, |
| 1037 | 1037 |
PC_ROM_MIN_VGA, |
Also available in: Unified diff