Andreas Färber <andreas.faer...@web.de> writes:
> Am 09.08.2012 15:31, schrieb Markus Armbruster:
>> Cc: Alexander Graf <ag...@suse.de>
>> Cc: Andreas Färber <andreas.faer...@web.de>
>> Cc: qemu-...@nongnu.org
>>
>> Suppress default floppy drive for machines ref405ep, taihu, bamboo,
>> mac99, g3beige, virtex-ml507.
>>
>> Suppress default CD-ROM drive for machines ref405ep, taihu, bamboo,
>> virtex-ml507.
>>
>> Suppress default SD card drive for machines ref405ep, taihu, bamboo,
>> mac88, g3beige, prep, virtex-ml507.
>
> mac99
Oopsie. Thanks!
>> Signed-off-by: Markus Armbruster <arm...@redhat.com>
>> ---
>> hw/ppc405_boards.c | 6 ++++++
>> hw/ppc440_bamboo.c | 3 +++
>> hw/ppc_newworld.c | 2 ++
>> hw/ppc_oldworld.c | 2 ++
>> hw/ppc_prep.c | 1 +
>> hw/virtex_ml507.c | 3 +++
>> 6 files changed, 17 insertions(+)
> [...]
>> diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
>> index 4e2a6e6..1e41c2b 100644
>> --- a/hw/ppc_newworld.c
>> +++ b/hw/ppc_newworld.c
>> @@ -423,6 +423,8 @@ static QEMUMachine core99_machine = {
>> .desc = "Mac99 based PowerMAC",
>> .init = ppc_core99_init,
>> .max_cpus = MAX_CPUS,
>> + .no_floppy = 1,
>> + .no_sdcard = 1,
>> #ifdef TARGET_PPC64
>> .is_default = 1,
>> #endif
>
> Ack.
>
>> diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
>> index f2c6908..bcecc0a 100644
>> --- a/hw/ppc_oldworld.c
>> +++ b/hw/ppc_oldworld.c
>> @@ -338,6 +338,8 @@ static QEMUMachine heathrow_machine = {
>> .desc = "Heathrow based PowerMAC",
>> .init = ppc_heathrow_init,
>> .max_cpus = MAX_CPUS,
>> + .no_floppy = 1,
>> + .no_sdcard = 1,
>> #ifndef TARGET_PPC64
>> .is_default = 1,
>> #endif
>
> Ack for SD.
>
> Not sure about the floppy. I thought the beige Old World machines used
> to have a floppy with some incompatible Apple formatting... Did they use
> a controller we don't implement? If so, then .no_floppy should get a
> comment.
I have no idea. Alex?
>> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
>> index be2b268..9393022 100644
>> --- a/hw/ppc_prep.c
>> +++ b/hw/ppc_prep.c
>> @@ -694,6 +694,7 @@ static QEMUMachine prep_machine = {
>> .desc = "PowerPC PREP platform",
>> .init = ppc_prep_init,
>> .max_cpus = MAX_CPUS,
>> + .no_sdcard = 1,
>> };
>>
>> static void prep_machine_init(void)
>
> Ack.
>
>> diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
>> index 79bc0d1..62b56c0 100644
>> --- a/hw/virtex_ml507.c
>> +++ b/hw/virtex_ml507.c
>> @@ -264,6 +264,9 @@ static QEMUMachine virtex_machine = {
>> .name = "virtex-ml507",
>> .desc = "Xilinx Virtex ML507 reference design",
>> .init = virtex_init,
>> + .no_floppy = 1,
>> + .no_cdrom = 1,
>> + .no_sdcard = 1,
>> };
>>
>> static void virtex_machine_init(void)
>
> Markus, independent of this patch, might it make sense to invert the
> logic here so that machine authors don't need to know the list of what
> .no_ options to specify?
Leaning towards yes.
