Commit 4cdd0a77 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Kevin Wolf
Browse files

hw: Use QEMU_IS_ALIGNED() on parallel flash block size 



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: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200511205246.24621-1-philmd@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent b1b30ff4

hw/arm/sbsa-ref.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,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);

hw/arm/virt.c

+1 −1
Original line number Diff line number Diff line
@@ -977,7 +977,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);

hw/block/pflash_cfi01.c

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,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);

hw/block/pflash_cfi02.c

+1 −1
Original line number Diff line number Diff line
@@ -997,7 +997,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);

hw/i386/pc_sysfw.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,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);