[Qemu-devel] [PATCH v2 for-1.2 05/27] nseries palm spitz: Suppress unused default drives

[Markus Armbruster]

Cc: Andrzej Zaborowski <address@hidden>

Suppress default floppy and CD-ROM drives for machines n800, n810,
cheetah, akita, spitz, borzoi, terrier.

Signed-off-by: Markus Armbruster <address@hidden>
---
 hw/nseries.c | 4 ----
 hw/palm.c    | 2 --
 hw/spitz.c   | 8 --------
 3 files changed, 14 deletions(-)

diff --git a/hw/nseries.c b/hw/nseries.c
index dfa158c..23fc78c 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -1409,8 +1409,6 @@ static QEMUMachine n800_machine = {
     .name = "n800",
     .desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
     .init = n800_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -1418,8 +1416,6 @@ static QEMUMachine n810_machine = {
     .name = "n810",
     .desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
     .init = n810_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/palm.c b/hw/palm.c
index 50c53dd..cbc791a 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -279,8 +279,6 @@ static QEMUMachine palmte_machine = {
     .name = "cheetah",
     .desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
     .init = palmte_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/spitz.c b/hw/spitz.c
index addd1c8..06bd6f2 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -976,8 +976,6 @@ static QEMUMachine akitapda_machine = {
     .name = "akita",
     .desc = "Akita PDA (PXA270)",
     .init = akita_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -985,8 +983,6 @@ static QEMUMachine spitzpda_machine = {
     .name = "spitz",
     .desc = "Spitz PDA (PXA270)",
     .init = spitz_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -994,8 +990,6 @@ static QEMUMachine borzoipda_machine = {
     .name = "borzoi",
     .desc = "Borzoi PDA (PXA270)",
     .init = borzoi_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -1003,8 +997,6 @@ static QEMUMachine terrierpda_machine = {
     .name = "terrier",
     .desc = "Terrier PDA (PXA270)",
     .init = terrier_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
-- 
1.7.11.2