Re: [PATCH 10/14] hw/scsi: remove 'scsi-disk' device
On Wed, Feb 24, 2021 at 03:26:59PM +0100, Thomas Huth wrote:
On 24/02/2021 14.11, Daniel P. Berrangé wrote:
> The 'scsi-hd' and 'scsi-cd' devices provide suitable alternatives.
>
> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> ---
> docs/system/deprecated.rst | 9 -----
> docs/system/removed-features.rst | 6 ++++
> hw/i386/pc.c | 1 -
> hw/scsi/scsi-disk.c | 62 --------------------------------
> hw/sparc64/sun4u.c | 1 -
> scripts/device-crash-test | 1 -
> tests/qemu-iotests/051 | 2 --
> tests/qemu-iotests/051.pc.out | 10 ------
> 8 files changed, 6 insertions(+), 86 deletions(-)
I see some occurrances of "scsi-disk" in the config files in the
docs/config/ directory, too ... I guess they should also be removed?
Those aren't referring to the "scsi-disk" device type, they are qdev
IDs, and do indeed already use "scsi-hd" as the device type.
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index d7c27144ba..cda7df36e3 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -749,7 +749,6 @@ static char *sun4u_fw_dev_path(FWPathProvider *p, BusState
*bus,
> DeviceState *dev)
> {
> PCIDevice *pci;
> - int bus_id;
> if (!strcmp(object_get_typename(OBJECT(dev)), "pbm-bridge")) {
> pci = PCI_DEVICE(dev);
This lonely hunk should be squashed into the previous (ide-disk) patch instead.
Thomas
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|