hw: Use QEMU_IS_ALIGNED() on parallel flash block size
PATCH 1/1 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.
--- 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(-)
hw/arm/sbsa-ref.c +1 -1
@@ -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);
hw/arm/virt.c +1 -1
@@ -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);
hw/block/pflash_cfi01.c +1 -1
@@ -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);
hw/block/pflash_cfi02.c +1 -1
@@ -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);
hw/i386/pc_sysfw.c +1 -1
@@ -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);
hw/riscv/virt.c +1 -1
@@ -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);
Signature · 1 line
2.21.3
Quoted 5 lines · Philippe Mathieu-Daudé
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é <[email protected]>
Alistair
Quoted 91 lines
--- 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(-)hw/arm/sbsa-ref.c +1
-1@@ -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);hw/arm/virt.c +1
-1@@ -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);hw/block/pflash_cfi01.c +1
-1@@ -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);hw/block/pflash_cfi02.c +1
-1@@ -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);hw/i386/pc_sysfw.c +1
-1@@ -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);hw/riscv/virt.c +1
-2@@ -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
Quoted 5 lines · Philippe Mathieu-Daudé
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é <[email protected]>
Quoted 8 lines
--- 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(-)
thanks
-- PMM
Quoted 84 lines · Philippe Mathieu-Daudé
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é <[email protected]>--- 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(-)hw/arm/sbsa-ref.c +1
-1@@ -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);hw/arm/virt.c +1
-1@@ -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);hw/block/pflash_cfi01.c +1
-1@@ -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);hw/block/pflash_cfi02.c +1
-1@@ -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);hw/i386/pc_sysfw.c +1
-1@@ -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);hw/riscv/virt.c +0
-0
hw/riscv/virt.c static void virt_flash_map1(PFlashCFI01 *flash, · line 118
Quoted 8 lines
hw/riscv/virt.c +1
-1@@ -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);
Kevin Wolf
AppliedAm 11.05.2020 um 22:52 hat Philippe Mathieu-Daudé geschrieben:
Quoted 4 lines
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é <[email protected]>
Thanks, applied to the block branch.
Kevin