Skip to content

ide: rerror/werror migration fixes for IDE/ISA and AHCI

John Snow qemu-devel 3 versions – Applied

Status from this message: Thanks, applied to my block tree:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest17 patches 6 repliesApplied
  2. v317 patches 1 replySuperseded
  3. v217 patches 14 repliesSuperseded

Changes in v4 from the cover letter

- Rebased.
- Return -1 instead of assert().

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/17ide: start extracting ide_restart_dma out of bmdma_restart_dmahw/ide/pci.c+19 -110 replies
2/17ide: prepare to move restart to common codehw/ide/internal.h hw/ide/pci.c+8 -50 replies
3/17ide: introduce ide_register_restart_cbhw/ide/cmd646.c hw/ide/core.c hw/ide/internal.h +2 more+9 -60 replies
4/17ide: do not use BMDMA in restart callbackhw/ide/pci.c+3 -30 replies
5/17ide: pass IDEBus to the restart_cbhw/ide/core.c hw/ide/pci.c+6 -60 replies
6/17ide: move restart callback to common codehw/ide/core.c hw/ide/internal.h hw/ide/pci.c +1 more+81 -810 replies
7/17ide: remove restart_cb callbackhw/ide/ahci.c hw/ide/core.c hw/ide/internal.h +1 more+0 -160 replies
8/17ide: replace set_unit callback with more IDEBus statehw/ide/ahci.c hw/ide/core.c hw/ide/internal.h +3 more+15 -260 replies
9/17ide: place initial state of the current request to IDEBushw/ide/core.c hw/ide/internal.h hw/ide/pci.c +1 more+16 -120 replies
10/17ide: migrate initial request state via IDEBushw/ide/core.c+4 -10 replies
11/17ide: commonize io_buffer_index initializationhw/ide/atapi.c hw/ide/core.c+2 -40 replies
12/17ide: make more functions statichw/ide/core.c hw/ide/internal.h+8 -80 replies
13/17ide: support PIO restart for the ISA controllerhw/ide/isa.c+2 -10 replies
14/17ahci: Migrate IDEStatushw/ide/ahci.c hw/ide/internal.h+4 -03 replies
15/17ahci: add support for restarting non-queued commandshw/ide/ahci.c+15 -80 replies
16/17ahci: Recompute cur_cmd on migrate post loadhw/ide/ahci.c+7 -00 replies
17/17qtest/ide: Test flush / retry for ISA and PCItests/ide-test.c+15 -50 replies

Reviews trailers per patch

2 of 17 patches have a Reviewed-by or Acked-by.

PatchPaolo Bonzini
1/17
2/17
3/17
4/17
5/17
6/17
7/17
8/17
9/17
10/17
11/17
12/17
13/17
14/17R-b
15/17
16/17
17/17R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [Qemu-devel] [PATCH v4 00/17] ide: rerror/werror migration fixes for IDE/ISA and AHCI

This series fixes rerror/werror support for IDE/ISA and implements it in a migratable way for AHCI. This series also fixes AHCI migration.

This series was written mostly by Paolo to unify the restart mechanics of IDE/ISA and IDE/BMDMA, moving much of the restart logic into common code.

Many of the earlier patches make more sense considering the end goal of eliminating BMDMA specific restart code to be shared with ISA and AHCI codepaths.

Migration for halted commands is fixed for ISA and AHCI.

As a consequence, operations halted via rerror=stop or werror=stop should be able to be successfully migrated and resumed when using ISA, PCI, or AHCI.

This series includes tests for ISA and PCI/BMDMA, but does not yet include tests for AHCI, which require some more qtest work to be upstreamed first. Regardless, the AHCI tests have been written and can be observed at:
https://github.com/jnsnow/qemu/commits/ahci-devel

See "ahci: add migrate dma test" and "ahci-test: add flush migrate test" for the WIP versions of the AHCI test that I used to exercise this patchset.

V4:
- Rebased.
- Return -1 instead of assert().

V3:
- Rebased, including Dave Gilbert's ATAPI migration workaround
- Some rephrasing for the comment in patch #15
- Added assertion that the busy_slot variable is within range

John Snow (3):
ahci: Migrate IDEStatus
ahci: Recompute cur_cmd on migrate post load
qtest/ide: Test flush / retry for ISA and PCI

Paolo Bonzini (14):
ide: start extracting ide_restart_dma out of bmdma_restart_dma
ide: prepare to move restart to common code
ide: introduce ide_register_restart_cb
ide: do not use BMDMA in restart callback
ide: pass IDEBus to the restart_cb
ide: move restart callback to common code
ide: remove restart_cb callback
ide: replace set_unit callback with more IDEBus state
ide: place initial state of the current request to IDEBus
ide: migrate initial request state via IDEBus
ide: commonize io_buffer_index initialization
ide: make more functions static
ide: support PIO restart for the ISA controller
ahci: add support for restarting non-queued commands

 hw/ide/ahci.c     |  43 +++++++++++---------
 hw/ide/atapi.c    |   3 +-
 hw/ide/cmd646.c   |   3 +-
 hw/ide/core.c     | 118 ++++++++++++++++++++++++++++++++++++++++++++++++------
 hw/ide/internal.h |  16 +++++---
 hw/ide/isa.c      |   3 +-
 hw/ide/macio.c    |   6 ---
 hw/ide/pci.c      | 109 +++++++------------------------------------------
 hw/ide/pci.h      |  12 +++---
 hw/ide/piix.c     |   3 +-
 hw/ide/via.c      |   3 +-
 tests/ide-test.c  |  20 ++++++---
 12 files changed, 180 insertions(+), 159 deletions(-)
Signature · 1 line
1.9.3