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

[Markus Armbruster]

Cc: Blue Swirl <address@hidden>

Suppress default floppy drive for machines leon3_generic, SS-600MP,
SS-1000, SS-2000.

Suppress default CD-ROM drive for machine leon3_generic.

Suppress default SD card drive for machines leon3_generic, SS-5,
SS-10, SS-600MP, SS-20, Voyager, LX, SS-4, SPARCClassic, SPARCbook,
SS-1000, SS-2000, SS-2, sun4u, sun4v, Niagara.

Signed-off-by: Markus Armbruster <address@hidden>
---
 hw/leon3.c |  3 ---
 hw/sun4m.c | 15 ---------------
 hw/sun4u.c |  3 ---
 3 files changed, 21 deletions(-)

diff --git a/hw/leon3.c b/hw/leon3.c
index aa67e1a..7a9729d 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -215,9 +215,6 @@ static QEMUMachine leon3_generic_machine = {
     .desc     = "Leon-3 generic",
     .init     = leon3_generic_hw_init,
     .use_scsi = 0,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void leon3_machine_init(void)
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 4d260c1..b13eae3 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -1388,7 +1388,6 @@ static QEMUMachine ss5_machine = {
     .use_scsi = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1,
 };
 
@@ -1400,7 +1399,6 @@ static QEMUMachine ss10_machine = {
     .max_cpus = 4,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine ss600mp_machine = {
@@ -1409,9 +1407,7 @@ static QEMUMachine ss600mp_machine = {
     .init = ss600mp_init,
     .use_scsi = 1,
     .max_cpus = 4,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine ss20_machine = {
@@ -1422,7 +1418,6 @@ static QEMUMachine ss20_machine = {
     .max_cpus = 4,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine voyager_machine = {
@@ -1432,7 +1427,6 @@ static QEMUMachine voyager_machine = {
     .use_scsi = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine ss_lx_machine = {
@@ -1442,7 +1436,6 @@ static QEMUMachine ss_lx_machine = {
     .use_scsi = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine ss4_machine = {
@@ -1452,7 +1445,6 @@ static QEMUMachine ss4_machine = {
     .use_scsi = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine scls_machine = {
@@ -1462,7 +1454,6 @@ static QEMUMachine scls_machine = {
     .use_scsi = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine sbook_machine = {
@@ -1472,7 +1463,6 @@ static QEMUMachine sbook_machine = {
     .use_scsi = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static const struct sun4d_hwdef sun4d_hwdefs[] = {
@@ -1691,9 +1681,7 @@ static QEMUMachine ss1000_machine = {
     .init = ss1000_init,
     .use_scsi = 1,
     .max_cpus = 8,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine ss2000_machine = {
@@ -1702,9 +1690,7 @@ static QEMUMachine ss2000_machine = {
     .init = ss2000_init,
     .use_scsi = 1,
     .max_cpus = 20,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static const struct sun4c_hwdef sun4c_hwdefs[] = {
@@ -1882,7 +1868,6 @@ static QEMUMachine ss2_machine = {
     .use_scsi = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void sun4m_register_types(void)
diff --git a/hw/sun4u.c b/hw/sun4u.c
index e6d1132..891ab56 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -965,7 +965,6 @@ static QEMUMachine sun4u_machine = {
     .max_cpus = 1, // XXX for now
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1,
 };
 
@@ -976,7 +975,6 @@ static QEMUMachine sun4v_machine = {
     .max_cpus = 1, // XXX for now
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine niagara_machine = {
@@ -986,7 +984,6 @@ static QEMUMachine niagara_machine = {
     .max_cpus = 1, // XXX for now
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void sun4u_register_types(void)
-- 
1.7.11.2