From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmHTe-00056Z-Cw for qemu-devel@nongnu.org; Fri, 29 Nov 2013 01:23:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmHTZ-0003jv-HL for qemu-devel@nongnu.org; Fri, 29 Nov 2013 01:22:58 -0500 Received: from mail-lb0-x22b.google.com ([2a00:1450:4010:c04::22b]:64885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmHTZ-0003jm-4w for qemu-devel@nongnu.org; Fri, 29 Nov 2013 01:22:53 -0500 Received: by mail-lb0-f171.google.com with SMTP id q8so6652210lbi.16 for ; Thu, 28 Nov 2013 22:22:52 -0800 (PST) Date: Fri, 29 Nov 2013 10:30:07 +0400 From: Antony Pavlov Message-Id: <20131129103007.96e15ff7267d56cbe3d80173@gmail.com> In-Reply-To: <52977890.5060402@weilnetz.de> References: <1385620152-4368-1-git-send-email-antonynpavlov@gmail.com> <1385620152-4368-3-git-send-email-antonynpavlov@gmail.com> <52977890.5060402@weilnetz.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 2/2] hw/mips: use sizes.h macros List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: Paolo Bonzini , qemu-devel@nongnu.org, Aurelien Jarno , Richard Henderson On Thu, 28 Nov 2013 18:08:32 +0100 Stefan Weil wrote: > Am 28.11.2013 07:29, schrieb Antony Pavlov: > > Signed-off-by: Antony Pavlov > > Reviewed-by: Richard Henderson > > --- > > hw/mips/mips_malta.c | 25 +++++++++++++------------ > > include/hw/mips/bios.h | 3 ++- > > 2 files changed, 15 insertions(+), 13 deletions(-) > > > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > > index 05c8771..604832f 100644 > > --- a/hw/mips/mips_malta.c > > +++ b/hw/mips/mips_malta.c > > @@ -51,6 +51,7 @@ > > #include "sysemu/qtest.h" > > #include "qemu/error-report.h" > > #include "hw/empty_slot.h" > > +#include "qemu/sizes.h" > > =20 > > //#define DEBUG_BOARD_INIT > > =20 > > @@ -63,7 +64,7 @@ > > #define FPGA_ADDRESS 0x1f000000ULL > > #define RESET_ADDRESS 0x1fc00000ULL > > =20 > > -#define FLASH_SIZE 0x400000 > > +#define FLASH_SIZE SZ_4M > > =20 > > #define MAX_IDE_BUS 2 > > =20 > > @@ -827,8 +828,8 @@ static int64_t load_kernel (void) > > } > > =20 > > prom_set(prom_buf, prom_index++, "memsize"); > > - prom_set(prom_buf, prom_index++, "%i", > > - MIN(loaderparams.ram_size, 256 << 20)); > > + prom_set(prom_buf, prom_index++, "%li", > > + MIN(loaderparams.ram_size, SZ_256M)); > > prom_set(prom_buf, prom_index++, "modetty0"); > > prom_set(prom_buf, prom_index++, "38400n8r"); > > prom_set(prom_buf, prom_index++, NULL); > > @@ -954,10 +955,10 @@ void mips_malta_init(QEMUMachineInitArgs *args) > > env =3D &cpu->env; > > =20 > > /* allocate RAM */ > > - if (ram_size > (2048u << 20)) { > > + if (ram_size > SZ_2G) { > > fprintf(stderr, > > - "qemu: Too much memory for this machine: %d MB, maximu= m 2048 MB\n", > > - ((unsigned int)ram_size / (1 << 20))); > > + "qemu: Too much memory for this machine: %ld MB, maxim= um 2048 MB\n", > > + ((unsigned long)ram_size / SZ_1M)); > > exit(1); > > } > > =20 > > @@ -968,17 +969,17 @@ void mips_malta_init(QEMUMachineInitArgs *args) > > =20 > > /* alias for pre IO hole access */ > > memory_region_init_alias(ram_low_preio, NULL, "mips_malta_low_prei= o.ram", > > - ram_high, 0, MIN(ram_size, (256 << 20))); > > + ram_high, 0, MIN(ram_size, SZ_256M)); > > memory_region_add_subregion(system_memory, 0, ram_low_preio); > > =20 > > /* alias for post IO hole access, if there is enough RAM */ > > - if (ram_size > (512 << 20)) { > > + if (ram_size > SZ_512M) { > > ram_low_postio =3D g_new(MemoryRegion, 1); > > memory_region_init_alias(ram_low_postio, NULL, > > "mips_malta_low_postio.ram", > > - ram_high, 512 << 20, > > - ram_size - (512 << 20)); > > - memory_region_add_subregion(system_memory, 512 << 20, ram_low_= postio); > > + ram_high, SZ_512M, > > + ram_size - SZ_512M); > > + memory_region_add_subregion(system_memory, SZ_512M, ram_low_po= stio); > > } > > =20 > > /* generate SPD EEPROM data */ > > @@ -1012,7 +1013,7 @@ void mips_malta_init(QEMUMachineInitArgs *args) > > fl_idx++; > > if (kernel_filename) { > > /* Write a small bootloader to the flash location. */ > > - loaderparams.ram_size =3D MIN(ram_size, 256 << 20); > > + loaderparams.ram_size =3D MIN(ram_size, SZ_256M); > > loaderparams.kernel_filename =3D kernel_filename; > > loaderparams.kernel_cmdline =3D kernel_cmdline; > > loaderparams.initrd_filename =3D initrd_filename; > > diff --git a/include/hw/mips/bios.h b/include/hw/mips/bios.h > > index b4b88ac..3d7da4b 100644 > > --- a/include/hw/mips/bios.h > > +++ b/include/hw/mips/bios.h > > @@ -1,6 +1,7 @@ > > #include "cpu.h" > > +#include "qemu/sizes.h" > > =20 > > -#define BIOS_SIZE (4 * 1024 * 1024) > > +#define BIOS_SIZE SZ_4M > > #ifdef TARGET_WORDS_BIGENDIAN > > #define BIOS_FILENAME "mips_bios.bin" > > #else >=20 >=20 > What about using (256 * MiB) instead of SZ_256M or (256 << 20)? SZ_256 > is better than the last variant, but I prefer the first variant even > more. It is used in QEMU since a long time (for example in eepro100.c > and vdi.c). >=20 > Of course the definitions for KiB, MiB, GiB, TiB should be moved from > their current locations to a common header file (I suggest > qemu-common.h) if we agree on using them everywhere. >=20 > The SZ_xxx macros might be useful nevertheless, but do we need a new > header file, or could they be added to bitops.h? sizes.h is widely used inside linux kernel, u-boot and barebox so it is a d= e facto standard header file. IMHO it's better to keep it as a separate hea= der file. --=A0 Best regards, =A0 Antony Pavlov