Commit d471bf3e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw/i386: Use the IEC binary prefix definitions 



It eases code review, unit is explicit.

Patch generated using:

  $ git grep -E '[<>][<>]=? ?[1-5]0' hw/ include/hw/

and modified manually.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ab3dd749

hw/i386/acpi-build.c

+2 −2
Original line number Diff line number Diff line
@@ -2248,8 +2248,8 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) 
                 (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL);

}



#define HOLE_640K_START  (640 * 1024)

#define HOLE_640K_END   (1024 * 1024)

#define HOLE_640K_START  (640 * KiB)

#define HOLE_640K_END   (1 * MiB)



static void build_srat_hotpluggable_memory(GArray *table_data, uint64_t base,

                                           uint64_t len, int default_node)

hw/i386/pc.c

+12 −11
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "hw/hw.h"

#include "hw/i386/pc.h"

#include "hw/char/serial.h"
@@ -448,12 +449,12 @@ void pc_cmos_init(PCMachineState *pcms, 


    /* memory size */

    /* base memory (first MiB) */

    val = MIN(pcms->below_4g_mem_size / 1024, 640);

    val = MIN(pcms->below_4g_mem_size / KiB, 640);

    rtc_set_memory(s, 0x15, val);

    rtc_set_memory(s, 0x16, val >> 8);

    /* extended memory (next 64MiB) */

    if (pcms->below_4g_mem_size > 1024 * 1024) {

        val = (pcms->below_4g_mem_size - 1024 * 1024) / 1024;

    if (pcms->below_4g_mem_size > 1 * MiB) {

        val = (pcms->below_4g_mem_size - 1 * MiB) / KiB;

    } else {

        val = 0;

    }
@@ -464,8 +465,8 @@ void pc_cmos_init(PCMachineState *pcms, 
    rtc_set_memory(s, 0x30, val);

    rtc_set_memory(s, 0x31, val >> 8);

    /* memory between 16MiB and 4GiB */

    if (pcms->below_4g_mem_size > 16 * 1024 * 1024) {

        val = (pcms->below_4g_mem_size - 16 * 1024 * 1024) / 65536;

    if (pcms->below_4g_mem_size > 16 * MiB) {

        val = (pcms->below_4g_mem_size - 16 * MiB) / (64 * KiB);

    } else {

        val = 0;

    }
@@ -1392,11 +1393,11 @@ void pc_memory_init(PCMachineState *pcms, 
        }



        machine->device_memory->base =

            ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, 1ULL << 30);

            ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, 1 * GiB);



        if (pcmc->enforce_aligned_dimm) {

            /* size device region assuming 1G page max alignment per slot */

            device_mem_size += (1ULL << 30) * machine->ram_slots;

            device_mem_size += (1 * GiB) * machine->ram_slots;

        }



        if ((machine->device_memory->base + device_mem_size) <
@@ -1438,7 +1439,7 @@ void pc_memory_init(PCMachineState *pcms, 
        if (!pcmc->broken_reserved_end) {

            res_mem_end += memory_region_size(&machine->device_memory->mr);

        }

        *val = cpu_to_le64(ROUND_UP(res_mem_end, 0x1ULL << 30));

        *val = cpu_to_le64(ROUND_UP(res_mem_end, 1 * GiB));

        fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val));

    }
@@ -1475,7 +1476,7 @@ uint64_t pc_pci_hole64_start(void) 
        hole64_start = 0x100000000ULL + pcms->above_4g_mem_size;

    }



    return ROUND_UP(hole64_start, 1ULL << 30);

    return ROUND_UP(hole64_start, 1 * GiB);

}



qemu_irq pc_allocate_cpu_irq(void)
@@ -2095,7 +2096,7 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, 
        error_propagate(errp, error);

        return;

    }

    if (value > (1ULL << 32)) {

    if (value > 4 * GiB) {

        error_setg(&error,

                   "Machine option 'max-ram-below-4g=%"PRIu64

                   "' expects size less than or equal to 4G", value);
@@ -2103,7 +2104,7 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, 
        return;

    }



    if (value < (1ULL << 20)) {

    if (value < 1 * MiB) {

        warn_report("Only %" PRIu64 " bytes of RAM below the 4GiB boundary,"

                    "BIOS may not work with less than 1MiB", value);

    }

hw/i386/pc_piix.c

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include "qemu/osdep.h"



#include "qemu/units.h"

#include "hw/hw.h"

#include "hw/loader.h"

#include "hw/i386/pc.h"
@@ -131,7 +132,7 @@ static void pc_init1(MachineState *machine, 
                if (lowmem > 0xc0000000) {

                    lowmem = 0xc0000000;

                }

                if (lowmem & ((1ULL << 30) - 1)) {

                if (lowmem & (1 * GiB - 1)) {

                    warn_report("Large machine and max_ram_below_4g "

                                "(%" PRIu64 ") not a multiple of 1G; "

                                "possible bad performance.",

hw/i386/pc_q35.c

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "hw/hw.h"

#include "hw/loader.h"

#include "sysemu/arch_init.h"
@@ -105,7 +106,7 @@ static void pc_q35_init(MachineState *machine) 
    if (lowmem > pcms->max_ram_below_4g) {

        lowmem = pcms->max_ram_below_4g;

        if (machine->ram_size - lowmem > lowmem &&

            lowmem & ((1ULL << 30) - 1)) {

            lowmem & (1 * GiB - 1)) {

            warn_report("There is possibly poor performance as the ram size "

                        " (0x%" PRIx64 ") is more then twice the size of"

                        " max-ram-below-4g (%"PRIu64") and"

hw/i386/pc_sysfw.c

+4 −6
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "sysemu/block-backend.h"

#include "qemu/error-report.h"

#include "qemu/option.h"

#include "qemu/units.h"

#include "hw/sysbus.h"

#include "hw/hw.h"

#include "hw/i386/pc.h"
@@ -56,7 +57,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory, 
    flash_size = memory_region_size(flash_mem);



    /* map the last 128KB of the BIOS in ISA space */

    isa_bios_size = MIN(flash_size, 128 * 1024);

    isa_bios_size = MIN(flash_size, 128 * KiB);

    isa_bios = g_malloc(sizeof(*isa_bios));

    memory_region_init_ram(isa_bios, NULL, "isa-bios", isa_bios_size,

                           &error_fatal);
@@ -83,7 +84,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory, 
 * only 18MB-4KB below 4G. For now, restrict the cumulative mapping to 8MB in

 * size.

 */

#define FLASH_MAP_BASE_MIN ((hwaddr)(0x100000000ULL - 8*1024*1024))

#define FLASH_MAP_BASE_MIN ((hwaddr)(4 * GiB - 8 * MiB))



/* This function maps flash drives from 4G downward, in order of their unit

 * numbers. The mapping starts at unit#0, with unit number increments of 1, and
@@ -221,10 +222,7 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) 
    g_free(filename);



    /* map the last 128KB of the BIOS in ISA space */

    isa_bios_size = bios_size;

    if (isa_bios_size > (128 * 1024)) {

        isa_bios_size = 128 * 1024;

    }

    isa_bios_size = MIN(bios_size, 128 * KiB);

    isa_bios = g_malloc(sizeof(*isa_bios));

    memory_region_init_alias(isa_bios, NULL, "isa-bios", bios,

                             bios_size - isa_bios_size, isa_bios_size);