From b64a99d86f7f10387f207b3fc52d04b6f1f0a818 Mon Sep 17 00:00:00 2001

From: Markus Armbruster <armbru@redhat.com>

Date: Fri, 17 May 2019 06:51:06 +0200

Subject: [PATCH 39/53] pflash: Clean up after commit 368a354f02b, part 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-18-armbru@redhat.com>

Patchwork-id: 88006

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH v3 17/31] pflash: Clean up after commit 368a354f02b, part 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>

Our pflash devices are simplistically modelled has having

"num-blocks" sectors of equal size "sector-length".  Real hardware

commonly has sectors of different sizes.  How our "sector-length"

property is related to the physical device's multiple sector sizes

is unclear.

Helper functions pflash_cfi01_register() and pflash_cfi02_register()

create a pflash device, set properties including "sector-length" and

"num-blocks", and realize.  They take parameters @size, @sector_len

and @nb_blocs.

QOMification left parameter @size unused.  Obviously, @size should

match @sector_len and @nb_blocs, i.e. size == sector_len * nb_blocs.

All callers satisfy this.

Remove @nb_blocs and compute it from @size and @sector_len.

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

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

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

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

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

(cherry picked from commit ce14710f4fdfca32123d7efd3ddcbee984ef0ae5)

[Trivial conflicts in hw/microblaze/petalogix_ml605_mmu.c,

hw/microblaze/petalogix_s3adsp1800_mmu.c, and hw/ppc/virtex_ml507.c

due to lack of commit ab3dd749241.  Trivial conflict in

hw/ppc/sam460ex.c due to lack of commit 371b74e2215.]

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

---

 hw/arm/collie.c                          | 5 +++--

 hw/arm/digic_boards.c                    | 1 -

 hw/arm/gumstix.c                         | 6 ++----

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

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

 hw/arm/omap_sx1.c                        | 6 ++----

 hw/arm/versatilepb.c                     | 1 -

 hw/arm/xilinx_zynq.c                     | 5 ++---

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

 hw/block/pflash_cfi01.c                  | 5 +++--

 hw/block/pflash_cfi02.c                  | 5 +++--

 hw/i386/pc_sysfw.c                       | 6 +-----

 hw/lm32/lm32_boards.c                    | 4 ++--

 hw/lm32/milkymist.c                      | 3 +--

 hw/microblaze/petalogix_ml605_mmu.c      | 3 +--

 hw/microblaze/petalogix_s3adsp1800_mmu.c | 3 +--

 hw/mips/mips_malta.c                     | 2 +-

 hw/mips/mips_r4k.c                       | 3 +--

 hw/ppc/ppc405_boards.c                   | 6 +++---

 hw/ppc/sam460ex.c                        | 5 ++---

 hw/ppc/virtex_ml507.c                    | 3 +--

 hw/sh4/r2d.c                             | 3 +--

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

 23 files changed, 36 insertions(+), 53 deletions(-)

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

index 9cf4538..29cacd8 100644

--- a/hw/arm/collie.c

+++ b/hw/arm/collie.c

@@ -9,6 +9,7 @@

  * GNU GPL, version 2 or (at your option) any later version.

  */

 #include "qemu/osdep.h"

+#include "qemu/units.h"

 #include "hw/hw.h"

 #include "hw/sysbus.h"

 #include "hw/boards.h"

@@ -39,12 +40,12 @@ static void collie_init(MachineState *machine)

     dinfo = drive_get(IF_PFLASH, 0, 0);

     pflash_cfi01_register(SA_CS0, "collie.fl1", 0x02000000,

                     dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                    (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);

+                    64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);

     dinfo = drive_get(IF_PFLASH, 0, 1);

     pflash_cfi01_register(SA_CS1, "collie.fl2", 0x02000000,

                     dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                    (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);

+                    64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);

     sysbus_create_simple("scoop", 0x40800000, NULL);

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

index 15a00a1..304e4d1 100644

--- a/hw/arm/digic_boards.c

+++ b/hw/arm/digic_boards.c

@@ -131,7 +131,6 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr,

     pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE,

                           NULL, FLASH_K8P3215UQB_SECTOR_SIZE,

-                          FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE,

                           DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE,

                           4,

                           0x00EC, 0x007E, 0x0003, 0x0001,

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

index 68a0376..03f6ef0 100644

--- a/hw/arm/gumstix.c

+++ b/hw/arm/gumstix.c

@@ -75,8 +75,7 @@ static void connex_init(MachineState *machine)

 #endif

     if (!pflash_cfi01_register(0x00000000, "connext.rom", connex_rom,

                                dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                               sector_len, connex_rom / sector_len,

-                               2, 0, 0, 0, 0, be)) {

+                               sector_len, 2, 0, 0, 0, 0, be)) {

         error_report("Error registering flash memory");

         exit(1);

     }

@@ -112,8 +111,7 @@ static void verdex_init(MachineState *machine)

 #endif

     if (!pflash_cfi01_register(0x00000000, "verdex.rom", verdex_rom,

                                dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                               sector_len, verdex_rom / sector_len,

-                               2, 0, 0, 0, 0, be)) {

+                               sector_len, 2, 0, 0, 0, 0, be)) {

         error_report("Error registering flash memory");

         exit(1);

     }

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

index cb1116b..62cca6a 100644

--- a/hw/arm/mainstone.c

+++ b/hw/arm/mainstone.c

@@ -153,8 +153,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,

                                    i ? "mainstone.flash1" : "mainstone.flash0",

                                    MAINSTONE_FLASH,

                                    blk_by_legacy_dinfo(dinfo),

-                                   sector_len, MAINSTONE_FLASH / sector_len,

-                                   4, 0, 0, 0, 0, be)) {

+                                   sector_len, 4, 0, 0, 0, 0, be)) {

             error_report("Error registering flash memory");

             exit(1);

         }

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

index fd7a7a9..bf8062b 100644

--- a/hw/arm/musicpal.c

+++ b/hw/arm/musicpal.c

@@ -1639,14 +1639,14 @@ static void musicpal_init(MachineState *machine)

 #ifdef TARGET_WORDS_BIGENDIAN

         pflash_cfi02_register(0x100000000ULL - MP_FLASH_SIZE_MAX,

                               "musicpal.flash", flash_size,

-                              blk, 0x10000, (flash_size + 0xffff) >> 16,

+                              blk, 0x10000,

                               MP_FLASH_SIZE_MAX / flash_size,

                               2, 0x00BF, 0x236D, 0x0000, 0x0000,

                               0x5555, 0x2AAA, 1);

 #else

         pflash_cfi02_register(0x100000000ULL - MP_FLASH_SIZE_MAX,

                               "musicpal.flash", flash_size,

-                              blk, 0x10000, (flash_size + 0xffff) >> 16,

+                              blk, 0x10000,

                               MP_FLASH_SIZE_MAX / flash_size,

                               2, 0x00BF, 0x236D, 0x0000, 0x0000,

                               0x5555, 0x2AAA, 0);

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

index a7a3e7d..082d811 100644

--- a/hw/arm/omap_sx1.c

+++ b/hw/arm/omap_sx1.c

@@ -156,8 +156,7 @@ static void sx1_init(MachineState *machine, const int version)

         if (!pflash_cfi01_register(OMAP_CS0_BASE,

                                    "omap_sx1.flash0-1", flash_size,

                                    blk_by_legacy_dinfo(dinfo),

-                                   sector_size, flash_size / sector_size,

-                                   4, 0, 0, 0, 0, be)) {

+                                   sector_size, 4, 0, 0, 0, 0, be)) {

             fprintf(stderr, "qemu: Error registering flash memory %d.\n",

                            fl_idx);

         }

@@ -180,8 +179,7 @@ static void sx1_init(MachineState *machine, const int version)

         if (!pflash_cfi01_register(OMAP_CS1_BASE,

                                    "omap_sx1.flash1-1", flash1_size,

                                    blk_by_legacy_dinfo(dinfo),

-                                   sector_size, flash1_size / sector_size,

-                                   4, 0, 0, 0, 0, be)) {

+                                   sector_size, 4, 0, 0, 0, 0, be)) {

             fprintf(stderr, "qemu: Error registering flash memory %d.\n",

                            fl_idx);

         }

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

index 99d8ff9..acb408d 100644

--- a/hw/arm/versatilepb.c

+++ b/hw/arm/versatilepb.c

@@ -362,7 +362,6 @@ static void versatile_init(MachineState *machine, int board_id)

                           VERSATILE_FLASH_SIZE,

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                           VERSATILE_FLASH_SECT_SIZE,

-                          VERSATILE_FLASH_SIZE / VERSATILE_FLASH_SECT_SIZE,

                           4, 0x0089, 0x0018, 0x0000, 0x0, 0)) {

         fprintf(stderr, "qemu: Error registering flash memory.\n");

     }

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

index 4a05e1c..3234cf6 100644

--- a/hw/arm/xilinx_zynq.c

+++ b/hw/arm/xilinx_zynq.c

@@ -208,10 +208,9 @@ static void zynq_init(MachineState *machine)

     /* AMD */

     pflash_cfi02_register(0xe2000000, "zynq.pflash", FLASH_SIZE,

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                          FLASH_SECTOR_SIZE,

-                          FLASH_SIZE/FLASH_SECTOR_SIZE, 1,

+                          FLASH_SECTOR_SIZE, 1,

                           1, 0x0066, 0x0022, 0x0000, 0x0000, 0x0555, 0x2aa,

-                              0);

+                          0);

     dev = qdev_create(NULL, "xilinx,zynq_slcr");

     qdev_init_nofail(dev);

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

index f5f1903..394e7a8 100644

--- a/hw/arm/z2.c

+++ b/hw/arm/z2.c

@@ -327,8 +327,7 @@ static void z2_init(MachineState *machine)

     if (!pflash_cfi01_register(Z2_FLASH_BASE, "z2.flash0", Z2_FLASH_SIZE,

                                dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                               sector_len, Z2_FLASH_SIZE / sector_len,

-                               4, 0, 0, 0, 0, be)) {

+                               sector_len, 4, 0, 0, 0, 0, be)) {

         error_report("Error registering flash memory");

         exit(1);

     }

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

index 31926e2..0101127 100644

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

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

@@ -953,7 +953,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,

                                    const char *name,

                                    hwaddr size,

                                    BlockBackend *blk,

-                                   uint32_t sector_len, int nb_blocs,

+                                   uint32_t sector_len,

                                    int bank_width,

                                    uint16_t id0, uint16_t id1,

                                    uint16_t id2, uint16_t id3,

@@ -964,7 +964,8 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,

     if (blk) {

         qdev_prop_set_drive(dev, "drive", blk, &error_abort);

     }

-    qdev_prop_set_uint32(dev, "num-blocks", nb_blocs);

+    assert(size % sector_len == 0);

+    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);

     qdev_prop_set_bit(dev, "big-endian", !!be);

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

index 8c6c6e1..31b2e6c 100644

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

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

@@ -789,7 +789,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,

                                    const char *name,

                                    hwaddr size,

                                    BlockBackend *blk,

-                                   uint32_t sector_len, int nb_blocs,

+                                   uint32_t sector_len,

                                    int nb_mappings, int width,

                                    uint16_t id0, uint16_t id1,

                                    uint16_t id2, uint16_t id3,

@@ -802,7 +802,8 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,

     if (blk) {

         qdev_prop_set_drive(dev, "drive", blk, &error_abort);

     }

-    qdev_prop_set_uint32(dev, "num-blocks", nb_blocs);

+    assert(size % sector_len == 0);

+    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);

     qdev_prop_set_uint8(dev, "mappings", nb_mappings);

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c

index 721a867..20eed89 100644

--- a/hw/i386/pc_sysfw.c

+++ b/hw/i386/pc_sysfw.c

@@ -109,16 +109,13 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)

     int64_t size;

     char *fatal_errmsg = NULL;

     hwaddr phys_addr = 0x100000000ULL;

-    int sector_bits, sector_size;

+    uint32_t sector_size = 4096;

     PFlashCFI01 *system_flash;

     MemoryRegion *flash_mem;

     char name[64];

     void *flash_ptr;

     int ret, flash_size;

-    sector_bits = 12;

-    sector_size = 1 << sector_bits;

-

     for (unit = 0;

          (unit < FLASH_MAP_UNIT_MAX &&

           (pflash_drv = drive_get(IF_PFLASH, 0, unit)) != NULL);

@@ -161,7 +158,6 @@ static void pc_system_flash_init(MemoryRegion *rom_memory)

         snprintf(name, sizeof name, "system.flash%d", unit);

         system_flash = pflash_cfi01_register(phys_addr, name,

                                              size, blk, sector_size,

-                                             size >> sector_bits,

                                              1      /* width */,

                                              0x0000 /* id0 */,

                                              0x0000 /* id1 */,

diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c

index 0a1b6e9..92fe920 100644

--- a/hw/lm32/lm32_boards.c

+++ b/hw/lm32/lm32_boards.c

@@ -116,7 +116,7 @@ static void lm32_evr_init(MachineState *machine)

     /* Spansion S29NS128P */

     pflash_cfi02_register(flash_base, "lm32_evr.flash", flash_size,

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                          flash_sector_size, flash_size / flash_sector_size,

+                          flash_sector_size,

                           1, 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);

     /* create irq lines */

@@ -208,7 +208,7 @@ static void lm32_uclinux_init(MachineState *machine)

     /* Spansion S29NS128P */

     pflash_cfi02_register(flash_base, "lm32_uclinux.flash", flash_size,

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                          flash_sector_size, flash_size / flash_sector_size,

+                          flash_sector_size,

                           1, 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);

     /* create irq lines */

diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c

index 3e38313..ac62a63 100644

--- a/hw/lm32/milkymist.c

+++ b/hw/lm32/milkymist.c

@@ -123,8 +123,7 @@ milkymist_init(MachineState *machine)

     /* Numonyx JS28F256J3F105 */

     pflash_cfi01_register(flash_base, "milkymist.flash", flash_size,

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                          flash_sector_size, flash_size / flash_sector_size,

-                          2, 0x00, 0x89, 0x00, 0x1d, 1);

+                          flash_sector_size, 2, 0x00, 0x89, 0x00, 0x1d, 1);

     /* create irq lines */

     env->pic_state = lm32_pic_init(qemu_allocate_irq(cpu_irq_handler, cpu, 0));

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c

index a2bc9fc..2a2c772 100644

--- a/hw/microblaze/petalogix_ml605_mmu.c

+++ b/hw/microblaze/petalogix_ml605_mmu.c

@@ -109,8 +109,7 @@ petalogix_ml605_init(MachineState *machine)

      * 10th paremeter 0 means little-endian */

     pflash_cfi01_register(FLASH_BASEADDR, "petalogix_ml605.flash", FLASH_SIZE,

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                          (64 * 1024), FLASH_SIZE >> 16,

-                          2, 0x89, 0x18, 0x0000, 0x0, 0);

+                          64 * KiB, 2, 0x89, 0x18, 0x0000, 0x0, 0);

     dev = qdev_create(NULL, "xlnx.xps-intc");

diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c

index 37090c5..eab6eb9 100644

--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c

+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c

@@ -88,8 +88,7 @@ petalogix_s3adsp1800_init(MachineState *machine)

     pflash_cfi01_register(FLASH_BASEADDR,

                           "petalogix_s3adsp1800.flash", FLASH_SIZE,

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                          (64 * 1024), FLASH_SIZE >> 16,

-                          1, 0x89, 0x18, 0x0000, 0x0, 1);

+                          64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1);

     dev = qdev_create(NULL, "xlnx.xps-intc");

     qdev_prop_set_uint32(dev, "kind-of-intr",

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c

index 6b09258..921eb22 100644

--- a/hw/mips/mips_malta.c

+++ b/hw/mips/mips_malta.c

@@ -1065,7 +1065,7 @@ void mips_malta_init(MachineState *machine)

     fl = pflash_cfi01_register(FLASH_ADDRESS, "mips_malta.bios",

                                FLASH_SIZE,

                                dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                               65536, FLASH_SIZE >> 16,

+                               65536,

                                4, 0x0000, 0x0000, 0x0000, 0x0000, be);

     bios = pflash_cfi01_get_memory(fl);

     fl_idx++;

diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c

index 4ac5471..0aca7f9 100644

--- a/hw/mips/mips_r4k.c

+++ b/hw/mips/mips_r4k.c

@@ -236,8 +236,7 @@ void mips_r4k_init(MachineState *machine)

         uint32_t mips_rom = 0x00400000;

         if (!pflash_cfi01_register(0x1fc00000, "mips_r4k.bios", mips_rom,

                                    blk_by_legacy_dinfo(dinfo),

-                                   sector_len, mips_rom / sector_len,

-                                   4, 0, 0, 0, 0, be)) {

+                                   sector_len, 4, 0, 0, 0, 0, be)) {

             fprintf(stderr, "qemu: Error registering flash memory.\n");

 	}

     } else if (!qtest_enabled()) {

diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c

index d2ad8cd..4575043 100644

--- a/hw/ppc/ppc405_boards.c

+++ b/hw/ppc/ppc405_boards.c

@@ -231,7 +231,7 @@ static void ref405ep_init(MachineState *machine)

         pflash_cfi02_register((uint32_t)(-bios_size),

                               "ef405ep.bios", bios_size,

                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                              64 * KiB, bios_size / (64 * KiB), 1,

+                              64 * KiB, 1,

                               2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,

                               1);

     } else

@@ -502,7 +502,7 @@ static void taihu_405ep_init(MachineState *machine)

         pflash_cfi02_register(0xFFE00000,

                               "taihu_405ep.bios", bios_size,

                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                              64 * KiB, bios_size / (64 * KiB), 1,

+                              64 * KiB, 1,

                               4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,

                               1);

         fl_idx++;

@@ -536,7 +536,7 @@ static void taihu_405ep_init(MachineState *machine)

         bios_size = 32 * MiB;

         pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size,

                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                              64 * KiB, bios_size / (64 * KiB), 1,

+                              64 * KiB, 1,

                               4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,

                               1);

         fl_idx++;

diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c

index 0c1790f..4ec934f 100644

--- a/hw/ppc/sam460ex.c

+++ b/hw/ppc/sam460ex.c

@@ -236,9 +236,8 @@ static int sam460ex_load_uboot(void)

     if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32),

                                "sam460ex.flash", FLASH_SIZE,

                                dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                               64 * KiB, FLASH_SIZE / (64 * KiB),

-                               1, 0x89, 0x18, 0x0000, 0x0, 1)) {

-        error_report("qemu: Error registering flash memory.");

+                               64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1)) {

+        error_report("Error registering flash memory");

         /* XXX: return an error instead? */

         exit(1);

     }

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c

index 66fa766..2fd8efe 100644

--- a/hw/ppc/virtex_ml507.c

+++ b/hw/ppc/virtex_ml507.c

@@ -237,8 +237,7 @@ static void virtex_init(MachineState *machine)

     dinfo = drive_get(IF_PFLASH, 0, 0);

     pflash_cfi01_register(PFLASH_BASEADDR, "virtex.flash", FLASH_SIZE,

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                          (64 * 1024), FLASH_SIZE >> 16,

-                          1, 0x89, 0x18, 0x0000, 0x0, 1);

+                          64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1);

     cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT];

     dev = qdev_create(NULL, "xlnx.xps-intc");

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c

index 7016d6f..d6e6515 100644

--- a/hw/sh4/r2d.c

+++ b/hw/sh4/r2d.c

@@ -300,8 +300,7 @@ static void r2d_init(MachineState *machine)

     dinfo = drive_get(IF_PFLASH, 0, 0);

     pflash_cfi02_register(0x0, "r2d.flash", FLASH_SIZE,

                           dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

-                          64 * KiB, FLASH_SIZE >> 16,

-                          1, 2, 0x0001, 0x227e, 0x2220, 0x2200,

+                          64 * KiB, 1, 2, 0x0001, 0x227e, 0x2220, 0x2200,

                           0x555, 0x2aa, 0);

     /* NIC: rtl8139 on-board, and 2 slots. */

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

index 3e48901..914932e 100644

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

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

@@ -17,7 +17,7 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base,

                                    const char *name,

                                    hwaddr size,

                                    BlockBackend *blk,

-                                   uint32_t sector_len, int nb_blocs,

+                                   uint32_t sector_len,

                                    int width,

                                    uint16_t id0, uint16_t id1,

                                    uint16_t id2, uint16_t id3,

@@ -36,7 +36,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base,

                                    const char *name,

                                    hwaddr size,

                                    BlockBackend *blk,

-                                   uint32_t sector_len, int nb_blocs,

+                                   uint32_t sector_len,

                                    int nb_mappings,

                                    int width,

                                    uint16_t id0, uint16_t id1,

-- 

1.8.3.1