From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1jDz-0006SX-L3 for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:25:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1jDw-0006Qz-OF for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:25:51 -0400 From: Markus Armbruster Date: Wed, 15 Aug 2012 21:17:36 +0200 Message-Id: <1345058260-16229-24-git-send-email-armbru@redhat.com> In-Reply-To: <1345058260-16229-1-git-send-email-armbru@redhat.com> References: <1345058260-16229-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 for-1.2 23/27] ppc: Suppress unused default drives List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Alexander Graf , anthony@codemonkey.ws Cc: Alexander Graf Cc: Andreas F=C3=A4rber Cc: qemu-ppc@nongnu.org Suppress default floppy drive for machines ref405ep, taihu, bamboo, mac99, g3beige, mpc8544ds, pseries, virtex-ml507. Suppress default CD-ROM drive for machines ref405ep, taihu, bamboo, mpc8544ds, virtex-ml507. Suppress default SD card drive for machines ref405ep, taihu, bamboo, mac99, g3beige, prep, mpc8544ds, pseries, virtex-ml507. 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/ppce500_mpc8544ds.c | 3 --- hw/spapr.c | 2 -- hw/virtex_ml507.c | 3 --- 8 files changed, 22 deletions(-) diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c index 8c5af01..476775d 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc405_boards.c @@ -363,9 +363,6 @@ static QEMUMachine ref405ep_machine =3D { .name =3D "ref405ep", .desc =3D "ref405ep", .init =3D ref405ep_init, - .use_floppy =3D 1, - .use_cdrom =3D 1, - .use_sdcard =3D 1, }; =20 /***********************************************************************= ******/ @@ -655,9 +652,6 @@ static QEMUMachine taihu_machine =3D { .name =3D "taihu", .desc =3D "taihu", .init =3D taihu_405ep_init, - .use_floppy =3D 1, - .use_cdrom =3D 1, - .use_sdcard =3D 1, }; =20 static void ppc405_machine_init(void) diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 4b9a1e5..0dd4dab 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -294,9 +294,6 @@ static QEMUMachine bamboo_machine =3D { .name =3D "bamboo", .desc =3D "bamboo", .init =3D bamboo_init, - .use_floppy =3D 1, - .use_cdrom =3D 1, - .use_sdcard =3D 1, }; =20 static void bamboo_machine_init(void) diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index f7197d3..58158c3 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -423,9 +423,7 @@ static QEMUMachine core99_machine =3D { .desc =3D "Mac99 based PowerMAC", .init =3D ppc_core99_init, .max_cpus =3D MAX_CPUS, - .use_floppy =3D 1, .use_cdrom =3D 1, - .use_sdcard =3D 1, #ifdef TARGET_PPC64 .is_default =3D 1, #endif diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 9f56b73..66b020d 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -338,9 +338,7 @@ static QEMUMachine heathrow_machine =3D { .desc =3D "Heathrow based PowerMAC", .init =3D ppc_heathrow_init, .max_cpus =3D MAX_CPUS, - .use_floppy =3D 1, .use_cdrom =3D 1, - .use_sdcard =3D 1, #ifndef TARGET_PPC64 .is_default =3D 1, #endif diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index d8b3441..350849a 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -696,7 +696,6 @@ static QEMUMachine prep_machine =3D { .max_cpus =3D MAX_CPUS, .use_floppy =3D 1, .use_cdrom =3D 1, - .use_sdcard =3D 1, }; =20 static void prep_machine_init(void) diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index 1e5801e..8b9fd83 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -600,9 +600,6 @@ static QEMUMachine mpc8544ds_machine =3D { .desc =3D "mpc8544ds", .init =3D mpc8544ds_init, .max_cpus =3D 15, - .use_floppy =3D 1, - .use_cdrom =3D 1, - .use_sdcard =3D 1, }; =20 static void mpc8544ds_machine_init(void) diff --git a/hw/spapr.c b/hw/spapr.c index a744451..8e5a9b9 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -800,9 +800,7 @@ static QEMUMachine spapr_machine =3D { .max_cpus =3D MAX_CPUS, .no_parallel =3D 1, .use_scsi =3D 1, - .use_floppy =3D 1, .use_cdrom =3D 1, - .use_sdcard =3D 1, }; =20 static void spapr_machine_init(void) diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index a1d71f5..79bc0d1 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c @@ -264,9 +264,6 @@ static QEMUMachine virtex_machine =3D { .name =3D "virtex-ml507", .desc =3D "Xilinx Virtex ML507 reference design", .init =3D virtex_init, - .use_floppy =3D 1, - .use_cdrom =3D 1, - .use_sdcard =3D 1, }; =20 static void virtex_machine_init(void) --=20 1.7.11.2