[Qemu-devel] [PATCH v2 for-1.2 13/27] collie gumstix mainstone tosa vexpress z2: Suppress unused default drives

[Markus Armbruster <armbru@redhat.com>]

Suppress default floppy and CD-ROM drives for machines collie, connex,
verdex, mainstone, tosa, vexpress-a9, vexpress-a15, z2.

Suppress default SD card drive for machine collie.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/collie.c    | 3 ---
 hw/gumstix.c   | 4 ----
 hw/mainstone.c | 2 --
 hw/tosa.c      | 2 --
 hw/vexpress.c  | 4 ----
 hw/z2.c        | 2 --
 6 files changed, 17 deletions(-)

diff --git a/hw/collie.c b/hw/collie.c
index 8c0fecd..56f89a9 100644
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -61,9 +61,6 @@ static QEMUMachine collie_machine = {
     .name = "collie",
     .desc = "Collie PDA (SA-1110)",
     .init = collie_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void collie_machine_init(void)
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 955acfe..9250117 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -127,8 +127,6 @@ static QEMUMachine connex_machine = {
     .name = "connex",
     .desc = "Gumstix Connex (PXA255)",
     .init = connex_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -136,8 +134,6 @@ static QEMUMachine verdex_machine = {
     .name = "verdex",
     .desc = "Gumstix Verdex (PXA270)",
     .init = verdex_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 29b24ac..09d49cb 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -184,8 +184,6 @@ static QEMUMachine mainstone2_machine = {
     .name = "mainstone",
     .desc = "Mainstone II (PXA27x)",
     .init = mainstone_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/tosa.c b/hw/tosa.c
index 59629a2..2973e0a 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -250,8 +250,6 @@ static QEMUMachine tosapda_machine = {
     .name = "tosa",
     .desc = "Tosa PDA (PXA255)",
     .init = tosa_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/vexpress.c b/hw/vexpress.c
index 3f01654..7c0becc 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -478,8 +478,6 @@ static QEMUMachine vexpress_a9_machine = {
     .init = vexpress_a9_init,
     .use_scsi = 1,
     .max_cpus = 4,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -489,8 +487,6 @@ static QEMUMachine vexpress_a15_machine = {
     .init = vexpress_a15_init,
     .use_scsi = 1,
     .max_cpus = 4,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/z2.c b/hw/z2.c
index 97cf093..f29978d 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -371,8 +371,6 @@ static QEMUMachine z2_machine = {
     .name = "z2",
     .desc = "Zipit Z2 (PXA27x)",
     .init = z2_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
-- 
1.7.11.2