[Qemu-devel] [PATCH v2 for-1.2 07/27] integratorcp, realview, stellaris, versatilepb: Suppress unused default drives

[Markus Armbruster]

Cc: Paul Brook <address@hidden>
Cc: Peter Maydell <address@hidden>

Suppress default floppy drive for machines integratorcp, realview-eb,
realview-eb-mpcore, realview-pb-a8, realview-pbx-a9, lm3s811evb,
lm3s6965evb, versatilepb, versatileab.

Suppress default CD-ROM drive for machines integratorcp,
realview-pb-a8, realview-pbx-a9, lm3s811evb, lm3s6965evb.

Suppress default SD card drive for lm3s811evb.

Signed-off-by: Markus Armbruster <address@hidden>
---
 hw/integratorcp.c | 2 --
 hw/realview.c     | 6 ------
 hw/stellaris.c    | 5 -----
 hw/versatilepb.c  | 2 --
 4 files changed, 15 deletions(-)

diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index b152cc7..66b97a0 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -509,8 +509,6 @@ static QEMUMachine integratorcp_machine = {
     .name = "integratorcp",
     .desc = "ARM Integrator/CP (ARM926EJ-S)",
     .init = integratorcp_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
     .is_default = 1,
 };
diff --git a/hw/realview.c b/hw/realview.c
index a91f35f..1bfacfb 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -383,7 +383,6 @@ static QEMUMachine realview_eb_machine = {
     .desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)",
     .init = realview_eb_init,
     .use_scsi = 1,
-    .use_floppy = 1,
     .use_cdrom = 1,
     .use_sdcard = 1,
 };
@@ -394,7 +393,6 @@ static QEMUMachine realview_eb_mpcore_machine = {
     .init = realview_eb_mpcore_init,
     .use_scsi = 1,
     .max_cpus = 4,
-    .use_floppy = 1,
     .use_cdrom = 1,
     .use_sdcard = 1,
 };
@@ -403,8 +401,6 @@ static QEMUMachine realview_pb_a8_machine = {
     .name = "realview-pb-a8",
     .desc = "ARM RealView Platform Baseboard for Cortex-A8",
     .init = realview_pb_a8_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -414,8 +410,6 @@ static QEMUMachine realview_pbx_a9_machine = {
     .init = realview_pbx_a9_init,
     .use_scsi = 1,
     .max_cpus = 4,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/stellaris.c b/hw/stellaris.c
index 7e65517..5cd863e 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -1378,17 +1378,12 @@ static QEMUMachine lm3s811evb_machine = {
     .name = "lm3s811evb",
     .desc = "Stellaris LM3S811EVB",
     .init = lm3s811evb_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine lm3s6965evb_machine = {
     .name = "lm3s6965evb",
     .desc = "Stellaris LM3S6965EVB",
     .init = lm3s6965evb_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 38c4982..c03dee8 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -369,7 +369,6 @@ static QEMUMachine versatilepb_machine = {
     .desc = "ARM Versatile/PB (ARM926EJ-S)",
     .init = vpb_init,
     .use_scsi = 1,
-    .use_floppy = 1,
     .use_cdrom = 1,
     .use_sdcard = 1,
 };
@@ -379,7 +378,6 @@ static QEMUMachine versatileab_machine = {
     .desc = "ARM Versatile/AB (ARM926EJ-S)",
     .init = vab_init,
     .use_scsi = 1,
-    .use_floppy = 1,
     .use_cdrom = 1,
     .use_sdcard = 1,
 };
-- 
1.7.11.2