On Sun, Apr 15, 2018 at 4:42 PM, Philippe Mathieu-Daudé <f4...@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é <f4...@amsat.org> > Reviewed-by: Gerd Hoffmann <kra...@redhat.com>
Reviewed-by: Alistair Francis <alistair.fran...@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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
