mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
scsi: Use device_cold_reset() and bus_cold_reset()
In the SCSI subsystem we currently use the legacy functions qdev_reset_all() and qbus_reset_all(). These perform a recursive reset, starting from either a qbus or a qdev. However they do not permit any of the devices in the tree to use three-phase reset, because device reset goes through the device_legacy_reset() function that only calls the single DeviceClass::reset method. Switch to using the device_cold_reset() and bus_cold_reset() functions. These also perform a recursive reset, where first the children are reset and then finally the parent, but they use the new (...in 2020...) Resettable mechanism, which supports both the old style single-reset method and also the new 3-phase reset handling. Since no devices attached to SCSI buses currently try to use 3-phase reset, this should be a no-behaviour-change commit which just reduces the use of a deprecated API. Commit created with: sed -i -e 's/qdev_reset_all/device_cold_reset/g;s/qbus_reset_all/bus_cold_reset/g' hw/scsi/*.c Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20221013160623.1296109-2-peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
35fd22b01d
commit
4a5fc890b1
7 changed files with 14 additions and 14 deletions
|
@ -941,7 +941,7 @@ static void esp_soft_reset(ESPState *s)
|
|||
|
||||
static void esp_bus_reset(ESPState *s)
|
||||
{
|
||||
qbus_reset_all(BUS(&s->bus));
|
||||
bus_cold_reset(BUS(&s->bus));
|
||||
}
|
||||
|
||||
static void parent_esp_reset(ESPState *s, int irq, int level)
|
||||
|
|
|
@ -1868,7 +1868,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(BUS(&s->bus));
|
||||
bus_cold_reset(BUS(&s->bus));
|
||||
s->sstat0 |= LSI_SSTAT0_RST;
|
||||
lsi_script_scsi_interrupt(s, LSI_SIST0_RST, 0);
|
||||
}
|
||||
|
@ -1926,7 +1926,7 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val)
|
|||
lsi_execute_script(s);
|
||||
}
|
||||
if (val & LSI_ISTAT0_SRST) {
|
||||
qdev_reset_all(DEVICE(s));
|
||||
device_cold_reset(DEVICE(s));
|
||||
}
|
||||
break;
|
||||
case 0x16: /* MBOX0 */
|
||||
|
|
|
@ -1484,7 +1484,7 @@ static int megasas_cluster_reset_ld(MegasasState *s, MegasasCmd *cmd)
|
|||
MegasasCmd *tmp_cmd = &s->frames[i];
|
||||
if (tmp_cmd->req && tmp_cmd->req->dev->id == target_id) {
|
||||
SCSIDevice *d = tmp_cmd->req->dev;
|
||||
qdev_reset_all(&d->qdev);
|
||||
device_cold_reset(&d->qdev);
|
||||
}
|
||||
}
|
||||
return MFI_STAT_OK;
|
||||
|
|
|
@ -522,7 +522,7 @@ reply_maybe_async:
|
|||
reply.ResponseCode = MPI_SCSITASKMGMT_RSP_TM_INVALID_LUN;
|
||||
goto out;
|
||||
}
|
||||
qdev_reset_all(&sdev->qdev);
|
||||
device_cold_reset(&sdev->qdev);
|
||||
break;
|
||||
|
||||
case MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET:
|
||||
|
@ -538,13 +538,13 @@ reply_maybe_async:
|
|||
QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
|
||||
sdev = SCSI_DEVICE(kid->child);
|
||||
if (sdev->channel == 0 && sdev->id == req->TargetID) {
|
||||
qdev_reset_all(kid->child);
|
||||
device_cold_reset(kid->child);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS:
|
||||
qbus_reset_all(BUS(&s->bus));
|
||||
bus_cold_reset(BUS(&s->bus));
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -807,7 +807,7 @@ static void mptsas_soft_reset(MPTSASState *s)
|
|||
s->intr_mask = MPI_HIM_DIM | MPI_HIM_RIM;
|
||||
mptsas_update_interrupt(s);
|
||||
|
||||
qbus_reset_all(BUS(&s->bus));
|
||||
bus_cold_reset(BUS(&s->bus));
|
||||
s->intr_status = 0;
|
||||
s->intr_mask = save_mask;
|
||||
|
||||
|
|
|
@ -865,7 +865,7 @@ static int vscsi_process_tsk_mgmt(VSCSIState *s, vscsi_req *req)
|
|||
break;
|
||||
}
|
||||
|
||||
qdev_reset_all(&d->qdev);
|
||||
device_cold_reset(&d->qdev);
|
||||
break;
|
||||
|
||||
case SRP_TSK_ABORT_TASK_SET:
|
||||
|
|
|
@ -365,7 +365,7 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req)
|
|||
goto incorrect_lun;
|
||||
}
|
||||
s->resetting++;
|
||||
qdev_reset_all(&d->qdev);
|
||||
device_cold_reset(&d->qdev);
|
||||
s->resetting--;
|
||||
break;
|
||||
|
||||
|
@ -417,7 +417,7 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req)
|
|||
QTAILQ_FOREACH_RCU(kid, &s->bus.qbus.children, sibling) {
|
||||
SCSIDevice *d1 = SCSI_DEVICE(kid->child);
|
||||
if (d1->channel == 0 && d1->id == target) {
|
||||
qdev_reset_all(&d1->qdev);
|
||||
device_cold_reset(&d1->qdev);
|
||||
}
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
@ -831,7 +831,7 @@ static void virtio_scsi_reset(VirtIODevice *vdev)
|
|||
|
||||
assert(!s->dataplane_started);
|
||||
s->resetting++;
|
||||
qbus_reset_all(BUS(&s->bus));
|
||||
bus_cold_reset(BUS(&s->bus));
|
||||
s->resetting--;
|
||||
|
||||
vs->sense_size = VIRTIO_SCSI_SENSE_DEFAULT_SIZE;
|
||||
|
|
|
@ -445,7 +445,7 @@ static void
|
|||
pvscsi_reset_adapter(PVSCSIState *s)
|
||||
{
|
||||
s->resetting++;
|
||||
qbus_reset_all(BUS(&s->bus));
|
||||
bus_cold_reset(BUS(&s->bus));
|
||||
s->resetting--;
|
||||
pvscsi_process_completion_queue(s);
|
||||
assert(QTAILQ_EMPTY(&s->pending_queue));
|
||||
|
@ -894,7 +894,7 @@ pvscsi_on_cmd_reset_bus(PVSCSIState *s)
|
|||
trace_pvscsi_on_cmd_arrived("PVSCSI_CMD_RESET_BUS");
|
||||
|
||||
s->resetting++;
|
||||
qbus_reset_all(BUS(&s->bus));
|
||||
bus_cold_reset(BUS(&s->bus));
|
||||
s->resetting--;
|
||||
return PVSCSI_COMMAND_PROCESSING_SUCCEEDED;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue