Skip to content

Fixes around device realization

Markus Armbruster qemu-arm qemu-devel qemu-riscv 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest24 patches 5 repliesIn review
  2. v224 patches 25 repliesSuperseded
  3. v15 patches 6 repliesSuperseded

Changes in v3 from the cover letter

* PATCH 09: Handle errors even though they're impossible [Peter] Commit message typo
* PATCH 19: Rebase onto commit 26cd0362dd4 (machines spike_v1.9.1 and spike_v1.10 are gone) and commit fe0fe4735e7 (new machine opentitan)

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/24arm/stm32f405: Fix realization of "stm32f2xx-adc" deviceshw/arm/stm32f405_soc.c+13 -101 reply
2/24display/xlnx_dp: Fix to realize "i2c-ddc" and "aux-to-i2c-bridge"hw/display/xlnx_dp.c+4 -00 replies
3/24sd/pxa2xx_mmci: Fix to realize "pxa2xx-mmci" devicehw/sd/pxa2xx_mmci.c+1 -00 replies
4/24arm/aspeed: Compute the number of CPUs from the SoC definitionhw/arm/aspeed.c hw/arm/aspeed_ast2600.c hw/arm/aspeed_soc.c +1 more+32 -270 replies
5/24arm/aspeed: Rework NIC attachmenthw/arm/aspeed.c hw/arm/aspeed_ast2600.c hw/arm/aspeed_soc.c +1 more+21 -40 replies
6/24armv7m: Delete unused "ARM,bitband-memory" deviceshw/arm/armv7m.c+4 -20 replies
7/24auxbus: Fix aux-to-i2c-bridge to be a subtype of aux-slavehw/misc/auxbus.c+1 -10 replies
8/24mac_via: Fix to realize "mos6522-q800-via*" deviceshw/misc/mac_via.c+5 -01 reply
9/24macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" deviceshw/misc/macio/cuda.c hw/misc/macio/pmu.c+20 -102 replies
10/24macio: Delete unused "macio-gpio" deviceshw/misc/macio/macio.c+2 -00 replies
11/24pnv/phb4: Delete unused "pnv-phb4-pec-stack" deviceshw/pci-host/pnv_phb4_pec.c+3 -00 replies
12/24MAINTAINERS: Make section PowerNV cover pci-host/pnv* as wellMAINTAINERS+2 -00 replies
13/24ppc4xx: Drop redundant device realizationhw/ppc/ppc440_uc.c+0 -20 replies
14/24macio: Put "macio-nvram" device on the macio bushw/misc/macio/macio.c+2 -10 replies
15/24macio: Fix macio-bus to be a subtype of System bushw/misc/macio/macio.c+1 -10 replies
16/24ppc/pnv: Put "*-pnv-chip" and "pnv-xive" on the main system bushw/ppc/pnv.c+3 -30 replies
17/24pnv/psi: Correct the pnv-psi* devices not to be sysbus deviceshw/ppc/pnv_psi.c include/hw/ppc/pnv_psi.h+2 -20 replies
18/24display/sm501 display/ati: Fix to realize "i2c-ddc"hw/display/ati.c hw/display/sm501.c+4 -00 replies
19/24riscv: Fix to put "riscv.hart_array" devices on sysbushw/riscv/opentitan.c hw/riscv/sifive_e.c hw/riscv/sifive_u.c +2 more+14 -180 replies
20/24riscv: Fix type of SiFive[EU]SocState, member parent_objinclude/hw/riscv/sifive_e.h include/hw/riscv/sifive_u.h+2 -20 replies
21/24sparc/leon3: Fix to put grlib,* devices on sysbushw/sparc/leon3.c+2 -21 reply
22/24qdev: Assert devices are plugged into a bus that can take themhw/core/qdev.c+3 -00 replies
23/24sd: Hide the qdev-but-not-quite thing created by sd_init()hw/sd/sd.c+28 -120 replies
24/24qdev: Assert onboard devices all get realized properlyhw/core/qdev.c+16 -00 replies

Reviews trailers per patch

23 of 24 patches have a Reviewed-by or Acked-by.

PatchPhilippe Mathieu-DaudéAlistair FrancisPeter MaydellEdgar E. IglesiasDavid GibsonMark Cave-AylandGreg KurzCédric Le GoaterKONRAD FredericBALATON ZoltanMarkus ArmbrusterJoel StanleyThomas HuthArtyom TarasenkoLaurent Vivier
1/24R-b R-b
2/24R-b R-b
3/24R-b R-b
4/24R-b
5/24R-b R-b
6/24R-b R-b
7/24R-b
8/24R-b T-b A-b
9/24R-b
10/24R-b
11/24R-b R-b
12/24A-b
13/24R-b R-b R-b
14/24R-b R-b
15/24R-b
16/24R-b
17/24R-b
18/24R-b T-b
19/24R-b
20/24R-b R-b
21/24R-b R-b A-b
22/24R-b
23/24
24/24R-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 15 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/24] Fixes around device realization

This fixes a bunch of bugs I ran into while reworking how qdevs plug into buses.

I instrumented the code a bit to flush out instances of bug patterns. I posted these hacks separately as '[PATCH not-for-merge 0/5] Instrumentation for "Fixes around device realization"'. PATCH 2/5 since became "[PATCH 0/2] qom: Make "info qom-tree" show children sorted". It should be applied first.

v3:
* PATCH 09: Handle errors even though they're impossible [Peter] Commit message typo
* PATCH 19: Rebase onto commit 26cd0362dd4 (machines spike_v1.9.1 and spike_v1.10 are gone) and commit fe0fe4735e7 (new machine opentitan)

v2:
* Rebased
* PATCH 01: Also fix MMIO addresses, with Alistair's help
* PATCH 04+05: Replaced by better patches from Cédric
* PATCH 01-03+06+08-11+18: Commit messages improved [Peter, Paolo]
* PATCH 08+09+18: Avoid qdev_init_nofail() [Peter]
* PATCH 22: Assertion simplified

Based-on: Message-Id: <[email protected]>

Cédric Le Goater (2):
arm/aspeed: Compute the number of CPUs from the SoC definition arm/aspeed: Rework NIC attachment

Markus Armbruster (22):
arm/stm32f405: Fix realization of "stm32f2xx-adc" devices display/xlnx_dp: Fix to realize "i2c-ddc" and "aux-to-i2c-bridge" sd/pxa2xx_mmci: Fix to realize "pxa2xx-mmci" device
armv7m: Delete unused "ARM,bitband-memory" devices
auxbus: Fix aux-to-i2c-bridge to be a subtype of aux-slave
mac_via: Fix to realize "mos6522-q800-via*" devices
macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" devices
macio: Delete unused "macio-gpio" devices
pnv/phb4: Delete unused "pnv-phb4-pec-stack" devices
MAINTAINERS: Make section PowerNV cover pci-host/pnv* as well
ppc4xx: Drop redundant device realization
macio: Put "macio-nvram" device on the macio bus
macio: Fix macio-bus to be a subtype of System bus ppc/pnv: Put "*-pnv-chip" and "pnv-xive" on the main system bus pnv/psi: Correct the pnv-psi* devices not to be sysbus devices display/sm501 display/ati: Fix to realize "i2c-ddc"
riscv: Fix to put "riscv.hart_array" devices on sysbus
riscv: Fix type of SiFive[EU]SocState, member parent_obj sparc/leon3: Fix to put grlib,* devices on sysbus
qdev: Assert devices are plugged into a bus that can take them
sd: Hide the qdev-but-not-quite thing created by sd_init()
qdev: Assert onboard devices all get realized properly

 include/hw/arm/aspeed.h     |  6 ++++++
 include/hw/arm/aspeed_soc.h |  1 -
 include/hw/ppc/pnv_psi.h    |  2 +-
 include/hw/riscv/sifive_e.h |  2 +-
 include/hw/riscv/sifive_u.h |  2 +-
 hw/arm/armv7m.c             |  6 ++++--
 hw/arm/aspeed.c             | 42 ++++++++++++++++++++++++++++++++-----
 hw/arm/aspeed_ast2600.c     | 23 +++++++-------------
 hw/arm/aspeed_soc.c         | 12 ++---------
 hw/arm/stm32f405_soc.c      | 23 +++++++++++---------
 hw/core/qdev.c              | 19 +++++++++++++++++
 hw/display/ati.c            |  2 ++
 hw/display/sm501.c          |  2 ++
 hw/display/xlnx_dp.c        |  4 ++++
 hw/misc/auxbus.c            |  2 +-
 hw/misc/mac_via.c           |  5 +++++
 hw/misc/macio/cuda.c        | 15 ++++++++-----
 hw/misc/macio/macio.c       |  7 +++++--
 hw/misc/macio/pmu.c         | 15 ++++++++-----
 hw/pci-host/pnv_phb4_pec.c  |  3 +++
 hw/ppc/pnv.c                |  6 +++---
 hw/ppc/pnv_psi.c            |  2 +-
 hw/ppc/ppc440_uc.c          |  2 --
 hw/riscv/opentitan.c        |  5 ++---
 hw/riscv/sifive_e.c         |  5 ++---
 hw/riscv/sifive_u.c         | 14 ++++++-------
 hw/riscv/spike.c            |  4 ++--
 hw/riscv/virt.c             |  4 ++--
 hw/sd/pxa2xx_mmci.c         |  1 +
 hw/sd/sd.c                  | 40 ++++++++++++++++++++++++-----------
 hw/sparc/leon3.c            |  4 ++--
 MAINTAINERS                 |  2 ++
 32 files changed, 185 insertions(+), 97 deletions(-)
Signature · 1 line
2.26.2