Re: [Qemu-block] [Qemu-devel] [PATCH v2 04/11] pflash: Rename *CFI_PFLASH* to *PFLASH_CFI*

[Philippe Mathieu-Daudé]

On 2/26/19 8:34 PM, Markus Armbruster wrote:
> pflash_cfi01.c and pflash_cfi02.c start their identifiers with
> pflash_cfi01_ and pflash_cfi02_ respectively, except for
> CFI_PFLASH01(), TYPE_CFI_PFLASH01, CFI_PFLASH02(), TYPE_CFI_PFLASH02.
> Rename for consistency.
> 
> Suggested-by: Philippe Mathieu-Daudé <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
>  hw/block/pflash_cfi01.c  | 12 ++++++------
>  hw/block/pflash_cfi02.c  | 12 ++++++------
>  include/hw/block/flash.h |  4 ++--
>  3 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
> index d381f14e3c..f75f0a6998 100644
> --- a/hw/block/pflash_cfi01.c
> +++ b/hw/block/pflash_cfi01.c
> @@ -59,8 +59,8 @@ do {                                                        
> \
>  #define DPRINTF(fmt, ...) do { } while (0)
>  #endif
>  
> -#define CFI_PFLASH01(obj) \
> -    OBJECT_CHECK(PFlashCFI01, (obj), TYPE_CFI_PFLASH01)
> +#define PFLASH_CFI01(obj) \
> +    OBJECT_CHECK(PFlashCFI01, (obj), TYPE_PFLASH_CFI01)
>  
>  #define PFLASH_BE          0
>  #define PFLASH_SECURE      1
> @@ -698,7 +698,7 @@ static const MemoryRegionOps pflash_cfi01_ops = {
>  
>  static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
>  {
> -    PFlashCFI01 *pfl = CFI_PFLASH01(dev);
> +    PFlashCFI01 *pfl = PFLASH_CFI01(dev);
>      uint64_t total_len;
>      int ret;
>      uint64_t blocks_per_device, sector_len_per_device, device_len;
> @@ -926,7 +926,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, 
> void *data)
>  
>  
>  static const TypeInfo pflash_cfi01_info = {
> -    .name           = TYPE_CFI_PFLASH01,
> +    .name           = TYPE_PFLASH_CFI01,
>      .parent         = TYPE_SYS_BUS_DEVICE,
>      .instance_size  = sizeof(PFlashCFI01),
>      .class_init     = pflash_cfi01_class_init,
> @@ -949,7 +949,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,
>                                     uint16_t id2, uint16_t id3,
>                                     int be)
>  {
> -    DeviceState *dev = qdev_create(NULL, TYPE_CFI_PFLASH01);
> +    DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01);
>  
>      if (blk) {
>          qdev_prop_set_drive(dev, "drive", blk, &error_abort);
> @@ -966,7 +966,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,
>      qdev_init_nofail(dev);
>  
>      sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
> -    return CFI_PFLASH01(dev);
> +    return PFLASH_CFI01(dev);
>  }
>  
>  MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl)
> diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
> index 9f8486e4cf..c0869fc417 100644
> --- a/hw/block/pflash_cfi02.c
> +++ b/hw/block/pflash_cfi02.c
> @@ -57,8 +57,8 @@ do {                                                       \
>  
>  #define PFLASH_LAZY_ROMD_THRESHOLD 42
>  
> -#define CFI_PFLASH02(obj) \
> -    OBJECT_CHECK(PFlashCFI02, (obj), TYPE_CFI_PFLASH02)
> +#define PFLASH_CFI02(obj) \
> +    OBJECT_CHECK(PFlashCFI02, (obj), TYPE_PFLASH_CFI02)
>  
>  struct PFlashCFI02 {
>      /*< private >*/
> @@ -534,7 +534,7 @@ static const MemoryRegionOps pflash_cfi02_ops_le = {
>  
>  static void pflash_cfi02_realize(DeviceState *dev, Error **errp)
>  {
> -    PFlashCFI02 *pfl = CFI_PFLASH02(dev);
> +    PFlashCFI02 *pfl = PFLASH_CFI02(dev);
>      uint32_t chip_len;
>      int ret;
>      Error *local_err = NULL;
> @@ -706,7 +706,7 @@ static void pflash_cfi02_class_init(ObjectClass *klass, 
> void *data)
>  }
>  
>  static const TypeInfo pflash_cfi02_info = {
> -    .name           = TYPE_CFI_PFLASH02,
> +    .name           = TYPE_PFLASH_CFI02,
>      .parent         = TYPE_SYS_BUS_DEVICE,
>      .instance_size  = sizeof(PFlashCFI02),
>      .class_init     = pflash_cfi02_class_init,
> @@ -731,7 +731,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,
>                                     uint16_t unlock_addr1,
>                                     int be)
>  {
> -    DeviceState *dev = qdev_create(NULL, TYPE_CFI_PFLASH02);
> +    DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI02);
>  
>      if (blk) {
>          qdev_prop_set_drive(dev, "drive", blk, &error_abort);
> @@ -751,5 +751,5 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,
>      qdev_init_nofail(dev);
>  
>      sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
> -    return CFI_PFLASH02(dev);
> +    return PFLASH_CFI02(dev);
>  }
> diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h
> index 51d8f60c65..333005d9ff 100644
> --- a/include/hw/block/flash.h
> +++ b/include/hw/block/flash.h
> @@ -7,7 +7,7 @@
>  
>  /* pflash_cfi01.c */
>  
> -#define TYPE_CFI_PFLASH01 "cfi.pflash01"
> +#define TYPE_PFLASH_CFI01 "cfi.pflash01"
>  
>  typedef struct PFlashCFI01 PFlashCFI01;
>  
> @@ -24,7 +24,7 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);
>  
>  /* pflash_cfi02.c */
>  
> -#define TYPE_CFI_PFLASH02 "cfi.pflash02"
> +#define TYPE_PFLASH_CFI02 "cfi.pflash02"
>  
>  typedef struct PFlashCFI02 PFlashCFI02;
>  
> 

Thanks!

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>