On Thu, Aug 9, 2012 at 1:31 PM, Markus Armbruster <arm...@redhat.com> wrote: > Cc: Blue Swirl <blauwir...@gmail.com>
Acked-by: Blue Swirl <blauwir...@gmail.com> > > 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 <arm...@redhat.com> > --- > hw/leon3.c | 3 +++ > hw/sun4m.c | 15 +++++++++++++++ > hw/sun4u.c | 3 +++ > 3 files changed, 21 insertions(+) > > diff --git a/hw/leon3.c b/hw/leon3.c > index 878d3aa..d4c97dc 100644 > --- a/hw/leon3.c > +++ b/hw/leon3.c > @@ -215,6 +215,9 @@ QEMUMachine leon3_generic_machine = { > .desc = "Leon-3 generic", > .init = leon3_generic_hw_init, > .use_scsi = 0, > + .no_floppy = 1, > + .no_cdrom = 1, > + .no_sdcard = 1, > }; > > static void leon3_machine_init(void) > diff --git a/hw/sun4m.c b/hw/sun4m.c > index a959261..869bc52 100644 > --- a/hw/sun4m.c > +++ b/hw/sun4m.c > @@ -1380,6 +1380,7 @@ static QEMUMachine ss5_machine = { > .desc = "Sun4m platform, SPARCstation 5", > .init = ss5_init, > .use_scsi = 1, > + .no_sdcard = 1, > .is_default = 1, > }; > > @@ -1388,6 +1389,7 @@ static QEMUMachine ss10_machine = { > .desc = "Sun4m platform, SPARCstation 10", > .init = ss10_init, > .use_scsi = 1, > + .no_sdcard = 1, > .max_cpus = 4, > }; > > @@ -1396,6 +1398,8 @@ static QEMUMachine ss600mp_machine = { > .desc = "Sun4m platform, SPARCserver 600MP", > .init = ss600mp_init, > .use_scsi = 1, > + .no_floppy = 1, > + .no_sdcard = 1, > .max_cpus = 4, > }; > > @@ -1404,6 +1408,7 @@ static QEMUMachine ss20_machine = { > .desc = "Sun4m platform, SPARCstation 20", > .init = ss20_init, > .use_scsi = 1, > + .no_sdcard = 1, > .max_cpus = 4, > }; > > @@ -1411,6 +1416,7 @@ static QEMUMachine voyager_machine = { > .name = "Voyager", > .desc = "Sun4m platform, SPARCstation Voyager", > .init = vger_init, > + .no_sdcard = 1, > .use_scsi = 1, > }; > > @@ -1418,6 +1424,7 @@ static QEMUMachine ss_lx_machine = { > .name = "LX", > .desc = "Sun4m platform, SPARCstation LX", > .init = ss_lx_init, > + .no_sdcard = 1, > .use_scsi = 1, > }; > > @@ -1426,6 +1433,7 @@ static QEMUMachine ss4_machine = { > .desc = "Sun4m platform, SPARCstation 4", > .init = ss4_init, > .use_scsi = 1, > + .no_sdcard = 1, > }; > > static QEMUMachine scls_machine = { > @@ -1433,6 +1441,7 @@ static QEMUMachine scls_machine = { > .desc = "Sun4m platform, SPARCClassic", > .init = scls_init, > .use_scsi = 1, > + .no_sdcard = 1, > }; > > static QEMUMachine sbook_machine = { > @@ -1440,6 +1449,7 @@ static QEMUMachine sbook_machine = { > .desc = "Sun4m platform, SPARCbook", > .init = sbook_init, > .use_scsi = 1, > + .no_sdcard = 1, > }; > > static const struct sun4d_hwdef sun4d_hwdefs[] = { > @@ -1658,6 +1668,8 @@ static QEMUMachine ss1000_machine = { > .init = ss1000_init, > .use_scsi = 1, > .max_cpus = 8, > + .no_floppy = 1, > + .no_sdcard = 1, > }; > > static QEMUMachine ss2000_machine = { > @@ -1666,6 +1678,8 @@ static QEMUMachine ss2000_machine = { > .init = ss2000_init, > .use_scsi = 1, > .max_cpus = 20, > + .no_floppy = 1, > + .no_sdcard = 1, > }; > > static const struct sun4c_hwdef sun4c_hwdefs[] = { > @@ -1839,6 +1853,7 @@ static QEMUMachine ss2_machine = { > .desc = "Sun4c platform, SPARCstation 2", > .init = ss2_init, > .use_scsi = 1, > + .no_sdcard = 1, > }; > > static void sun4m_register_types(void) > diff --git a/hw/sun4u.c b/hw/sun4u.c > index 137a7c6..bd30840 100644 > --- a/hw/sun4u.c > +++ b/hw/sun4u.c > @@ -963,6 +963,7 @@ static QEMUMachine sun4u_machine = { > .desc = "Sun4u platform", > .init = sun4u_init, > .max_cpus = 1, // XXX for now > + .no_sdcard = 1, > .is_default = 1, > }; > > @@ -971,6 +972,7 @@ static QEMUMachine sun4v_machine = { > .desc = "Sun4v platform", > .init = sun4v_init, > .max_cpus = 1, // XXX for now > + .no_sdcard = 1, > }; > > static QEMUMachine niagara_machine = { > @@ -978,6 +980,7 @@ static QEMUMachine niagara_machine = { > .desc = "Sun4v platform, Niagara", > .init = niagara_init, > .max_cpus = 1, // XXX for now > + .no_sdcard = 1, > }; > > static void sun4u_register_types(void) > -- > 1.7.11.2 >