Cc: Paul Brook <p...@codesourcery.com> Cc: Peter Maydell <peter.mayd...@linaro.org>
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 <arm...@redhat.com> --- hw/integratorcp.c | 2 ++ hw/realview.c | 6 ++++++ hw/stellaris.c | 5 +++++ hw/versatilepb.c | 2 ++ 4 files changed, 15 insertions(+) diff --git a/hw/integratorcp.c b/hw/integratorcp.c index d0e2e90..41a7ebc 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -509,6 +509,8 @@ static QEMUMachine integratorcp_machine = { .name = "integratorcp", .desc = "ARM Integrator/CP (ARM926EJ-S)", .init = integratorcp_init, + .no_floppy = 1, + .no_cdrom = 1, .is_default = 1, }; diff --git a/hw/realview.c b/hw/realview.c index 19db4d0..d3121ec 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -383,6 +383,7 @@ static QEMUMachine realview_eb_machine = { .desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)", .init = realview_eb_init, .use_scsi = 1, + .no_floppy = 1, }; static QEMUMachine realview_eb_mpcore_machine = { @@ -391,12 +392,15 @@ static QEMUMachine realview_eb_mpcore_machine = { .init = realview_eb_mpcore_init, .use_scsi = 1, .max_cpus = 4, + .no_floppy = 1, }; static QEMUMachine realview_pb_a8_machine = { .name = "realview-pb-a8", .desc = "ARM RealView Platform Baseboard for Cortex-A8", .init = realview_pb_a8_init, + .no_floppy = 1, + .no_cdrom = 1, }; static QEMUMachine realview_pbx_a9_machine = { @@ -405,6 +409,8 @@ static QEMUMachine realview_pbx_a9_machine = { .init = realview_pbx_a9_init, .use_scsi = 1, .max_cpus = 4, + .no_floppy = 1, + .no_cdrom = 1, }; static void realview_machine_init(void) diff --git a/hw/stellaris.c b/hw/stellaris.c index 562fbbf..ca106d5 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -1378,12 +1378,17 @@ static QEMUMachine lm3s811evb_machine = { .name = "lm3s811evb", .desc = "Stellaris LM3S811EVB", .init = lm3s811evb_init, + .no_floppy = 1, + .no_cdrom = 1, + .no_sdcard = 1, }; static QEMUMachine lm3s6965evb_machine = { .name = "lm3s6965evb", .desc = "Stellaris LM3S6965EVB", .init = lm3s6965evb_init, + .no_floppy = 1, + .no_cdrom = 1, }; static void stellaris_machine_init(void) diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 4fd5d9b..1117734 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -369,6 +369,7 @@ static QEMUMachine versatilepb_machine = { .desc = "ARM Versatile/PB (ARM926EJ-S)", .init = vpb_init, .use_scsi = 1, + .no_floppy = 1, }; static QEMUMachine versatileab_machine = { @@ -376,6 +377,7 @@ static QEMUMachine versatileab_machine = { .desc = "ARM Versatile/AB (ARM926EJ-S)", .init = vab_init, .use_scsi = 1, + .no_floppy = 1, }; static void versatile_machine_init(void) -- 1.7.11.2