| Message ID | 20230607043943.1837186-10-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | aspeed: fixes and extensions | expand |
On Wed, 7 Jun 2023 at 04:40, Cédric Le Goater <clg@kaod.org> wrote: > > It will help in getting rid of some drive_get(IF_MTD) calls by > retrieving the BlockBackend directly from the m25p80 device. > > Cc: Alistair Francis <alistair@alistair23.me> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Cédric Le Goater <clg@kaod.org> One suggestion below after reading patch 10. Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > include/hw/block/flash.h | 4 ++++ > hw/block/m25p80.c | 6 ++++++ > 2 files changed, 10 insertions(+) > > diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h > index 7198953702b7..de93756cbe8f 100644 > --- a/include/hw/block/flash.h > +++ b/include/hw/block/flash.h > @@ -76,4 +76,8 @@ uint8_t ecc_digest(ECCState *s, uint8_t sample); > void ecc_reset(ECCState *s); > extern const VMStateDescription vmstate_ecc_state; > > +/* m25p80.c */ > + > +BlockBackend *m25p80_get_blk(DeviceState *dev); > + > #endif > diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c > index dc5ffbc4ff52..afc3fdf4d60b 100644 > --- a/hw/block/m25p80.c > +++ b/hw/block/m25p80.c > @@ -25,6 +25,7 @@ > #include "qemu/units.h" > #include "sysemu/block-backend.h" > #include "hw/block/block.h" > +#include "hw/block/flash.h" > #include "hw/qdev-properties.h" > #include "hw/qdev-properties-system.h" > #include "hw/ssi/ssi.h" > @@ -1830,3 +1831,8 @@ static void m25p80_register_types(void) > } > > type_init(m25p80_register_types) > + > +BlockBackend *m25p80_get_blk(DeviceState *dev) > +{ > + return M25P80(dev)->blk; Is it qemu convention for the caller to do the null check on dev, or should it go in this helper? > +} > -- > 2.40.1 >
diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index 7198953702b7..de93756cbe8f 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -76,4 +76,8 @@ uint8_t ecc_digest(ECCState *s, uint8_t sample); void ecc_reset(ECCState *s); extern const VMStateDescription vmstate_ecc_state; +/* m25p80.c */ + +BlockBackend *m25p80_get_blk(DeviceState *dev); + #endif diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index dc5ffbc4ff52..afc3fdf4d60b 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -25,6 +25,7 @@ #include "qemu/units.h" #include "sysemu/block-backend.h" #include "hw/block/block.h" +#include "hw/block/flash.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/ssi/ssi.h" @@ -1830,3 +1831,8 @@ static void m25p80_register_types(void) } type_init(m25p80_register_types) + +BlockBackend *m25p80_get_blk(DeviceState *dev) +{ + return M25P80(dev)->blk; +}