From 8bad602712aa9d875e1826b6cc17baba97deb4c8 Mon Sep 17 00:00:00 2001

From: Markus Armbruster <armbru@redhat.com>

Date: Fri, 17 May 2019 06:50:56 +0200

Subject: [PATCH 29/53] hw: Use PFLASH_CFI0{1, 2} and TYPE_PFLASH_CFI0{1, 2}

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Markus Armbruster <armbru@redhat.com>

Message-id: <20190517065120.12028-8-armbru@redhat.com>

Patchwork-id: 87997

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH v3 07/31] hw: Use PFLASH_CFI0{1, 2} and TYPE_PFLASH_CFI0{1, 2}

Bugzilla: 1624009

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

We have two open-coded copies of macro PFLASH_CFI01().  Move the macro

to the header, so we can ditch the copies.  Move PFLASH_CFI02() to the

header for symmetry.

We define macros TYPE_PFLASH_CFI01 and TYPE_PFLASH_CFI02 for type name

strings, then mostly use the strings.  If the macros are worth

defining, they are worth using.  Replace the strings by the macros.

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Message-Id: <20190308094610.21210-6-armbru@redhat.com>

(cherry picked from commit 81c7db723ebd0c677784a728020c7e8845868daf)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/arm/vexpress.c        | 4 ++--

 hw/arm/virt.c            | 3 ++-

 hw/block/pflash_cfi01.c  | 3 ---

 hw/block/pflash_cfi02.c  | 3 ---

 hw/xtensa/xtfpga.c       | 4 ++--

 include/hw/block/flash.h | 4 ++++

 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c

index 5cca371..cf87379 100644

--- a/hw/arm/vexpress.c

+++ b/hw/arm/vexpress.c

@@ -504,7 +504,7 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)

 static PFlashCFI01 *ve_pflash_cfi01_register(hwaddr base, const char *name,

                                              DriveInfo *di)

 {

-    DeviceState *dev = qdev_create(NULL, "cfi.pflash01");

+    DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01);

     if (di) {

         qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(di),

@@ -525,7 +525,7 @@ static PFlashCFI01 *ve_pflash_cfi01_register(hwaddr base, const char *name,

     qdev_init_nofail(dev);

     sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);

-    return OBJECT_CHECK(PFlashCFI01, (dev), "cfi.pflash01");

+    return PFLASH_CFI01(dev);

 }

 static void vexpress_common_init(MachineState *machine)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c

index 751a93c..4c652de 100644

--- a/hw/arm/virt.c

+++ b/hw/arm/virt.c

@@ -34,6 +34,7 @@

 #include "hw/arm/arm.h"

 #include "hw/arm/primecell.h"

 #include "hw/arm/virt.h"

+#include "hw/block/flash.h"

 #include "hw/vfio/vfio-calxeda-xgmac.h"

 #include "hw/vfio/vfio-amd-xgbe.h"

 #include "hw/devices.h"

@@ -812,7 +813,7 @@ static void create_one_flash(const char *name, hwaddr flashbase,

      * parameters as the flash devices on the Versatile Express board.

      */

     DriveInfo *dinfo = drive_get_next(IF_PFLASH);

-    DeviceState *dev = qdev_create(NULL, "cfi.pflash01");

+    DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01);

     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

     const uint64_t sectorlength = 256 * 1024;

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c

index 1ff4d25..dbd3b9d 100644

--- a/hw/block/pflash_cfi01.c

+++ b/hw/block/pflash_cfi01.c

@@ -59,9 +59,6 @@ do {                                                        \

 #define DPRINTF(fmt, ...) do { } while (0)

 #endif

-#define PFLASH_CFI01(obj) \

-    OBJECT_CHECK(PFlashCFI01, (obj), TYPE_PFLASH_CFI01)

-

 #define PFLASH_BE          0

 #define PFLASH_SECURE      1

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c

index 2c0cbde..b9e0448 100644

--- a/hw/block/pflash_cfi02.c

+++ b/hw/block/pflash_cfi02.c

@@ -57,9 +57,6 @@ do {                                                       \

 #define PFLASH_LAZY_ROMD_THRESHOLD 42

-#define PFLASH_CFI02(obj) \

-    OBJECT_CHECK(PFlashCFI02, (obj), TYPE_PFLASH_CFI02)

-

 struct PFlashCFI02 {

     /*< private >*/

     SysBusDevice parent_obj;

diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c

index 8f8c0b9..56deadc 100644

--- a/hw/xtensa/xtfpga.c

+++ b/hw/xtensa/xtfpga.c

@@ -164,7 +164,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space,

                                       DriveInfo *dinfo, int be)

 {

     SysBusDevice *s;

-    DeviceState *dev = qdev_create(NULL, "cfi.pflash01");

+    DeviceState *dev = qdev_create(NULL, TYPE_PFLASH_CFI01);

     qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(dinfo),

                         &error_abort);

@@ -178,7 +178,7 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space,

     s = SYS_BUS_DEVICE(dev);

     memory_region_add_subregion(address_space, board->flash->base,

                                 sysbus_mmio_get_region(s, 0));

-    return OBJECT_CHECK(PFlashCFI01, (dev), "cfi.pflash01");

+    return PFLASH_CFI01(dev);

 }

 static uint64_t translate_phys_addr(void *opaque, uint64_t addr)

diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h

index 333005d..aeea3ca 100644

--- a/include/hw/block/flash.h

+++ b/include/hw/block/flash.h

@@ -8,6 +8,8 @@

 /* pflash_cfi01.c */

 #define TYPE_PFLASH_CFI01 "cfi.pflash01"

+#define PFLASH_CFI01(obj) \

+    OBJECT_CHECK(PFlashCFI01, (obj), TYPE_PFLASH_CFI01)

 typedef struct PFlashCFI01 PFlashCFI01;

@@ -25,6 +27,8 @@ MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl);

 /* pflash_cfi02.c */

 #define TYPE_PFLASH_CFI02 "cfi.pflash02"

+#define PFLASH_CFI02(obj) \

+    OBJECT_CHECK(PFlashCFI02, (obj), TYPE_PFLASH_CFI02)

 typedef struct PFlashCFI02 PFlashCFI02;

-- 

1.8.3.1