Le 28/05/2019 à 18:40, Philippe Mathieu-Daudé a écrit :
> Rather than looking inside the definition of a BusState with "s->bus.qbus",
> use the QOM prefered style: "BUS(&s->bus)".
>
> This patch was generated using the following Coccinelle script:
>
> // Use BUS() macros to access BusState.qbus
> @use_bus_macro_to_access_qbus@
> expression obj;
> identifier bus;
> @@
> -&obj->bus.qbus
> +BUS(&obj->bus)
>
> Suggested-by: Peter Maydell <peter.mayd...@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> hw/scsi/lsi53c895a.c | 2 +-
> hw/scsi/mptsas.c | 4 ++--
> hw/scsi/virtio-scsi.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
> index da7239d94f..a8b7a199f9 100644
> --- a/hw/scsi/lsi53c895a.c
> +++ b/hw/scsi/lsi53c895a.c
> @@ -1860,7 +1860,7 @@ static void lsi_reg_writeb(LSIState *s, int offset,
> uint8_t val)
> }
> if (val & LSI_SCNTL1_RST) {
> if (!(s->sstat0 & LSI_SSTAT0_RST)) {
> - qbus_reset_all(&s->bus.qbus);
> + qbus_reset_all(BUS(&s->bus));
> s->sstat0 |= LSI_SSTAT0_RST;
> lsi_script_scsi_interrupt(s, LSI_SIST0_RST, 0);
> }
> diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
> index 929404fb48..e800683e91 100644
> --- a/hw/scsi/mptsas.c
> +++ b/hw/scsi/mptsas.c
> @@ -540,7 +540,7 @@ reply_maybe_async:
> break;
>
> case MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS:
> - qbus_reset_all(&s->bus.qbus);
> + qbus_reset_all(BUS(&s->bus));
> break;
>
> default:
> @@ -803,7 +803,7 @@ static void mptsas_soft_reset(MPTSASState *s)
> s->intr_mask = MPI_HIM_DIM | MPI_HIM_RIM;
> mptsas_update_interrupt(s);
>
> - qbus_reset_all(&s->bus.qbus);
> + qbus_reset_all(BUS(&s->bus));
> s->intr_status = 0;
> s->intr_mask = save_mask;
>
> diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
> index 839f120256..2a71b78e22 100644
> --- a/hw/scsi/virtio-scsi.c
> +++ b/hw/scsi/virtio-scsi.c
> @@ -696,7 +696,7 @@ static void virtio_scsi_reset(VirtIODevice *vdev)
>
> assert(!s->dataplane_started);
> s->resetting++;
> - qbus_reset_all(&s->bus.qbus);
> + qbus_reset_all(BUS(&s->bus));
> s->resetting--;
>
> vs->sense_size = VIRTIO_SCSI_SENSE_DEFAULT_SIZE;
>
Applied to my trivial-patches branch.
Thanks,
Laurent
