From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzU8A-0003ua-6P for qemu-devel@nongnu.org; Thu, 09 Aug 2012 10:54:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SzU84-0003Xr-94 for qemu-devel@nongnu.org; Thu, 09 Aug 2012 10:54:34 -0400 From: Markus Armbruster References: <1344519084-21847-1-git-send-email-armbru@redhat.com> <1344519084-21847-21-git-send-email-armbru@redhat.com> <5023C745.9040907@web.de> Date: Thu, 09 Aug 2012 16:54:24 +0200 In-Reply-To: <5023C745.9040907@web.de> ("Andreas =?utf-8?Q?F=C3=A4rber=22'?= =?utf-8?Q?s?= message of "Thu, 09 Aug 2012 16:20:53 +0200") Message-ID: <87d330ru8v.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 20/23] ppc: Suppress unused default drives List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?utf-8?Q?F=C3=A4rber?= Cc: Blue Swirl , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Alexander Graf Andreas F=C3=A4rber writes: > Am 09.08.2012 15:31, schrieb Markus Armbruster: >> Cc: Alexander Graf >> Cc: Andreas F=C3=A4rber >> Cc: qemu-ppc@nongnu.org >>=20 >> Suppress default floppy drive for machines ref405ep, taihu, bamboo, >> mac99, g3beige, virtex-ml507. >>=20 >> Suppress default CD-ROM drive for machines ref405ep, taihu, bamboo, >> virtex-ml507. >>=20 >> Suppress default SD card drive for machines ref405ep, taihu, bamboo, >> mac88, g3beige, prep, virtex-ml507. > > mac99 Oopsie. Thanks! >> Signed-off-by: Markus Armbruster >> --- >> 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 =3D { >> .desc =3D "Mac99 based PowerMAC", >> .init =3D ppc_core99_init, >> .max_cpus =3D MAX_CPUS, >> + .no_floppy =3D 1, >> + .no_sdcard =3D 1, >> #ifdef TARGET_PPC64 >> .is_default =3D 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 =3D { >> .desc =3D "Heathrow based PowerMAC", >> .init =3D ppc_heathrow_init, >> .max_cpus =3D MAX_CPUS, >> + .no_floppy =3D 1, >> + .no_sdcard =3D 1, >> #ifndef TARGET_PPC64 >> .is_default =3D 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 =3D { >> .desc =3D "PowerPC PREP platform", >> .init =3D ppc_prep_init, >> .max_cpus =3D MAX_CPUS, >> + .no_sdcard =3D 1, >> }; >>=20=20 >> 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 =3D { >> .name =3D "virtex-ml507", >> .desc =3D "Xilinx Virtex ML507 reference design", >> .init =3D virtex_init, >> + .no_floppy =3D 1, >> + .no_cdrom =3D 1, >> + .no_sdcard =3D 1, >> }; >>=20=20 >> 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.