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

[Markus Armbruster <armbru@redhat.com>]

Cc: Alexander Graf <agraf@suse.de>
Cc: Andreas Färber <andreas.faerber@web.de>
Cc: qemu-ppc@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.

Signed-off-by: Markus Armbruster <armbru@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/ppc405_boards.c b/hw/ppc405_boards.c
index 476775d..08f90f1 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -363,6 +363,9 @@ static QEMUMachine ref405ep_machine = {
     .name = "ref405ep",
     .desc = "ref405ep",
     .init = ref405ep_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 /*****************************************************************************/
@@ -652,6 +655,9 @@ static QEMUMachine taihu_machine = {
     .name = "taihu",
     .desc = "taihu",
     .init = taihu_405ep_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void ppc405_machine_init(void)
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 0dd4dab..5cb0d35 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -294,6 +294,9 @@ static QEMUMachine bamboo_machine = {
     .name = "bamboo",
     .desc = "bamboo",
     .init = bamboo_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void bamboo_machine_init(void)
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
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
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)
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)
-- 
1.7.11.2