From nobody Tue Nov 4 18:44:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530340433704430.39590923612843; Fri, 29 Jun 2018 23:33:53 -0700 (PDT) Received: from localhost ([::1]:45781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9SC-0007AL-Ve for importer@patchew.org; Sat, 30 Jun 2018 02:33:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ969-0004Ca-4t for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ965-000223-Cu for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:05 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:40662) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ965-000202-16 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:01 -0400 Received: by mail-wr0-x231.google.com with SMTP id l2-v6so10069958wro.7 for ; Fri, 29 Jun 2018 23:11:00 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/bRLdf17CTL/2BKp5w1xVm6uhzgd8AXKJxmvB49fd1M=; b=QXgodEMwGGS9Gc5WAEEUamLWVsOhkNlSfkzCas7tsLOk2G9jyqBC/9S6Zxjq+pXPyr 93+6bSIHGb/OMwltUKpLzKfzHLj+k89h+vw1dvdYFY0dVOiO0t3ehFg5m9QJf4aeynui s1YeM0AqHlatszNdlwisxjvYLq1zJJeiChIR4GYXM8337s2fjtfT6HXc9c48vA2el59r 4TGgy7MZKpn/59MWG1a8dgTMohH0RDR1KMw1Uzy1pMu77k2eTcdW2TDZgoUGzwRfwVuH 6Xv6aXJlQkUs2kGr+fgujSD/Rm47YULuJPsOJSA2pD4f7qDJSb2wtLGVVF7IR1bOezIy 3SdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/bRLdf17CTL/2BKp5w1xVm6uhzgd8AXKJxmvB49fd1M=; b=jt58a6iCRKG2Suf9MPpG5xW7d+lBd0hHKOLDyZnRs/cDCjx0H57NqUaK6HSk45+R7v Ph6BjmCFcYlyLshGDnX6Kg6Et9E+JLhKZloEhJdxIoNYvgUSg7Evj8KofV+cD6B/TSPY 6YME2TC1pGUd4J2WTWJ0Cps9QUcNOdq4bYKpXqrdCa5orKquy2Rn1jucRSTlHDRvLdyn wcvXuTevo1ZzT0Vy+CxINhyx30RPS/2GIjtA3gxfawZhsLdJhC+wGrtohDmuN9bfHrXk w2AlsRQhT5zXZrFMvvdaNo/nhIgQySCO79iycVfb0h+fAoMTch7bRF0zVMNNj0gbUmf/ ZeWg== X-Gm-Message-State: APt69E0ZBVq+3fZmkHSNPmngeQn+RUehmUPVUbqIgvs86vaRGHDq57Vx poGhUJ3jkbjtOY8vnBCz/6cp1bt4 X-Google-Smtp-Source: AAOMgpdNiLLlnINUP53lnfy4hOETF6VhFDji5DuJVVxl5WWrmxAT+QYIsQRgAodVzIVkPSOGbniFEw== X-Received: by 2002:adf:ec02:: with SMTP id x2-v6mr13269152wrn.245.1530339059726; Fri, 29 Jun 2018 23:10:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:09 +0200 Message-Id: <20180630061040.6018-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::231 Subject: [Qemu-devel] [PULL 16/47] hw/display: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Reviewed-by: Gerd Hoffmann Reviewed-by: Alistair Francis Message-Id: <20180625124238.25339-15-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/display/bochs-display.c | 9 +++++---- hw/display/cirrus_vga.c | 10 +++++----- hw/display/g364fb.c | 4 ++-- hw/display/qxl.c | 30 ++++++++++++++---------------- 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 ++- include/hw/display/xlnx_dp.h | 5 +++-- 10 files changed, 41 insertions(+), 37 deletions(-) diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index 1187d77..5e0c1f1 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -5,6 +5,7 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/display/bochs-vbe.h" @@ -70,7 +71,7 @@ static uint64_t bochs_display_vbe_read(void *ptr, hwaddr = addr, case VBE_DISPI_INDEX_ID: return VBE_DISPI_ID5; case VBE_DISPI_INDEX_VIDEO_MEMORY_64K: - return s->vgamem / (64 * 1024); + return s->vgamem / (64 * KiB); } =20 if (index >=3D ARRAY_SIZE(s->vbe_regs)) { @@ -258,10 +259,10 @@ static void bochs_display_realize(PCIDevice *dev, Err= or **errp) =20 s->con =3D graphic_console_init(DEVICE(dev), 0, &bochs_display_gfx_ops= , s); =20 - if (s->vgamem < (4 * 1024 * 1024)) { + if (s->vgamem < 4 * MiB) { error_setg(errp, "bochs-display: video memory too small"); } - if (s->vgamem > (256 * 1024 * 1024)) { + if (s->vgamem > 256 * MiB) { error_setg(errp, "bochs-display: video memory too big"); } s->vgamem =3D pow2ceil(s->vgamem); @@ -323,7 +324,7 @@ static void bochs_display_exit(PCIDevice *dev) } =20 static Property bochs_display_properties[] =3D { - DEFINE_PROP_SIZE("vgamem", BochsDisplayState, vgamem, 16 * 1024 * 1024= ), + DEFINE_PROP_SIZE("vgamem", BochsDisplayState, vgamem, 16 * MiB), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 138ae96..5e44f00 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(Cirru= sVGAState *s) uint32_t content; int y, y_min, y_max; =20 - src =3D s->vga.vram_ptr + s->real_vram_size - 16 * 1024; + src =3D s->vga.vram_ptr + s->real_vram_size - 16 * KiB; if (s->vga.sr[0x12] & CIRRUS_CURSOR_LARGE) { src +=3D (s->vga.sr[0x13] & 0x3c) * 256; y_min =3D 64; @@ -2347,7 +2348,7 @@ static void cirrus_cursor_draw_line(VGACommonState *s= 1, uint8_t *d1, int scr_y) return; } =20 - src =3D s->vga.vram_ptr + s->real_vram_size - 16 * 1024; + src =3D s->vga.vram_ptr + s->real_vram_size - 16 * KiB; if (s->vga.sr[0x12] & CIRRUS_CURSOR_LARGE) { src +=3D (s->vga.sr[0x13] & 0x3c) * 256; src +=3D (scr_y - s->vga.hw_cursor_y) * 16; @@ -2995,8 +2996,7 @@ static void cirrus_init_common(CirrusVGAState *s, Obj= ect *owner, =20 /* I/O handler for LFB */ memory_region_init_io(&s->cirrus_linear_io, owner, &cirrus_linear_io_o= ps, s, - "cirrus-linear-io", s->vga.vram_size_mb - * 1024 * 1024); + "cirrus-linear-io", s->vga.vram_size_mb * MiB); memory_region_set_flush_coalesced(&s->cirrus_linear_io); =20 /* I/O handler for LFB */ @@ -3013,7 +3013,7 @@ static void cirrus_init_common(CirrusVGAState *s, Obj= ect *owner, memory_region_set_flush_coalesced(&s->cirrus_mmio_io); =20 s->real_vram_size =3D - (s->device_id =3D=3D CIRRUS_ID_CLGD5446) ? 4096 * 1024 : 2048 * 10= 24; + (s->device_id =3D=3D CIRRUS_ID_CLGD5446) ? 4 * MiB : 2 * MiB; =20 /* XXX: s->vga.vram_size must be a power of two */ s->cirrus_addr_mask =3D s->real_vram_size - 1; diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 3d75394..fbc2b24 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -18,6 +18,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "qemu/error-report.h" #include "ui/console.h" @@ -510,8 +511,7 @@ static void g364fb_sysbus_reset(DeviceState *d) } =20 static Property g364fb_sysbus_properties[] =3D { - DEFINE_PROP_UINT32("vram_size", G364SysBusState, g364.vram_size, - 8 * 1024 * 1024), + DEFINE_PROP_UINT32("vram_size", G364SysBusState, g364.vram_size, 8 * M= iB), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/display/qxl.c b/hw/display/qxl.c index a71714c..b09a039 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -19,6 +19,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include =20 #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 =3D 256; } - qxl->vgamem_size =3D qxl->vgamem_size_mb * 1024 * 1024; + qxl->vgamem_size =3D qxl->vgamem_size_mb * MiB; =20 /* vga ram (bar 0, total) */ if (qxl->ram_size_mb !=3D -1) { - qxl->vga.vram_size =3D qxl->ram_size_mb * 1024 * 1024; + qxl->vga.vram_size =3D qxl->ram_size_mb * MiB; } if (qxl->vga.vram_size < qxl->vgamem_size * 2) { qxl->vga.vram_size =3D qxl->vgamem_size * 2; @@ -2024,7 +2025,7 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) =20 /* vram32 (surfaces, 32bit, bar 1) */ if (qxl->vram32_size_mb !=3D -1) { - qxl->vram32_size =3D qxl->vram32_size_mb * 1024 * 1024; + qxl->vram32_size =3D qxl->vram32_size_mb * MiB; } if (qxl->vram32_size < 4096) { qxl->vram32_size =3D 4096; @@ -2032,7 +2033,7 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) =20 /* vram (surfaces, 64bit, bar 4+5) */ if (qxl->vram_size_mb !=3D -1) { - qxl->vram_size =3D (uint64_t)qxl->vram_size_mb * 1024 * 1024; + qxl->vram_size =3D (uint64_t)qxl->vram_size_mb * MiB; } if (qxl->vram_size < qxl->vram32_size) { qxl->vram_size =3D qxl->vram32_size; @@ -2134,13 +2135,12 @@ static void qxl_realize_common(PCIQXLDevice *qxl, E= rror **errp) } =20 /* print pci bar details */ - dprint(qxl, 1, "ram/%s: %d MB [region 0]\n", - qxl->id =3D=3D 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: %" PRId64 " MB [region 0]\n", + qxl->id =3D=3D 0 ? "pri" : "sec", qxl->vga.vram_size / MiB); + dprint(qxl, 1, "vram/32: %" PRIx64 " MB [region 1]\n", + qxl->vram32_size / MiB); + dprint(qxl, 1, "vram/64: %" PRIx64 " MB %s\n", + qxl->vram_size / MiB, qxl->vram32_size < qxl->vram_size ? "[region 4]" : "[unmapped]"= ); =20 qxl->ssd.qxl.base.sif =3D &qxl_interface.base; @@ -2167,7 +2167,7 @@ static void qxl_realize_primary(PCIDevice *dev, Error= **errp) qxl->id =3D 0; qxl_init_ramsize(qxl); vga->vbe_size =3D qxl->vgamem_size; - vga->vram_size_mb =3D qxl->vga.vram_size >> 20; + vga->vram_size_mb =3D qxl->vga.vram_size / MiB; vga_common_init(vga, OBJECT(dev), true); vga_init(vga, OBJECT(dev), pci_address_space(dev), pci_address_space_io(dev), false); @@ -2391,10 +2391,8 @@ static VMStateDescription qxl_vmstate =3D { }; =20 static Property qxl_properties[] =3D { - DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, - 64 * 1024 * 1024), - DEFINE_PROP_UINT64("vram_size", PCIQXLDevice, vram32_size, - 64 * 1024 * 1024), + DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * M= iB), + DEFINE_PROP_UINT64("vram_size", PCIQXLDevice, vram32_size, 64 * Mi= B), DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, QXL_DEFAULT_REVISION), DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0), diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index e887b45..bd58141 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" =20 -#define VGA_RAM_SIZE (8192 * 1024) +#define VGA_RAM_SIZE (8 * MiB) =20 typedef struct ISAVGAMMState { VGACommonState vga; @@ -130,7 +131,7 @@ int isa_vga_mm_init(hwaddr vram_base, =20 s =3D g_malloc0(sizeof(*s)); =20 - s->vga.vram_size_mb =3D VGA_RAM_SIZE >> 20; + s->vga.vram_size_mb =3D VGA_RAM_SIZE / MiB; vga_common_init(&s->vga, NULL, true); vga_mm_init(s, vram_base, ctrl_base, it_shift, address_space); =20 diff --git a/hw/display/vga.c b/hw/display/vga.c index ed476e4..d759918 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 ad= dr) val =3D s->vbe_regs[s->vbe_index]; } } else if (s->vbe_index =3D=3D VBE_DISPI_INDEX_VIDEO_MEMORY_64K) { - val =3D s->vbe_size / (64 * 1024); + val =3D s->vbe_size / (64 * KiB); } else { val =3D 0; } @@ -2192,7 +2193,7 @@ void vga_common_init(VGACommonState *s, Object *obj, = bool global_vmstate) =20 s->vram_size_mb =3D uint_clamp(s->vram_size_mb, 1, 512); s->vram_size_mb =3D pow2ceil(s->vram_size_mb); - s->vram_size =3D s->vram_size_mb << 20; + s->vram_size =3D s->vram_size_mb * MiB; =20 if (!s->vbe_size) { s->vbe_size =3D s->vram_size; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 2dd3c34..71a0071 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -12,6 +12,7 @@ */ =20 #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 = =3D { =20 static Property virtio_gpu_properties[] =3D { 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 * MiB= ), #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 bd3e8b3..08deb08 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_stat= e_s *s) s->fifo_next >=3D SVGA_FIFO_SIZE) { return 0; } - if (s->fifo_max < s->fifo_min + 10 * 1024) { + if (s->fifo_max < s->fifo_min + 10 * KiB) { return 0; } =20 diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 911291c..0330dc6 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -25,6 +25,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" =20 #include "hw/hw.h" #include "ui/input.h" @@ -889,7 +890,7 @@ static int fb_initialise(struct XenDevice *xendev) return rc; =20 fb_page =3D fb->c.page; - rc =3D xenfb_configure_fb(fb, videoram * 1024 * 1024U, + rc =3D xenfb_configure_fb(fb, videoram * MiB, fb_page->width, fb_page->height, fb_page->depth, fb_page->mem_length, 0, fb_page->line_length); if (rc !=3D 0) diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index ee046a5..26b759c 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" =20 #ifndef XLNX_DP_H #define XLNX_DP_H =20 -#define AUD_CHBUF_MAX_DEPTH 32768 -#define MAX_QEMU_BUFFER_SIZE 4096 +#define AUD_CHBUF_MAX_DEPTH (32 * KiB) +#define MAX_QEMU_BUFFER_SIZE (4 * KiB) =20 #define DP_CORE_REG_ARRAY_SIZE (0x3AF >> 2) #define DP_AVBUF_REG_ARRAY_SIZE (0x238 >> 2) --=20 1.8.3.1