Skip to content

pflash: Fixes and cleanups

Markus Armbruster qemu-devel 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest15 patches 6 repliesIn review
  2. v314 patches 8 repliesSuperseded
  3. v211 patches 31 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v110 patches75 repliesSuperseded

Changes in v4 from the cover letter

* PATCH 01+04: Semantic rebase conflicts in pflash_cfi02_unrealize() resolved
* PATCH 07: New [David]
* PATCH 10: Replaces old PATCH 09
* PATCH 11,13-15: Straightforward rebase onto PATCH 10

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02hw/arm/vexpress.c hw/block/pflash_cfi01.c hw/block/pflash_cfi02.c +4 more+126 -1110 replies
2/15pflash_cfi01: Do not exit() on guest aborting "write to buffer"hw/block/pflash_cfi01.c+5 -80 replies
3/15pflash_cfi01: Log use of flawed "write to buffer"hw/block/pflash_cfi01.c+13 -00 replies
4/15pflash: Rename *CFI_PFLASH* to *PFLASH_CFI*hw/block/pflash_cfi01.c hw/block/pflash_cfi02.c include/hw/block/flash.h+15 -150 replies
5/15hw: Use PFLASH_CFI0{1, 2} and TYPE_PFLASH_CFI0{1, 2}hw/arm/vexpress.c hw/arm/virt.c hw/block/pflash_cfi01.c +3 more+10 -110 replies
6/15sam460ex: Don't size flash memory to match backing imagehw/ppc/sam460ex.c+26 -150 replies
7/15ppc405_boards: Delete stale, disabled DEBUG_BOARD_INIT codehw/ppc/ppc405_boards.c+0 -601 reply
8/15ppc405_boards: Don't size flash memory to match backing imagehw/ppc/ppc405_boards.c+12 -240 replies
9/15r2d: Fix flash memory size, sector size, width, device IDhw/sh4/r2d.c+12 -41 reply
10/15mips_malta: Delete disabled, broken DEBUG_BOARD_INIT codehw/mips/mips_malta.c+0 -102 replies
11/15hw/mips/malta: Remove fl_sectors variablehw/mips/mips_malta.c+1 -20 replies
12/15hw/mips/malta: Restrict 'bios_size' variable scopehw/mips/mips_malta.c+1 -10 replies
13/15mips_malta: Clean up definition of flash memory size somewhathw/mips/mips_malta.c+1 -12 replies
14/15pflash: Clean up after commit 368a354f02b, part 1hw/arm/collie.c hw/arm/digic_boards.c hw/arm/gumstix.c +20 more+31 -330 replies
15/15pflash: Clean up after commit 368a354f02b, part 2hw/arm/collie.c hw/arm/digic_boards.c hw/arm/gumstix.c +20 more+35 -520 replies

Reviews trailers per patch

All 15 patches have a Reviewed-by or Acked-by.

PatchPhilippe Mathieu-DaudéAlex BennéeAleksandar MarkovicLaszlo ErsekRichard HendersonBALATON ZoltanDavid Gibson
1/15R-b T-b R-b
2/15R-b R-b
3/15R-b R-b
4/15R-b R-b
5/15R-b R-b R-b
6/15R-b R-b
7/15R-b
8/15R-b A-b
9/15R-b T-b
10/15R-b T-b R-b R-b
11/15R-b
12/15R-b
13/15R-b T-b R-b R-b
14/15R-b T-b R-b R-b
15/15R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 7 reviewers.

Read the v4 thread

Cover letter [Qemu-devel] [PATCH v4 00/15] pflash: Fixes and cleanups

Alex Bennée posted this patch to address an XXX comment in pflash_cfi01_realize() the other day:

Subject: [PATCH v2] hw/block: report when pflash backing file isn't aligned
Message-Id: <[email protected]>
https://lists.nongnu.org/archive/html/qemu-devel/2019-02/msg04166.html

Review led me to look into its callers. Most of them are pleasantly
boring: they create flash memory of some fixed size at some fixed address. A few are more creative, and some of the creative ones look quite broken to me. Fix them, and clean up some along the way.

v4:
* PATCH 01+04: Semantic rebase conflicts in pflash_cfi02_unrealize() resolved
* PATCH 07: New [David]
* PATCH 10: Replaces old PATCH 09
* PATCH 11,13-15: Straightforward rebase onto PATCH 10

v3:
* PATCH 07,13: Commit message typo
* PATCH 08: Replaced [Philippe, Magnus]
* PATCH 09-11: New [Philippe]
* PATCH 12: Straightforward rebase onto new patches
* PATCH 14: Commit message improved [Philippe], lines joined [Zoltan]

v2:
* PATCH 01+10: Style cleanups [checkpatch]
* PATCH 02: Rewritten [Peter, Philippe]
* PATCH 03+04: New [Philippe]
* PATCH 06: Commit message improved, FIXME added, accidental replacement of 64 * KiB by 65536 backed out [Zoltan]
* PATCH 07: Style tweak [Alex, David]
* PATCH 08: Commit message typo [Philippe]
* PATCH 11: Commit message typo [László]
* Old PATCH 10 dropped [Max, Peter]

Markus Armbruster (13):
pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02
pflash_cfi01: Do not exit() on guest aborting "write to buffer"
pflash_cfi01: Log use of flawed "write to buffer"
pflash: Rename *CFI_PFLASH* to *PFLASH_CFI*
hw: Use PFLASH_CFI0{1,2} and TYPE_PFLASH_CFI0{1,2}
sam460ex: Don't size flash memory to match backing image
ppc405_boards: Delete stale, disabled DEBUG_BOARD_INIT code
ppc405_boards: Don't size flash memory to match backing image
r2d: Fix flash memory size, sector size, width, device ID
mips_malta: Delete disabled, broken DEBUG_BOARD_INIT code
mips_malta: Clean up definition of flash memory size somewhat
pflash: Clean up after commit 368a354f02b, part 1
pflash: Clean up after commit 368a354f02b, part 2

Philippe Mathieu-Daudé (2):
hw/mips/malta: Remove fl_sectors variable hw/mips/malta: Restrict 'bios_size' variable scope

 hw/arm/collie.c                          |   9 +-
 hw/arm/digic_boards.c                    |   3 +-
 hw/arm/gumstix.c                         |  10 +-
 hw/arm/mainstone.c                       |   5 +-
 hw/arm/musicpal.c                        |   8 +-
 hw/arm/omap_sx1.c                        |  10 +-
 hw/arm/versatilepb.c                     |   3 +-
 hw/arm/vexpress.c                        |  10 +-
 hw/arm/virt.c                            |   3 +-
 hw/arm/xilinx_zynq.c                     |   7 +-
 hw/arm/z2.c                              |   6 +-
 hw/block/pflash_cfi01.c                  | 123 ++++++++++++-----------
 hw/block/pflash_cfi02.c                  |  81 +++++++--------
 hw/i386/pc_sysfw.c                       |  10 +-
 hw/lm32/lm32_boards.c                    |   8 +-
 hw/lm32/milkymist.c                      |   5 +-
 hw/microblaze/petalogix_ml605_mmu.c      |   6 +-
 hw/microblaze/petalogix_s3adsp1800_mmu.c |   5 +-
 hw/mips/mips_malta.c                     |  21 +---
 hw/mips/mips_r4k.c                       |   5 +-
 hw/ppc/ppc405_boards.c                   | 102 +++----------------
 hw/ppc/sam460ex.c                        |  42 +++++---
 hw/ppc/virtex_ml507.c                    |   5 +-
 hw/sh4/r2d.c                             |  17 +++-
 hw/xtensa/xtfpga.c                       |  12 +--
 include/hw/block/flash.h                 |  57 +++++++----
 26 files changed, 257 insertions(+), 316 deletions(-)
Signature · 1 line
2.17.2