On Thu, Jan 26, 2017 at 9:59 AM, Thomas Huth <th...@redhat.com> wrote:
> On 26.01.2017 16:09, Markus Armbruster wrote:
>> Block backends defined with -drive if=scsi are meant to be picked up
>> by machine initialization code: a suitable frontend gets created and
>> wired up automatically.
>>
>> if=scsi drives not picked up that way can still be used with -device
>> as if they had if=none, but that's unclean and best avoided. Unused
>> ones produce an "Orphaned drive without device" warning.
>>
>> A few machine types default to if=scsi, even though they don't
>> actually have a SCSI HBA. This makes no sense. Change their default
>> to if=none. Affected machines:
>>
>> * aarch64/arm: realview-pbx-a9 vexpress-a9 vexpress-a15 xilinx-zynq-a9
>>
>> Cc: Peter Maydell <peter.mayd...@linaro.org>
>> Cc: "Edgar E. Iglesias" <edgar.igles...@gmail.com>
>> Cc: Alistair Francis <alistair.fran...@xilinx.com>
>> Cc: qemu-...@nongnu.org
>> Signed-off-by: Markus Armbruster <arm...@redhat.com>
>> ---
>> hw/arm/realview.c | 1 -
>> hw/arm/vexpress.c | 1 -
>> hw/arm/xilinx_zynq.c | 1 -
>> 3 files changed, 3 deletions(-)
>>
>> diff --git a/hw/arm/realview.c b/hw/arm/realview.c
>> index 8eafcca..8c11c7a 100644
>> --- a/hw/arm/realview.c
>> +++ b/hw/arm/realview.c
>> @@ -443,7 +443,6 @@ static void realview_pbx_a9_class_init(ObjectClass *oc,
>> void *data)
>>
>> mc->desc = "ARM RealView Platform Baseboard Explore for Cortex-A9";
>> mc->init = realview_pbx_a9_init;
>> - mc->block_default_type = IF_SCSI;
>> mc->max_cpus = 4;
>> }
>>
>> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
>> index 58760f4..5756470 100644
>> --- a/hw/arm/vexpress.c
>> +++ b/hw/arm/vexpress.c
>> @@ -751,7 +751,6 @@ static void vexpress_class_init(ObjectClass *oc, void
>> *data)
>>
>> mc->desc = "ARM Versatile Express";
>> mc->init = vexpress_common_init;
>> - mc->block_default_type = IF_SCSI;
>> mc->max_cpus = 4;
>> }
>>
>> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
>> index 7dac20d..3985356 100644
>> --- a/hw/arm/xilinx_zynq.c
>> +++ b/hw/arm/xilinx_zynq.c
>> @@ -323,7 +323,6 @@ static void zynq_machine_init(MachineClass *mc)
>> {
>> mc->desc = "Xilinx Zynq Platform Baseboard for Cortex-A9";
>> mc->init = zynq_init;
>> - mc->block_default_type = IF_SCSI;
>> mc->max_cpus = 1;
>> mc->no_sdcard = 1;
>> }
>
> Right, that looks like old copy-n-paste bugs from other machine types.
>
> Reviewed-by: Thomas Huth <th...@redhat.com>
Yeah, I agree. This looks good to me.
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Thanks,
Alistair
>
>
