From: Paolo Bonzini <pbonzini@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Radoslaw Biernacki <radoslaw.biernacki@linaro.org>,
qemu-riscv@nongnu.org, qemu-block@nongnu.org,
Sagar Karandikar <sagark@eecs.berkeley.edu>,
"Michael S. Tsirkin" <mst@redhat.com>,
Bastian Koppelmann <kbastian@mail.uni-paderborn.de>,
Eduardo Habkost <ehabkost@redhat.com>,
Max Reitz <mreitz@redhat.com>,
qemu-arm@nongnu.org, Alistair Francis <Alistair.Francis@wdc.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Leif Lindholm <leif@nuviainc.com>,
Richard Henderson <rth@twiddle.net>
Subject: Re: [PATCH] hw: Use QEMU_IS_ALIGNED() on parallel flash block size
Date: Mon, 18 May 2020 14:49:45 +0200 [thread overview]
Message-ID: <60f129c2-499d-01e1-e0ee-9fd6ac759736@redhat.com> (raw)
In-Reply-To: <20200511205246.24621-1-philmd@redhat.com>
On 11/05/20 22:52, Philippe Mathieu-Daudé wrote:
> Use the QEMU_IS_ALIGNED() macro to verify the flash block size
> is properly aligned. It is quicker to process when reviewing.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/arm/sbsa-ref.c | 2 +-
> hw/arm/virt.c | 2 +-
> hw/block/pflash_cfi01.c | 2 +-
> hw/block/pflash_cfi02.c | 2 +-
> hw/i386/pc_sysfw.c | 2 +-
> hw/riscv/virt.c | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
> index 8409ba853d..b379e4a76a 100644
> --- a/hw/arm/sbsa-ref.c
> +++ b/hw/arm/sbsa-ref.c
> @@ -241,7 +241,7 @@ static void sbsa_flash_map1(PFlashCFI01 *flash,
> {
> DeviceState *dev = DEVICE(flash);
>
> - assert(size % SBSA_FLASH_SECTOR_SIZE == 0);
> + assert(QEMU_IS_ALIGNED(size, SBSA_FLASH_SECTOR_SIZE));
> assert(size / SBSA_FLASH_SECTOR_SIZE <= UINT32_MAX);
> qdev_prop_set_uint32(dev, "num-blocks", size / SBSA_FLASH_SECTOR_SIZE);
> qdev_init_nofail(dev);
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 634db0cfe9..0a99fddb3d 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -978,7 +978,7 @@ static void virt_flash_map1(PFlashCFI01 *flash,
> {
> DeviceState *dev = DEVICE(flash);
>
> - assert(size % VIRT_FLASH_SECTOR_SIZE == 0);
> + assert(QEMU_IS_ALIGNED(size, VIRT_FLASH_SECTOR_SIZE));
> assert(size / VIRT_FLASH_SECTOR_SIZE <= UINT32_MAX);
> qdev_prop_set_uint32(dev, "num-blocks", size / VIRT_FLASH_SECTOR_SIZE);
> qdev_init_nofail(dev);
> diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
> index f586bac269..11922c0f96 100644
> --- a/hw/block/pflash_cfi01.c
> +++ b/hw/block/pflash_cfi01.c
> @@ -964,7 +964,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,
> if (blk) {
> qdev_prop_set_drive(dev, "drive", blk, &error_abort);
> }
> - assert(size % sector_len == 0);
> + assert(QEMU_IS_ALIGNED(size, sector_len));
> qdev_prop_set_uint32(dev, "num-blocks", size / sector_len);
> qdev_prop_set_uint64(dev, "sector-length", sector_len);
> qdev_prop_set_uint8(dev, "width", bank_width);
> diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
> index c6b6f2d082..895f7daee3 100644
> --- a/hw/block/pflash_cfi02.c
> +++ b/hw/block/pflash_cfi02.c
> @@ -1003,7 +1003,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,
> if (blk) {
> qdev_prop_set_drive(dev, "drive", blk, &error_abort);
> }
> - assert(size % sector_len == 0);
> + assert(QEMU_IS_ALIGNED(size, sector_len));
> qdev_prop_set_uint32(dev, "num-blocks", size / sector_len);
> qdev_prop_set_uint32(dev, "sector-length", sector_len);
> qdev_prop_set_uint8(dev, "width", width);
> diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
> index f5f3f466b0..fad41f0e73 100644
> --- a/hw/i386/pc_sysfw.c
> +++ b/hw/i386/pc_sysfw.c
> @@ -168,7 +168,7 @@ static void pc_system_flash_map(PCMachineState *pcms,
> blk_name(blk), strerror(-size));
> exit(1);
> }
> - if (size == 0 || size % FLASH_SECTOR_SIZE != 0) {
> + if (size == 0 || !QEMU_IS_ALIGNED(size, FLASH_SECTOR_SIZE)) {
> error_report("system firmware block device %s has invalid size "
> "%" PRId64,
> blk_name(blk), size);
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index daae3ebdbb..71481d59c2 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -112,7 +112,7 @@ static void virt_flash_map1(PFlashCFI01 *flash,
> {
> DeviceState *dev = DEVICE(flash);
>
> - assert(size % VIRT_FLASH_SECTOR_SIZE == 0);
> + assert(QEMU_IS_ALIGNED(size, VIRT_FLASH_SECTOR_SIZE));
> assert(size / VIRT_FLASH_SECTOR_SIZE <= UINT32_MAX);
> qdev_prop_set_uint32(dev, "num-blocks", size / VIRT_FLASH_SECTOR_SIZE);
> qdev_init_nofail(dev);
>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
next prev parent reply other threads:[~2020-05-18 12:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 20:52 [PATCH] hw: Use QEMU_IS_ALIGNED() on parallel flash block size Philippe Mathieu-Daudé
2020-05-12 14:54 ` Alistair Francis
2020-05-18 12:42 ` Peter Maydell
2020-05-18 12:49 ` Paolo Bonzini [this message]
2020-05-18 13:46 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60f129c2-499d-01e1-e0ee-9fd6ac759736@redhat.com \
--to=pbonzini@redhat.com \
--cc=Alistair.Francis@wdc.com \
--cc=ehabkost@redhat.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kwolf@redhat.com \
--cc=leif@nuviainc.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=palmer@dabbelt.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=radoslaw.biernacki@linaro.org \
--cc=rth@twiddle.net \
--cc=sagark@eecs.berkeley.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).