qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 36aa28: hw/sd/ssi-sd: Do not create SD card w


From: Richard Henderson
Subject: [Qemu-commits] [qemu/qemu] 36aa28: hw/sd/ssi-sd: Do not create SD card within control...
Date: Wed, 15 Dec 2021 16:04:09 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 36aa285f48d55451bb2eb7a2c0f9635a3c2bbe46
      
https://github.com/qemu/qemu/commit/36aa285f48d55451bb2eb7a2c0f9635a3c2bbe46
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/stellaris.c
    M hw/riscv/sifive_u.c
    M hw/sd/ssi-sd.c

  Log Message:
  -----------
  hw/sd/ssi-sd: Do not create SD card within controller's realize

ssi_sd_realize() creates an "sd-card" device.  This is inappropriate,
and marked FIXME.

Move it to the boards that create these devices.  Prior art: commit
eb4f566bbb for device "generic-sdhci", and commit 26c607b86b for
device "pl181".

The device remains not user-creatable, because its users should (and
do) wire up its GPIO chip-select line.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Alistair Francis <Alistair.Francis@wdc.com>
Cc: Bin Meng <bin.meng@windriver.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: qemu-arm@nongnu.org
Cc: qemu-riscv@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-2-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>


  Commit: 64eaa8209597a580c026d4891c072723a38ff0a6
      
https://github.com/qemu/qemu/commit/64eaa8209597a580c026d4891c072723a38ff0a6
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/cubieboard.c
    M hw/arm/integratorcp.c
    M hw/arm/msf2-som.c
    M hw/arm/orangepi.c
    M hw/arm/raspi.c
    M hw/arm/realview.c
    M hw/arm/sabrelite.c
    M hw/misc/sifive_u_otp.c
    M hw/riscv/microchip_pfsoc.c
    M hw/riscv/sifive_u.c
    M hw/sparc64/niagara.c

  Log Message:
  -----------
  hw: Replace trivial drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

A number of machines connect just one backend with drive_get_next().
Change them to use drive_get() directly.  This makes the (zero) unit
number explicit in the code.

Cc: Beniamino Galvani <b.galvani@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Subbaraya Sundeep <sundeep.lkml@gmail.com>
Cc: Niek Linnenbank <nieklinnenbank@gmail.com>
Cc: Andrew Baumann <Andrew.Baumann@microsoft.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: Jean-Christophe Dubois <jcd@tribudubois.net>
Cc: Alistair Francis <Alistair.Francis@wdc.com>
Cc: Bin Meng <bin.meng@windriver.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: Laurent Vivier <laurent@vivier.eu>
Cc: qemu-arm@nongnu.org
Cc: qemu-riscv@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-3-armbru@redhat.com>


  Commit: 93d8bc8f5bc20a3108c9c9592d43d0202778f0c5
      
https://github.com/qemu/qemu/commit/93d8bc8f5bc20a3108c9c9592d43d0202778f0c5
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/npcm7xx_boards.c

  Log Message:
  -----------
  hw/arm/npcm7xx_boards: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

Machine "quanta-gbs-bmc" connects just one backend with
drive_get_next(), but with a helper function.  Change it to use
drive_get() directly.  This makes the unit numbers explicit in the
code.

Cc: Havard Skinnemoen <hskinnemoen@google.com>
Cc: Tyrone Ting <kfting@nuvoton.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-4-armbru@redhat.com>
Reviewed-by: Havard Skinnemoen <hskinnemoen@google.com>


  Commit: d83c29e98119570880491dacd8dbed9b45a53c5d
      
https://github.com/qemu/qemu/commit/d83c29e98119570880491dacd8dbed9b45a53c5d
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/versatilepb.c
    M hw/arm/vexpress.c

  Log Message:
  -----------
  hw/arm/versatilepb hw/arm/vexpress: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

The versatile and vexpress machines ("versatileab", "versatilepb",
"vexpress-a9", "vexpress-a15") connect just one or two backends of a
type with drive_get_next().  Change them to use drive_get() directly.
This makes the unit numbers explicit in the code.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-5-armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 6b87668b0813b9cb5ec714dcbcd8f128cfc4a3b1
      
https://github.com/qemu/qemu/commit/6b87668b0813b9cb5ec714dcbcd8f128cfc4a3b1
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/imx25_pdk.c

  Log Message:
  -----------
  hw/arm/imx25_pdk: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

Machine "imx25-pdk" connects backends with drive_get_next() in a
counting loop.  Change it to use drive_get() directly.  This makes the
unit numbers explicit in the code.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Jean-Christophe Dubois <jcd@tribudubois.net>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-6-armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 8acf052f7a70df88c01feccd8992eb50afce1b1d
      
https://github.com/qemu/qemu/commit/8acf052f7a70df88c01feccd8992eb50afce1b1d
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/mcimx6ul-evk.c

  Log Message:
  -----------
  hw/arm/mcimx6ul-evk: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

Machine "mcimx6ul-evk" connects backends with drive_get_next() in a
counting loop.  Change it to use drive_get() directly.  This makes the
unit numbers explicit in the code.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Jean-Christophe Dubois <jcd@tribudubois.net>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-7-armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 50659fc479977a7576c0cf0589c7fa31dabe0ad9
      
https://github.com/qemu/qemu/commit/50659fc479977a7576c0cf0589c7fa31dabe0ad9
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/mcimx7d-sabre.c

  Log Message:
  -----------
  hw/arm/mcimx7d-sabre: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

Machine "mcimx7d-sabre" connects backends with drive_get_next() in a
counting loop.  Change it to use drive_get() directly.  This makes the
unit numbers explicit in the code.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-8-armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: c29faeda3f7e770e463a58f7b5b34b409dba6c88
      
https://github.com/qemu/qemu/commit/c29faeda3f7e770e463a58f7b5b34b409dba6c88
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/xlnx-versal-virt.c

  Log Message:
  -----------
  hw/arm/xlnx-versal-virt: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

Machine "xlnx-versal-virt" connects backends with drive_get_next() in
a counting loop.  Change it to use drive_get() directly.  This makes
the unit numbers explicit in the code.

Cc: Alistair Francis <alistair@alistair23.me>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-9-armbru@redhat.com>
Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>


  Commit: 0de89a863292836e6efb0c40c6f9221c89a2033a
      
https://github.com/qemu/qemu/commit/0de89a863292836e6efb0c40c6f9221c89a2033a
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/microblaze/petalogix_ml605_mmu.c

  Log Message:
  -----------
  hw/microblaze: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

Machine "petalogix-ml605" connects backends with drive_get_next() in a
counting loop.  Change it to use drive_get() directly.  This makes the
unit numbers explicit in the code.

Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-10-armbru@redhat.com>
Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>


  Commit: 97ca6c2786e5dd1fd689c52ffe0cb082bc8bd477
      
https://github.com/qemu/qemu/commit/97ca6c2786e5dd1fd689c52ffe0cb082bc8bd477
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/xlnx-zcu102.c

  Log Message:
  -----------
  hw/arm/xlnx-zcu102: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

Machine "xlnx-zcu102" connects backends with drive_get_next() in
several counting loops.  Change it to use drive_get() directly.  This
makes the unit numbers explicit in the code.

Cc: Alistair Francis <alistair@alistair23.me>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-11-armbru@redhat.com>
Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>


  Commit: 94d4bb4ff9c557dcb68cd16a287700dd9218bd1c
      
https://github.com/qemu/qemu/commit/94d4bb4ff9c557dcb68cd16a287700dd9218bd1c
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/xilinx_zynq.c

  Log Message:
  -----------
  hw/arm/xilinx_zynq: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

Machine "xlnx-zcu102" connects backends with drive_get_next() in two
counting loops, one of them in a helper function.  Change it to use
drive_get() directly.  This makes the unit numbers explicit in the
code.

Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Alistair Francis <alistair@alistair23.me>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-12-armbru@redhat.com>
Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>


  Commit: 8ec239f2d80bed82ad5a361ddfb9ca3560a45ad8
      
https://github.com/qemu/qemu/commit/8ec239f2d80bed82ad5a361ddfb9ca3560a45ad8
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M hw/arm/aspeed.c

  Log Message:
  -----------
  hw/arm/aspeed: Replace drive_get_next() by drive_get()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

The aspeed machines connects backends with drive_get_next() in several
counting loops, one of them in a helper function, and a conditional.
Change it to use drive_get() directly.  This makes the unit numbers
explicit in the code.

Cc: "Cédric Le Goater" <clg@kaod.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-13-armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>


  Commit: 95fd260f0a3663ed229b8e0d2ef111a9f8bd93ad
      
https://github.com/qemu/qemu/commit/95fd260f0a3663ed229b8e0d2ef111a9f8bd93ad
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M blockdev.c
    M include/sysemu/blockdev.h

  Log Message:
  -----------
  blockdev: Drop unused drive_get_next()

drive_get_next() is basically a bad idea.  It returns the "next" block
backend of a certain interface type.  "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.

This lets you define unit numbers implicitly by execution order.  If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break.  Hard to spot in review.

The previous commits eliminated all uses.  Drop the function.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-14-armbru@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>


  Commit: e630bc7ec9dda656a452ed28cac4d1e9ed605d71
      
https://github.com/qemu/qemu/commit/e630bc7ec9dda656a452ed28cac4d1e9ed605d71
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-12-15 (Wed, 15 Dec 2021)

  Changed paths:
    M blockdev.c
    M hw/arm/aspeed.c
    M hw/arm/cubieboard.c
    M hw/arm/imx25_pdk.c
    M hw/arm/integratorcp.c
    M hw/arm/mcimx6ul-evk.c
    M hw/arm/mcimx7d-sabre.c
    M hw/arm/msf2-som.c
    M hw/arm/npcm7xx_boards.c
    M hw/arm/orangepi.c
    M hw/arm/raspi.c
    M hw/arm/realview.c
    M hw/arm/sabrelite.c
    M hw/arm/stellaris.c
    M hw/arm/versatilepb.c
    M hw/arm/vexpress.c
    M hw/arm/xilinx_zynq.c
    M hw/arm/xlnx-versal-virt.c
    M hw/arm/xlnx-zcu102.c
    M hw/microblaze/petalogix_ml605_mmu.c
    M hw/misc/sifive_u_otp.c
    M hw/riscv/microchip_pfsoc.c
    M hw/riscv/sifive_u.c
    M hw/sd/ssi-sd.c
    M hw/sparc64/niagara.c
    M include/sysemu/blockdev.h

  Log Message:
  -----------
  Merge tag 'pull-block-2021-12-15' of git://repo.or.cz/qemu/armbru into staging

Block device patches patches for 2021-12-15

# gpg: Signature made Wed 15 Dec 2021 05:58:14 AM PST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]

* tag 'pull-block-2021-12-15' of git://repo.or.cz/qemu/armbru:
  blockdev: Drop unused drive_get_next()
  hw/arm/aspeed: Replace drive_get_next() by drive_get()
  hw/arm/xilinx_zynq: Replace drive_get_next() by drive_get()
  hw/arm/xlnx-zcu102: Replace drive_get_next() by drive_get()
  hw/microblaze: Replace drive_get_next() by drive_get()
  hw/arm/xlnx-versal-virt: Replace drive_get_next() by drive_get()
  hw/arm/mcimx7d-sabre: Replace drive_get_next() by drive_get()
  hw/arm/mcimx6ul-evk: Replace drive_get_next() by drive_get()
  hw/arm/imx25_pdk: Replace drive_get_next() by drive_get()
  hw/arm/versatilepb hw/arm/vexpress: Replace drive_get_next() by drive_get()
  hw/arm/npcm7xx_boards: Replace drive_get_next() by drive_get()
  hw: Replace trivial drive_get_next() by drive_get()
  hw/sd/ssi-sd: Do not create SD card within controller's realize

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/aab8cfd4c361...e630bc7ec9dd



reply via email to

[Prev in Thread] Current Thread [Next in Thread]