Re: [Qemu-ppc] [PATCH 20/23] ppc: Suppress unused default drives

[Markus Armbruster]

Alexander Graf <address@hidden> writes:

> On 09.08.2012, at 16:54, Markus Armbruster <address@hidden> wrote:
>
>> Andreas Färber <address@hidden> writes:
>> 
>>> Am 09.08.2012 15:31, schrieb Markus Armbruster:
>>>> Cc: Alexander Graf <address@hidden>
>>>> Cc: Andreas Färber <address@hidden>
>>>> Cc: address@hidden
>>>> 
>>>> 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 <address@hidden>
>>>> ---
>>>> 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?
>
> I'd have to check wikipedia all the same :)

All right, I did: they had some kind of floppy.  No clue what kind.

And we already have a comment:

            /* TOFIX: for now, the second IDE channel is not properly
             *        used by OHW. The Mac floppy disk are not emulated.
             *        For now, OHW cannot boot from the network.
             */

Andreas, still want a comment next to .no_floppy?