[Qemu-devel] [PATCH v2 for-1.2 23/27] ppc: Suppress unused default drives

[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, 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 <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/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 = {
     .name = "ref405ep",
     .desc = "ref405ep",
     .init = ref405ep_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 /*****************************************************************************/
@@ -655,9 +652,6 @@ static QEMUMachine taihu_machine = {
     .name = "taihu",
     .desc = "taihu",
     .init = taihu_405ep_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 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 = {
     .name = "bamboo",
     .desc = "bamboo",
     .init = bamboo_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 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 = {
     .desc = "Mac99 based PowerMAC",
     .init = ppc_core99_init,
     .max_cpus = MAX_CPUS,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 #ifdef TARGET_PPC64
     .is_default = 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 = {
     .desc = "Heathrow based PowerMAC",
     .init = ppc_heathrow_init,
     .max_cpus = MAX_CPUS,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 #ifndef TARGET_PPC64
     .is_default = 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 = {
     .max_cpus = MAX_CPUS,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 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 = {
     .desc = "mpc8544ds",
     .init = mpc8544ds_init,
     .max_cpus = 15,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 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 = {
     .max_cpus = MAX_CPUS,
     .no_parallel = 1,
     .use_scsi = 1,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 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 = {
     .name = "virtex-ml507",
     .desc = "Xilinx Virtex ML507 reference design",
     .init = virtex_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void virtex_machine_init(void)
-- 
1.7.11.2