[Qemu-devel] [PATCH 10/23] 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 insertions(+)

diff --git a/hw/collie.c b/hw/collie.c
index 56f89a9..adc77c1 100644
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -61,6 +61,9 @@ static QEMUMachine collie_machine = {
     .name = "collie",
     .desc = "Collie PDA (SA-1110)",
     .init = collie_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void collie_machine_init(void)
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 13a36ea..bb0c109 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -127,12 +127,16 @@ static QEMUMachine connex_machine = {
     .name = "connex",
     .desc = "Gumstix Connex (PXA255)",
     .init = connex_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static QEMUMachine verdex_machine = {
     .name = "verdex",
     .desc = "Gumstix Verdex (PXA270)",
     .init = verdex_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static void gumstix_machine_init(void)
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 97687b6..85ac58d 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -184,6 +184,8 @@ static QEMUMachine mainstone2_machine = {
     .name = "mainstone",
     .desc = "Mainstone II (PXA27x)",
     .init = mainstone_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static void mainstone_machine_init(void)
diff --git a/hw/tosa.c b/hw/tosa.c
index 297a8c2..7a5665b 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -250,6 +250,8 @@ static QEMUMachine tosapda_machine = {
     .name = "tosa",
     .desc = "Tosa PDA (PXA255)",
     .init = tosa_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static void tosapda_machine_init(void)
diff --git a/hw/vexpress.c b/hw/vexpress.c
index b615844..7282858 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -478,6 +478,8 @@ static QEMUMachine vexpress_a9_machine = {
     .init = vexpress_a9_init,
     .use_scsi = 1,
     .max_cpus = 4,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static QEMUMachine vexpress_a15_machine = {
@@ -486,6 +488,8 @@ static QEMUMachine vexpress_a15_machine = {
     .init = vexpress_a15_init,
     .use_scsi = 1,
     .max_cpus = 4,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static void vexpress_machine_init(void)
diff --git a/hw/z2.c b/hw/z2.c
index 289cee9..14add5b 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -371,6 +371,8 @@ static QEMUMachine z2_machine = {
     .name = "z2",
     .desc = "Zipit Z2 (PXA27x)",
     .init = z2_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static void z2_machine_init(void)
-- 
1.7.11.2