[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 14/19] hw/scsi/scsi-bus: Inline two uses of scsi_bus_from_
From: |
Eric Farman |
Subject: |
Re: [PATCH v2 14/19] hw/scsi/scsi-bus: Inline two uses of scsi_bus_from_device() |
Date: |
Mon, 13 Feb 2023 10:28:31 -0500 |
User-agent: |
Evolution 3.46.3 (3.46.3-1.fc37) |
On Mon, 2023-02-13 at 08:08 +0100, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Eric Farman <farman@linux.ibm.com>
> ---
> hw/s390x/ipl.c | 7 ++-----
> hw/scsi/scsi-bus.c | 2 +-
> include/hw/scsi/scsi.h | 5 -----
> 3 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 8612684d48..4f7f4e60d6 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -366,11 +366,8 @@ static CcwDevice
> *s390_get_ccw_device(DeviceState *dev_st, int *devtype)
> ccw_dev = CCW_DEVICE(vfio_ccw_dev);
> tmp_dt = CCW_DEVTYPE_VFIO;
> } else {
> - SCSIDevice *sd = (SCSIDevice *)
> - object_dynamic_cast(OBJECT(dev_st),
> - TYPE_SCSI_DEVICE);
> - if (sd) {
> - SCSIBus *sbus = scsi_bus_from_device(sd);
> + if (object_dynamic_cast(OBJECT(dev_st),
> TYPE_SCSI_DEVICE)) {
> + SCSIBus *sbus =
> SCSI_BUS(qdev_get_parent_bus(dev_st));
> VirtIODevice *vdev = (VirtIODevice *)
> object_dynamic_cast(OBJECT(sbus->qbus.parent),
> TYPE_VIRTIO_DEVICE);
> diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
> index c4525515ab..ee72b86b13 100644
> --- a/hw/scsi/scsi-bus.c
> +++ b/hw/scsi/scsi-bus.c
> @@ -679,7 +679,7 @@ SCSIRequest *scsi_req_alloc(const SCSIReqOps
> *reqops, SCSIDevice *d,
> uint32_t tag, uint32_t lun, void
> *hba_private)
> {
> SCSIRequest *req;
> - SCSIBus *bus = scsi_bus_from_device(d);
> + SCSIBus *bus = SCSI_BUS(qdev_get_parent_bus(DEVICE(d)));
> BusState *qbus = BUS(bus);
> const int memset_off = offsetof(SCSIRequest, sense)
> + sizeof(req->sense);
> diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
> index eb558c145a..e3263dec0d 100644
> --- a/include/hw/scsi/scsi.h
> +++ b/include/hw/scsi/scsi.h
> @@ -175,11 +175,6 @@ static inline void scsi_bus_init(SCSIBus *bus,
> size_t bus_size,
> scsi_bus_init_named(bus, bus_size, host, info, NULL);
> }
>
> -static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d)
> -{
> - return SCSI_BUS(qdev_get_parent_bus(DEVICE(d)));
> -}
> -
> SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend
> *blk,
> int unit, bool removable, int
> bootindex,
> bool share_rw,
- [PATCH v2 07/19] hw/ide/qdev: Replace DO_UPCAST(IDEBus) by IDE_BUS(), (continued)
- [PATCH v2 07/19] hw/ide/qdev: Replace DO_UPCAST(IDEBus) by IDE_BUS(), Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 08/19] hw/net/eepro100: Introduce TYPE_EEPRO100 QOM abstract parent, Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 09/19] hw/net/eepro100: Replace DO_UPCAST(EEPRO100State) by EEPRO100(), Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 10/19] hw/net/ne2000-pci: Replace DO_UPCAST(PCINE2000State) by PCI_NE2000(), Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 11/19] hw/net/tulip: Finish QOM conversion, Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 12/19] hw/pci/pci: Replace DO_UPCAST(PCIBus) by PCI_BUS(), Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 13/19] hw/scsi/scsi-bus: Replace DO_UPCAST(SCSIBus) by SCSI_BUS(), Philippe Mathieu-Daudé, 2023/02/13
- [PATCH v2 14/19] hw/scsi/scsi-bus: Inline two uses of scsi_bus_from_device(), Philippe Mathieu-Daudé, 2023/02/13
- Re: [PATCH v2 14/19] hw/scsi/scsi-bus: Inline two uses of scsi_bus_from_device(),
Eric Farman <=
- [PATCH v2 16/19] hw/vfio/ccw: Replace DO_UPCAST(VFIOCCWDevice) by VFIO_CCW(), Philippe Mathieu-Daudé, 2023/02/13
[PATCH v2 15/19] hw/s390x/event-facility: Replace DO_UPCAST(SCLPEvent) by SCLP_EVENT(), Philippe Mathieu-Daudé, 2023/02/13
[PATCH v2 17/19] hw/usb/dev-hub: Use QOM USB_HUB() macro instead of casting, Philippe Mathieu-Daudé, 2023/02/13
[RFC PATCH v2 19/19] hw/usb: Inline usb_bus_from_device(), Philippe Mathieu-Daudé, 2023/02/13