[PATCH 10/14] hw/scsi: remove 'scsi-disk' device

[Thomas Huth]

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 at 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(-)
> 
> diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
> index f5c82a46dc..cb88fea94f 100644
> --- a/docs/system/deprecated.rst
> +++ b/docs/system/deprecated.rst
> @@ -239,15 +239,6 @@ The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated
>   (the ISA has never been upstreamed to a compiler toolchain). Therefore
>   this CPU is also deprecated.
>   
> -System emulator devices
> ------------------------
> -
> -``scsi-disk`` (since 4.2)
> -'''''''''''''''''''''''''
> -
> -The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or
> -'scsi-cd' as appropriate to get a SCSI hard disk or CD-ROM as needed.
> -
>   System emulator machines
>   ------------------------
>   
> diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst
> index 8fd3fafb32..bb6bc8dfc8 100644
> --- a/docs/system/removed-features.rst
> +++ b/docs/system/removed-features.rst
> @@ -222,6 +222,12 @@ System emulator devices
>   The 'ide-drive' device has been removed. Users should use 'ide-hd' or
>   'ide-cd' as appropriate to get an IDE hard disk or CD-ROM as needed.
>   
> +``scsi-disk`` (removed in 6.0)
> +''''''''''''''''''''''''''''''
> +
> +The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or
> +'scsi-cd' as appropriate to get a SCSI hard disk or CD-ROM as needed.

s/is deprecated/has been removed/

> 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);

Please squash this hunk into the 'ide-drive' patch instead.

With the two nits fixed:
Reviewed-by: Thomas Huth <thuth at redhat.com>