Message ID | 20200511205246.24621-1-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | hw: Use QEMU_IS_ALIGNED() on parallel flash block size | expand |
On Mon, May 11, 2020 at 1:54 PM Philippe Mathieu-Daudé <philmd@redhat.com> 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> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > 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); > -- > 2.21.3 > >
On Mon, 11 May 2020 at 21:52, Philippe Mathieu-Daudé <philmd@redhat.com> 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(-) Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
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>
Am 11.05.2020 um 22:52 hat Philippe Mathieu-Daudé geschrieben: > 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> Thanks, applied to the block branch. Kevin
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);
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(-)