OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/scsi: Use the QOM BUS() macro to access BusState.qbus 

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.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20190528164020.32250-3-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Philippe Mathieu-Daudé 2019-05-28 18:40:12 +02:00 committed by Laurent Vivier
parent 6afa968a93
commit 824755baf8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/scsi/lsi53c895a.c
View File

@ -1860,7 +1860,7 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val)
} }
if (val & LSI_SCNTL1_RST) { if (val & LSI_SCNTL1_RST) {
if (!(s->sstat0 & LSI_SSTAT0_RST)) { if (!(s->sstat0 & LSI_SSTAT0_RST)) {
qbus_reset_all(&s->bus.qbus); qbus_reset_all(BUS(&s->bus));
s->sstat0 |= LSI_SSTAT0_RST; s->sstat0 |= LSI_SSTAT0_RST;
lsi_script_scsi_interrupt(s, LSI_SIST0_RST, 0); lsi_script_scsi_interrupt(s, LSI_SIST0_RST, 0);
} }

4
hw/scsi/mptsas.c
View File

@ -540,7 +540,7 @@ reply_maybe_async:
break; break;
case MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS: case MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS:
qbus_reset_all(&s->bus.qbus); qbus_reset_all(BUS(&s->bus));
break; break;
default: default:
@ -803,7 +803,7 @@ static void mptsas_soft_reset(MPTSASState *s)
s->intr_mask = MPI_HIM_DIM | MPI_HIM_RIM; s->intr_mask = MPI_HIM_DIM | MPI_HIM_RIM;
mptsas_update_interrupt(s); mptsas_update_interrupt(s);
qbus_reset_all(&s->bus.qbus); qbus_reset_all(BUS(&s->bus));
s->intr_status = 0; s->intr_status = 0;
s->intr_mask = save_mask; s->intr_mask = save_mask;

2
hw/scsi/virtio-scsi.c
View File

@ -696,7 +696,7 @@ static void virtio_scsi_reset(VirtIODevice *vdev)
assert(!s->dataplane_started); assert(!s->dataplane_started);
s->resetting++; s->resetting++;
qbus_reset_all(&s->bus.qbus); qbus_reset_all(BUS(&s->bus));
s->resetting--; s->resetting--;
vs->sense_size = VIRTIO_SCSI_SENSE_DEFAULT_SIZE; vs->sense_size = VIRTIO_SCSI_SENSE_DEFAULT_SIZE;