Message ID | 20180415234307.28132-1-f4bug@amsat.org |
---|---|
Headers | show |
Series | hw: Use the BYTE-based definitions when useful | expand |
On 16/04/2018 2:42, Philippe Mathieu-Daudé wrote: > It eases code review, unit is explicit. > > Patch generated using: > > $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ > > and modified manually. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/i386/ich9.h | 3 ++- > hw/i386/acpi-build.c | 5 +++-- > hw/i386/pc.c | 19 ++++++++++--------- > hw/i386/pc_piix.c | 4 ++-- > hw/i386/pc_q35.c | 3 ++- > hw/i386/pc_sysfw.c | 9 +++++---- > hw/intc/apic_common.c | 3 ++- > hw/pci-host/piix.c | 5 +++-- > hw/pci-host/q35.c | 17 +++++++++-------- > 9 files changed, 38 insertions(+), 30 deletions(-) > > diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h > index 673d13d28f..9615c61b15 100644 > --- a/include/hw/i386/ich9.h > +++ b/include/hw/i386/ich9.h > @@ -1,6 +1,7 @@ > #ifndef HW_ICH9_H > #define HW_ICH9_H > > +#include "qemu/units.h" > #include "hw/hw.h" > #include "hw/isa/isa.h" > #include "hw/sysbus.h" > @@ -22,7 +23,7 @@ I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base); > > void ich9_generate_smi(void); > > -#define ICH9_CC_SIZE (16 * 1024) /* 16KB. Chipset configuration registers */ > +#define ICH9_CC_SIZE (16 * K_BYTE) /* Chipset configuration registers */ > > #define TYPE_ICH9_LPC_DEVICE "ICH9-LPC" > #define ICH9_LPC_DEVICE(obj) \ > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 3cf2a1679c..3fdd273aa2 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -21,6 +21,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "qapi/error.h" > #include "qapi/qmp/qnum.h" > #include "acpi-build.h" > @@ -2247,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 * K_BYTE) > +#define HOLE_640K_END (1024 * K_BYTE) > > static void build_srat_hotpluggable_memory(GArray *table_data, uint64_t base, > uint64_t len, int default_node) > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index d36bac8c89..84880e7e67 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -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" > @@ -453,8 +454,8 @@ void pc_cmos_init(PCMachineState *pcms, > 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 * M_BYTE) { > + val = (pcms->below_4g_mem_size - 1 * M_BYTE) / 1024; > } else { > val = 0; > } > @@ -465,8 +466,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 * M_BYTE) { > + val = (pcms->below_4g_mem_size - 16 * M_BYTE) / 65536; > } else { > val = 0; > } > @@ -1391,11 +1392,11 @@ void pc_memory_init(PCMachineState *pcms, > } > > pcms->hotplug_memory.base = > - ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, 1ULL << 30); > + ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, G_BYTE); > > if (pcmc->enforce_aligned_dimm) { > /* size hotplug region assuming 1G page max alignment per slot */ > - hotplug_mem_size += (1ULL << 30) * machine->ram_slots; > + hotplug_mem_size += machine->ram_slots * G_BYTE; > } > > if ((pcms->hotplug_memory.base + hotplug_mem_size) < > @@ -1437,7 +1438,7 @@ void pc_memory_init(PCMachineState *pcms, > if (!pcmc->broken_reserved_end) { > res_mem_end += memory_region_size(&pcms->hotplug_memory.mr); > } > - *val = cpu_to_le64(ROUND_UP(res_mem_end, 0x1ULL << 30)); > + *val = cpu_to_le64(ROUND_UP(res_mem_end, G_BYTE)); > fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val)); > } > > @@ -1473,7 +1474,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, G_BYTE); > } > > qemu_irq pc_allocate_cpu_irq(void) > @@ -2109,7 +2110,7 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, > return; > } > > - if (value < (1ULL << 20)) { > + if (value < 1 * M_BYTE) { > warn_report("Only %" PRIu64 " bytes of RAM below the 4GiB boundary," > "BIOS may not work with less than 1MiB", value); > } > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 729a0508aa..5e24c42d0d 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -23,7 +23,7 @@ > */ > > #include "qemu/osdep.h" > - > +#include "qemu/units.h" > #include "hw/hw.h" > #include "hw/loader.h" > #include "hw/i386/pc.h" > @@ -130,7 +130,7 @@ static void pc_init1(MachineState *machine, > if (lowmem > 0xc0000000) { > lowmem = 0xc0000000; > } > - if (lowmem & ((1ULL << 30) - 1)) { > + if (lowmem & ((1 * G_BYTE) - 1)) { Hi Philippe, You stripped the parentheses from other places, but not from here ... > warn_report("Large machine and max_ram_below_4g " > "(%" PRIu64 ") not a multiple of 1G; " > "possible bad performance.", > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 9ae916327e..d19d6eaa00 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -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" > @@ -104,7 +105,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 * G_BYTE) - 1)) { ... and here Not a big issue, of course. Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel > 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" > diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c > index 73ac783f20..ded2aabb81 100644 > --- a/hw/i386/pc_sysfw.c > +++ b/hw/i386/pc_sysfw.c > @@ -24,6 +24,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "qapi/error.h" > #include "sysemu/block-backend.h" > #include "qemu/error-report.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 * K_BYTE); > 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)(0x100000000ULL - 8 * M_BYTE)) > > /* 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 > @@ -222,8 +223,8 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) > > /* 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; > + if (isa_bios_size > 128 * K_BYTE) { > + isa_bios_size = 128 * K_BYTE; > } > isa_bios = g_malloc(sizeof(*isa_bios)); > memory_region_init_alias(isa_bios, NULL, "isa-bios", bios, > diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c > index 78903ea909..f9dfacf48d 100644 > --- a/hw/intc/apic_common.c > +++ b/hw/intc/apic_common.c > @@ -18,6 +18,7 @@ > * License along with this library; if not, see <http://www.gnu.org/licenses/> > */ > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > #include "qemu-common.h" > @@ -319,7 +320,7 @@ static void apic_common_realize(DeviceState *dev, Error **errp) > > /* Note: We need at least 1M to map the VAPIC option ROM */ > if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && > - !hax_enabled() && ram_size >= 1024 * 1024) { > + !hax_enabled() && ram_size >= 1 * M_BYTE) { > vapic = sysbus_create_simple("kvmvapic", -1, NULL); > } > s->vapic = vapic; > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index 0e608347c1..8e469c91b8 100644 > --- a/hw/pci-host/piix.c > +++ b/hw/pci-host/piix.c > @@ -23,6 +23,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "hw/hw.h" > #include "hw/i386/pc.h" > #include "hw/pci/pci.h" > @@ -284,7 +285,7 @@ static void i440fx_pcihost_get_pci_hole64_end(Object *obj, Visitor *v, > > pci_bus_get_w64_range(h->bus, &w64); > value = range_is_empty(&w64) ? 0 : range_upb(&w64) + 1; > - hole64_end = ROUND_UP(hole64_start + s->pci_hole64_size, 1ULL << 30); > + hole64_end = ROUND_UP(hole64_start + s->pci_hole64_size, G_BYTE); > if (s->pci_hole64_fix && value < hole64_end) { > value = hole64_end; > } > @@ -430,7 +431,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, > > *piix3_devfn = piix3->dev.devfn; > > - ram_size = ram_size / 8 / 1024 / 1024; > + ram_size /= 8 * M_BYTE; > if (ram_size > 255) { > ram_size = 255; > } > diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c > index a36a1195e4..280b5403d0 100644 > --- a/hw/pci-host/q35.c > +++ b/hw/pci-host/q35.c > @@ -28,6 +28,7 @@ > * THE SOFTWARE. > */ > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "hw/hw.h" > #include "hw/pci-host/q35.h" > #include "qapi/error.h" > @@ -144,7 +145,7 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v, > > pci_bus_get_w64_range(h->bus, &w64); > value = range_is_empty(&w64) ? 0 : range_upb(&w64) + 1; > - hole64_end = ROUND_UP(hole64_start + s->mch.pci_hole64_size, 1ULL << 30); > + hole64_end = ROUND_UP(hole64_start + s->mch.pci_hole64_size, G_BYTE); > if (s->pci_hole64_fix && value < hole64_end) { > value = hole64_end; > } > @@ -310,15 +311,15 @@ static void mch_update_pciexbar(MCHPCIState *mch) > addr_mask = MCH_HOST_BRIDGE_PCIEXBAR_ADMSK; > switch (pciexbar & MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_MASK) { > case MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_256M: > - length = 256 * 1024 * 1024; > + length = 256 * M_BYTE; > break; > case MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_128M: > - length = 128 * 1024 * 1024; > + length = 128 * M_BYTE; > addr_mask |= MCH_HOST_BRIDGE_PCIEXBAR_128ADMSK | > MCH_HOST_BRIDGE_PCIEXBAR_64ADMSK; > break; > case MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_64M: > - length = 64 * 1024 * 1024; > + length = 64 * M_BYTE; > addr_mask |= MCH_HOST_BRIDGE_PCIEXBAR_64ADMSK; > break; > case MCH_HOST_BRIDGE_PCIEXBAR_LENGTH_RVD: > @@ -396,16 +397,16 @@ static void mch_update_smram(MCHPCIState *mch) > switch (pd->config[MCH_HOST_BRIDGE_ESMRAMC] & > MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_MASK) { > case MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_1MB: > - tseg_size = 1024 * 1024; > + tseg_size = 1 * M_BYTE; > break; > case MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_2MB: > - tseg_size = 1024 * 1024 * 2; > + tseg_size = 2 * M_BYTE; > break; > case MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_8MB: > - tseg_size = 1024 * 1024 * 8; > + tseg_size = 8 * M_BYTE; > break; > default: > - tseg_size = 1024 * 1024 * (uint32_t)mch->ext_tseg_mbytes; > + tseg_size = (uint32_t)mch->ext_tseg_mbytes * M_BYTE; > break; > } > } else { >
On Sun, Apr 15, 2018 at 4:42 PM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > It eases code review, unit is explicit. > > Patch generated using: > > $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ > > and modified manually. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > include/hw/display/xlnx_dp.h | 5 +++-- > hw/display/cirrus_vga.c | 10 +++++----- > hw/display/g364fb.c | 3 ++- > hw/display/qxl.c | 27 ++++++++++++--------------- > hw/display/sm501.c | 2 +- > hw/display/vga-isa-mm.c | 5 +++-- > hw/display/vga.c | 5 +++-- > hw/display/virtio-gpu.c | 4 ++-- > hw/display/vmware_vga.c | 3 ++- > hw/display/xenfb.c | 3 ++- > 10 files changed, 35 insertions(+), 32 deletions(-) > > diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h > index ee046a5fac..8fb604dee0 100644 > --- a/include/hw/display/xlnx_dp.h > +++ b/include/hw/display/xlnx_dp.h > @@ -29,14 +29,15 @@ > #include "hw/display/dpcd.h" > #include "hw/i2c/i2c-ddc.h" > #include "qemu/fifo8.h" > +#include "qemu/units.h" > #include "hw/dma/xlnx_dpdma.h" > #include "audio/audio.h" > > #ifndef XLNX_DP_H > #define XLNX_DP_H > > -#define AUD_CHBUF_MAX_DEPTH 32768 > -#define MAX_QEMU_BUFFER_SIZE 4096 > +#define AUD_CHBUF_MAX_DEPTH (32 * K_BYTE) > +#define MAX_QEMU_BUFFER_SIZE (4 * K_BYTE) > > #define DP_CORE_REG_ARRAY_SIZE (0x3AF >> 2) > #define DP_AVBUF_REG_ARRAY_SIZE (0x238 >> 2) > diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c > index 138ae961b9..b6d6263297 100644 > --- a/hw/display/cirrus_vga.c > +++ b/hw/display/cirrus_vga.c > @@ -27,6 +27,7 @@ > * available at http://home.worldonline.dk/~finth/ > */ > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "qapi/error.h" > #include "trace.h" > #include "hw/hw.h" > @@ -2218,7 +2219,7 @@ static inline void cirrus_cursor_compute_yrange(CirrusVGAState *s) > uint32_t content; > int y, y_min, y_max; > > - src = s->vga.vram_ptr + s->real_vram_size - 16 * 1024; > + src = s->vga.vram_ptr + s->real_vram_size - 16 * K_BYTE; > if (s->vga.sr[0x12] & CIRRUS_CURSOR_LARGE) { > src += (s->vga.sr[0x13] & 0x3c) * 256; > y_min = 64; > @@ -2347,7 +2348,7 @@ static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y) > return; > } > > - src = s->vga.vram_ptr + s->real_vram_size - 16 * 1024; > + src = s->vga.vram_ptr + s->real_vram_size - 16 * K_BYTE; > if (s->vga.sr[0x12] & CIRRUS_CURSOR_LARGE) { > src += (s->vga.sr[0x13] & 0x3c) * 256; > src += (scr_y - s->vga.hw_cursor_y) * 16; > @@ -2995,8 +2996,7 @@ static void cirrus_init_common(CirrusVGAState *s, Object *owner, > > /* I/O handler for LFB */ > memory_region_init_io(&s->cirrus_linear_io, owner, &cirrus_linear_io_ops, s, > - "cirrus-linear-io", s->vga.vram_size_mb > - * 1024 * 1024); > + "cirrus-linear-io", s->vga.vram_size_mb * M_BYTE); > memory_region_set_flush_coalesced(&s->cirrus_linear_io); > > /* I/O handler for LFB */ > @@ -3013,7 +3013,7 @@ static void cirrus_init_common(CirrusVGAState *s, Object *owner, > memory_region_set_flush_coalesced(&s->cirrus_mmio_io); > > s->real_vram_size = > - (s->device_id == CIRRUS_ID_CLGD5446) ? 4096 * 1024 : 2048 * 1024; > + (s->device_id == CIRRUS_ID_CLGD5446) ? 4 * M_BYTE : 2 * M_BYTE; > > /* XXX: s->vga.vram_size must be a power of two */ > s->cirrus_addr_mask = s->real_vram_size - 1; > diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c > index 3d75394e77..2e7af33427 100644 > --- a/hw/display/g364fb.c > +++ b/hw/display/g364fb.c > @@ -18,6 +18,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "hw/hw.h" > #include "qemu/error-report.h" > #include "ui/console.h" > @@ -511,7 +512,7 @@ static void g364fb_sysbus_reset(DeviceState *d) > > static Property g364fb_sysbus_properties[] = { > DEFINE_PROP_UINT32("vram_size", G364SysBusState, g364.vram_size, > - 8 * 1024 * 1024), > + 8 * M_BYTE), > DEFINE_PROP_END_OF_LIST(), > }; > > diff --git a/hw/display/qxl.c b/hw/display/qxl.c > index a71714ccb4..f0340ae355 100644 > --- a/hw/display/qxl.c > +++ b/hw/display/qxl.c > @@ -19,6 +19,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include <zlib.h> > > #include "qapi/error.h" > @@ -2012,11 +2013,11 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) > if (qxl->vgamem_size_mb > 256) { > qxl->vgamem_size_mb = 256; > } > - qxl->vgamem_size = qxl->vgamem_size_mb * 1024 * 1024; > + qxl->vgamem_size = qxl->vgamem_size_mb * M_BYTE; > > /* vga ram (bar 0, total) */ > if (qxl->ram_size_mb != -1) { > - qxl->vga.vram_size = qxl->ram_size_mb * 1024 * 1024; > + qxl->vga.vram_size = qxl->ram_size_mb * M_BYTE; > } > if (qxl->vga.vram_size < qxl->vgamem_size * 2) { > qxl->vga.vram_size = qxl->vgamem_size * 2; > @@ -2024,7 +2025,7 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) > > /* vram32 (surfaces, 32bit, bar 1) */ > if (qxl->vram32_size_mb != -1) { > - qxl->vram32_size = qxl->vram32_size_mb * 1024 * 1024; > + qxl->vram32_size = qxl->vram32_size_mb * M_BYTE; > } > if (qxl->vram32_size < 4096) { > qxl->vram32_size = 4096; > @@ -2032,7 +2033,7 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) > > /* vram (surfaces, 64bit, bar 4+5) */ > if (qxl->vram_size_mb != -1) { > - qxl->vram_size = (uint64_t)qxl->vram_size_mb * 1024 * 1024; > + qxl->vram_size = (uint64_t)qxl->vram_size_mb * M_BYTE; > } > if (qxl->vram_size < qxl->vram32_size) { > qxl->vram_size = qxl->vram32_size; > @@ -2134,13 +2135,10 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp) > } > > /* print pci bar details */ > - dprint(qxl, 1, "ram/%s: %d MB [region 0]\n", > - qxl->id == 0 ? "pri" : "sec", > - qxl->vga.vram_size / (1024*1024)); > - dprint(qxl, 1, "vram/32: %" PRIx64 "d MB [region 1]\n", > - qxl->vram32_size / (1024*1024)); > - dprint(qxl, 1, "vram/64: %" PRIx64 "d MB %s\n", > - qxl->vram_size / (1024*1024), > + dprint(qxl, 1, "ram/%s: %llu MB [region 0]\n", > + qxl->id == 0 ? "pri" : "sec", qxl->vga.vram_size / M_BYTE); > + dprint(qxl, 1, "vram/32: %llu MB [region 1]\n", qxl->vram32_size / M_BYTE); > + dprint(qxl, 1, "vram/64: %llu MB %s\n", qxl->vram_size / M_BYTE, > qxl->vram32_size < qxl->vram_size ? "[region 4]" : "[unmapped]"); > > qxl->ssd.qxl.base.sif = &qxl_interface.base; > @@ -2167,7 +2165,7 @@ static void qxl_realize_primary(PCIDevice *dev, Error **errp) > qxl->id = 0; > qxl_init_ramsize(qxl); > vga->vbe_size = qxl->vgamem_size; > - vga->vram_size_mb = qxl->vga.vram_size >> 20; > + vga->vram_size_mb = qxl->vga.vram_size / M_BYTE; > vga_common_init(vga, OBJECT(dev), true); > vga_init(vga, OBJECT(dev), > pci_address_space(dev), pci_address_space_io(dev), false); > @@ -2392,9 +2390,8 @@ static VMStateDescription qxl_vmstate = { > > static Property qxl_properties[] = { > DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, > - 64 * 1024 * 1024), > - DEFINE_PROP_UINT64("vram_size", PCIQXLDevice, vram32_size, > - 64 * 1024 * 1024), > + 64 * M_BYTE), > + DEFINE_PROP_UINT64("vram_size", PCIQXLDevice, vram32_size, 64 * M_BYTE), > DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, > QXL_DEFAULT_REVISION), > DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0), > diff --git a/hw/display/sm501.c b/hw/display/sm501.c > index f4bb33c279..0450c2dd25 100644 > --- a/hw/display/sm501.c > +++ b/hw/display/sm501.c > @@ -24,7 +24,7 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu/cutils.h" > +#include "qemu/units.h" > #include "qapi/error.h" > #include "qemu-common.h" > #include "cpu.h" > diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c > index e887b45651..e7ef62e434 100644 > --- a/hw/display/vga-isa-mm.c > +++ b/hw/display/vga-isa-mm.c > @@ -22,12 +22,13 @@ > * THE SOFTWARE. > */ > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "hw/hw.h" > #include "hw/display/vga.h" > #include "vga_int.h" > #include "ui/pixel_ops.h" > > -#define VGA_RAM_SIZE (8192 * 1024) > +#define VGA_RAM_SIZE (8 * M_BYTE) > > typedef struct ISAVGAMMState { > VGACommonState vga; > @@ -130,7 +131,7 @@ int isa_vga_mm_init(hwaddr vram_base, > > s = g_malloc0(sizeof(*s)); > > - s->vga.vram_size_mb = VGA_RAM_SIZE >> 20; > + s->vga.vram_size_mb = VGA_RAM_SIZE / M_BYTE; > vga_common_init(&s->vga, NULL, true); > vga_mm_init(s, vram_base, ctrl_base, it_shift, address_space); > > diff --git a/hw/display/vga.c b/hw/display/vga.c > index 72181330b8..848f8986e7 100644 > --- a/hw/display/vga.c > +++ b/hw/display/vga.c > @@ -22,6 +22,7 @@ > * THE SOFTWARE. > */ > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "qapi/error.h" > #include "hw/hw.h" > #include "hw/display/vga.h" > @@ -721,7 +722,7 @@ uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr) > val = s->vbe_regs[s->vbe_index]; > } > } else if (s->vbe_index == VBE_DISPI_INDEX_VIDEO_MEMORY_64K) { > - val = s->vbe_size / (64 * 1024); > + val = s->vbe_size / (64 * K_BYTE); > } else { > val = 0; > } > @@ -2177,7 +2178,7 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) > > s->vram_size_mb = uint_clamp(s->vram_size_mb, 1, 512); > s->vram_size_mb = pow2ceil(s->vram_size_mb); > - s->vram_size = s->vram_size_mb << 20; > + s->vram_size = s->vram_size_mb * M_BYTE; > > if (!s->vbe_size) { > s->vbe_size = s->vram_size; > diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c > index 2dd3c3481a..7bfa61faf4 100644 > --- a/hw/display/virtio-gpu.c > +++ b/hw/display/virtio-gpu.c > @@ -12,6 +12,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "qemu-common.h" > #include "qemu/iov.h" > #include "ui/console.h" > @@ -1314,8 +1315,7 @@ static const VMStateDescription vmstate_virtio_gpu = { > > static Property virtio_gpu_properties[] = { > DEFINE_PROP_UINT32("max_outputs", VirtIOGPU, conf.max_outputs, 1), > - DEFINE_PROP_SIZE("max_hostmem", VirtIOGPU, conf.max_hostmem, > - 256 * 1024 * 1024), > + DEFINE_PROP_SIZE("max_hostmem", VirtIOGPU, conf.max_hostmem, 256 * M_BYTE), > #ifdef CONFIG_VIRGL > DEFINE_PROP_BIT("virgl", VirtIOGPU, conf.flags, > VIRTIO_GPU_FLAG_VIRGL_ENABLED, true), > diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c > index bd3e8b3586..aebba3bfd8 100644 > --- a/hw/display/vmware_vga.c > +++ b/hw/display/vmware_vga.c > @@ -22,6 +22,7 @@ > * THE SOFTWARE. > */ > #include "qemu/osdep.h" > +#include "qemu/units.h" > #include "qapi/error.h" > #include "hw/hw.h" > #include "hw/loader.h" > @@ -565,7 +566,7 @@ static inline int vmsvga_fifo_length(struct vmsvga_state_s *s) > s->fifo_next >= SVGA_FIFO_SIZE) { > return 0; > } > - if (s->fifo_max < s->fifo_min + 10 * 1024) { > + if (s->fifo_max < s->fifo_min + 10 * K_BYTE) { > return 0; > } > > diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c > index f5afcc0358..8156fd262f 100644 > --- a/hw/display/xenfb.c > +++ b/hw/display/xenfb.c > @@ -25,6 +25,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/units.h" > > #include "hw/hw.h" > #include "ui/input.h" > @@ -889,7 +890,7 @@ static int fb_initialise(struct XenDevice *xendev) > return rc; > > fb_page = fb->c.page; > - rc = xenfb_configure_fb(fb, videoram * 1024 * 1024U, > + rc = xenfb_configure_fb(fb, videoram * M_BYTE, > fb_page->width, fb_page->height, fb_page->depth, > fb_page->mem_length, 0, fb_page->line_length); > if (rc != 0) > -- > 2.17.0 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xenproject.org > https://lists.xenproject.org/mailman/listinfo/xen-devel