Le 28/05/2019 à 18:40, Philippe Mathieu-Daudé a écrit : > Since the BusState is accesible from the SCSIBus object, > it is pointless to use qbus_reset_all_fn. > Use qbus_reset_all() directly. > > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > v2: Use BUS() macro (Peter Maydell) > > One step toward removing qbus_reset_all_fn() > --- > hw/scsi/vmw_pvscsi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c > index 584b4be07e..c39e33fa35 100644 > --- a/hw/scsi/vmw_pvscsi.c > +++ b/hw/scsi/vmw_pvscsi.c > @@ -440,7 +440,7 @@ static void > pvscsi_reset_adapter(PVSCSIState *s) > { > s->resetting++; > - qbus_reset_all_fn(&s->bus); > + qbus_reset_all(BUS(&s->bus)); > s->resetting--; > pvscsi_process_completion_queue(s); > assert(QTAILQ_EMPTY(&s->pending_queue)); > @@ -848,7 +848,7 @@ pvscsi_on_cmd_reset_bus(PVSCSIState *s) > trace_pvscsi_on_cmd_arrived("PVSCSI_CMD_RESET_BUS"); > > s->resetting++; > - qbus_reset_all_fn(&s->bus); > + qbus_reset_all(BUS(&s->bus)); > s->resetting--; > return PVSCSI_COMMAND_PROCESSING_SUCCEEDED; > } >
Applied to my trivial-patches branch. Thanks, Laurent