[Qemu-devel] [PATCH 00/23] Suppress unused default drives

[Qemu-devel] [PATCH 00/23] Suppress unused default drives

[Markus Armbruster]

We create a number of default drives for machines to use: floppy,
CD-ROM, SD card.  Machines can suppress the ones they don't use, but
few do.  Fix that.

I split this into parts that share target and maintainer for review.
Blue, would you be willing to commit the whole series, provided there
are no objections?

Cc: Alexander Graf <agraf@suse.de>
Cc: Andreas Färber <andreas.faerber@web.de>
Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Dmitry Solodkiy <d.solodkiy@samsung.com>
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Cc: Evgeny Voevodin <e.voevodin@samsung.com>
Cc: Hervé Poussineau <hpoussin@reactos.org>
Cc: Igor Mitsyanko <i.mitsyanko@samsung.com>
Cc: Jan Kiszka <jan.kiszka@web.de>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Maksim Kozlov <m.kozlov@samsung.com>
Cc: Mark Langsdorf <mark.langsdorf@calxeda.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Paul Brook <paul@codesourcery.com
Cc: Paul Brook <paul@codesourcery.com>
Cc: Peter Chubb <peter.chubb@nicta.com.au>
Cc: Peter Crosthwaite <peter.crosthwaite@petalogix.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: qemu-ppc@nongnu.org

Markus Armbruster (23):
  alpha_dp264: Suppress unused default drives
  nseries palm spitz: Suppress unused default drives
  highbank: Suppress unused default drives
  integratorcp, realview, stellaris, versatilepb: Suppress unused
    default drives
  omap_sx1: Suppress unused default drives
  kzm: Suppress unused default drives
  musicpal: Suppress unused default drives
  exynos4: Suppress unused default drives
  xilinx-zynq: Suppress unused default drives
  collie gumstix mainstone tosa vexpress z2: Suppress unused default
    drives
  axis-dev88: Suppress unused default drives
  pc xen: Suppress unused default drives
  lm32: Suppress unused default drives
  m68k: Suppress unused default drives
  microblaze: Suppress unused default drives
  mips_jazz: Suppress unused default drives
  mips_malta mips_r4k: Suppress unused default drives
  mips_fulong2e, mips_mipssim: Suppress unused default drives
  or32-sim: Suppress unused default drives
  ppc: Suppress unused default drives
  sh4: Suppress unused default drives
  sparc: Suppress unused default drives
  xtensa: Suppress unused default drives

 hw/alpha_dp264.c              |  2 ++
 hw/an5206.c                   |  3 +++
 hw/axis_dev88.c               |  3 +++
 hw/collie.c                   |  3 +++
 hw/dummy_m68k.c               |  3 +++
 hw/exynos4_boards.c           |  6 ++++++
 hw/gumstix.c                  |  4 ++++
 hw/highbank.c                 |  3 +++
 hw/integratorcp.c             |  2 ++
 hw/kzm.c                      |  3 +++
 hw/leon3.c                    |  3 +++
 hw/lm32_boards.c              |  6 ++++++
 hw/mainstone.c                |  2 ++
 hw/mcf5208.c                  |  3 +++
 hw/milkymist.c                |  2 ++
 hw/mips_fulong2e.c            |  2 ++
 hw/mips_jazz.c                |  2 ++
 hw/mips_malta.c               |  1 +
 hw/mips_mipssim.c             |  3 +++
 hw/mips_r4k.c                 |  2 ++
 hw/musicpal.c                 |  3 +++
 hw/nseries.c                  |  4 ++++
 hw/omap_sx1.c                 |  4 ++++
 hw/openrisc_sim.c             |  3 +++
 hw/palm.c                     |  2 ++
 hw/pc_piix.c                  | 11 +++++++++++
 hw/petalogix_ml605_mmu.c      |  3 +++
 hw/petalogix_s3adsp1800_mmu.c |  3 +++
 hw/ppc405_boards.c            |  6 ++++++
 hw/ppc440_bamboo.c            |  3 +++
 hw/ppc_newworld.c             |  2 ++
 hw/ppc_oldworld.c             |  2 ++
 hw/ppc_prep.c                 |  1 +
 hw/r2d.c                      |  3 +++
 hw/realview.c                 |  6 ++++++
 hw/shix.c                     |  3 +++
 hw/spitz.c                    |  8 ++++++++
 hw/stellaris.c                |  5 +++++
 hw/sun4m.c                    | 15 +++++++++++++++
 hw/sun4u.c                    |  3 +++
 hw/tosa.c                     |  2 ++
 hw/versatilepb.c              |  2 ++
 hw/vexpress.c                 |  4 ++++
 hw/virtex_ml507.c             |  3 +++
 hw/xen_machine_pv.c           |  1 +
 hw/xilinx_zynq.c              |  2 ++
 hw/xtensa_lx60.c              |  6 ++++++
 hw/xtensa_sim.c               |  3 +++
 hw/z2.c                       |  2 ++
 49 files changed, 173 insertions(+)

-- 
1.7.11.2

[Qemu-devel] [PATCH 01/23] alpha_dp264: Suppress unused default drives

[Markus Armbruster]

Suppress default floppy and SD-card drives.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/alpha_dp264.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index 9eb939f..3dd6252 100644
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -169,6 +169,8 @@ static QEMUMachine clipper_machine = {
     .desc = "Alpha DP264/CLIPPER",
     .init = clipper_init,
     .max_cpus = 4,
+    .no_floppy = 1,
+    .no_sdcard = 1,
     .is_default = 1,
 };
 
-- 
1.7.11.2

Re: [Qemu-devel] [PATCH 01/23] alpha_dp264: Suppress unused default drives

[Richard Henderson]

On 08/09/2012 06:31 AM, Markus Armbruster wrote:
> Suppress default floppy and SD-card drives.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Acked-by: Richard Henderson <rth@twiddle.net>


r~

[Qemu-devel] [PATCH 02/23] nseries palm spitz: Suppress unused default drives

[Markus Armbruster]

Cc: Andrzej Zaborowski <balrogg@gmail.com>

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

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/nseries.c | 4 ++++
 hw/palm.c    | 2 ++
 hw/spitz.c   | 8 ++++++++
 3 files changed, 14 insertions(+)

diff --git a/hw/nseries.c b/hw/nseries.c
index 4df2670..c34e585 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -1409,12 +1409,16 @@ static QEMUMachine n800_machine = {
     .name = "n800",
     .desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
     .init = n800_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static QEMUMachine n810_machine = {
     .name = "n810",
     .desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
     .init = n810_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static void nseries_machine_init(void)
diff --git a/hw/palm.c b/hw/palm.c
index bacdc90..7bc40ee 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -279,6 +279,8 @@ static QEMUMachine palmte_machine = {
     .name = "cheetah",
     .desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
     .init = palmte_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static void palmte_machine_init(void)
diff --git a/hw/spitz.c b/hw/spitz.c
index 20e7835..91a4a38 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -976,24 +976,32 @@ static QEMUMachine akitapda_machine = {
     .name = "akita",
     .desc = "Akita PDA (PXA270)",
     .init = akita_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static QEMUMachine spitzpda_machine = {
     .name = "spitz",
     .desc = "Spitz PDA (PXA270)",
     .init = spitz_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static QEMUMachine borzoipda_machine = {
     .name = "borzoi",
     .desc = "Borzoi PDA (PXA270)",
     .init = borzoi_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static QEMUMachine terrierpda_machine = {
     .name = "terrier",
     .desc = "Terrier PDA (PXA270)",
     .init = terrier_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static void spitz_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH 03/23] highbank: Suppress unused default drives

[Markus Armbruster]

Cc: Mark Langsdorf <mark.langsdorf@calxeda.com>

Suppress default floppy, CD-ROM and SD-card drives.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/highbank.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/highbank.c b/hw/highbank.c
index 11aa131..ffb4132 100644
--- a/hw/highbank.c
+++ b/hw/highbank.c
@@ -326,6 +326,9 @@ static QEMUMachine highbank_machine = {
     .init = highbank_init,
     .use_scsi = 1,
     .max_cpus = 4,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void highbank_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH 04/23] integratorcp, realview, stellaris, versatilepb: Suppress unused default drives

[Markus Armbruster]

Cc: Paul Brook <paul@codesourcery.com>
Cc: Peter Maydell <peter.maydell@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 <armbru@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

[Qemu-devel] [PATCH 05/23] omap_sx1: Suppress unused default drives

[Markus Armbruster]

Cc: Peter Maydell <peter.maydell@linaro.org>

Suppress default floppy and CD-ROM drives for machines sx1, sx1-v1.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/omap_sx1.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index abca341..3ca716e 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -231,12 +231,16 @@ static QEMUMachine sx1_machine_v2 = {
     .name = "sx1",
     .desc = "Siemens SX1 (OMAP310) V2",
     .init = sx1_init_v2,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static QEMUMachine sx1_machine_v1 = {
     .name = "sx1-v1",
     .desc = "Siemens SX1 (OMAP310) V1",
     .init = sx1_init_v1,
+    .no_floppy = 1,
+    .no_cdrom = 1,
 };
 
 static void sx1_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH 06/23] kzm: Suppress unused default drives

[Markus Armbruster]

Cc: Peter Chubb <peter.chubb@nicta.com.au>

Suppress default floppy, CD-ROM and SD card drives.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/kzm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/kzm.c b/hw/kzm.c
index 6a5e9df..e7e4ef0 100644
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -144,6 +144,9 @@ static QEMUMachine kzm_machine = {
     .name = "kzm",
     .desc = "ARM KZM Emulation Baseboard (ARM1136)",
     .init = kzm_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void kzm_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH 07/23] musicpal: Suppress unused default drives

[Markus Armbruster]

Cc: Jan Kiszka <jan.kiszka@web.de>

Suppress default floppy, CD-ROM and SD card drives.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/musicpal.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/musicpal.c b/hw/musicpal.c
index ad725b5..05930f5 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -1658,6 +1658,9 @@ static QEMUMachine musicpal_machine = {
     .name = "musicpal",
     .desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
     .init = musicpal_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void musicpal_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH 08/23] exynos4: Suppress unused default drives

[Markus Armbruster]

Cc: Evgeny Voevodin <e.voevodin@samsung.com>
Cc: Maksim Kozlov <m.kozlov@samsung.com>
Cc: Igor Mitsyanko <i.mitsyanko@samsung.com>
Cc: Dmitry Solodkiy <d.solodkiy@samsung.com>

Suppress default floppy, CD-ROM and SD card drives for machines nuri,
smdkc210.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/exynos4_boards.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index 4bb0a60..1512c27 100644
--- a/hw/exynos4_boards.c
+++ b/hw/exynos4_boards.c
@@ -160,12 +160,18 @@ static QEMUMachine exynos4_machines[EXYNOS4_NUM_OF_BOARDS] = {
         .desc = "Samsung NURI board (Exynos4210)",
         .init = nuri_init,
         .max_cpus = EXYNOS4210_NCPUS,
+        .no_floppy = 1,
+        .no_cdrom = 1,
+        .no_sdcard = 1,
     },
     [EXYNOS4_BOARD_SMDKC210] = {
         .name = "smdkc210",
         .desc = "Samsung SMDKC210 board (Exynos4210)",
         .init = smdkc210_init,
         .max_cpus = EXYNOS4210_NCPUS,
+        .no_floppy = 1,
+        .no_cdrom = 1,
+        .no_sdcard = 1,
     },
 };
 
-- 
1.7.11.2

Re: [Qemu-devel] [PATCH 08/23] exynos4: Suppress unused default drives

[Evgeny Voevodin]

On 09.08.2012 17:31, Markus Armbruster wrote:
> Cc: Evgeny Voevodin <e.voevodin@samsung.com>
> Cc: Maksim Kozlov <m.kozlov@samsung.com>
> Cc: Igor Mitsyanko <i.mitsyanko@samsung.com>
> Cc: Dmitry Solodkiy <d.solodkiy@samsung.com>
>
> Suppress default floppy, CD-ROM and SD card drives for machines nuri,
> smdkc210.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   hw/exynos4_boards.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
> index 4bb0a60..1512c27 100644
> --- a/hw/exynos4_boards.c
> +++ b/hw/exynos4_boards.c
> @@ -160,12 +160,18 @@ static QEMUMachine exynos4_machines[EXYNOS4_NUM_OF_BOARDS] = {
>           .desc = "Samsung NURI board (Exynos4210)",
>           .init = nuri_init,
>           .max_cpus = EXYNOS4210_NCPUS,
> +        .no_floppy = 1,
> +        .no_cdrom = 1,
> +        .no_sdcard = 1,
>       },
>       [EXYNOS4_BOARD_SMDKC210] = {
>           .name = "smdkc210",
>           .desc = "Samsung SMDKC210 board (Exynos4210)",
>           .init = smdkc210_init,
>           .max_cpus = EXYNOS4210_NCPUS,
> +        .no_floppy = 1,
> +        .no_cdrom = 1,
> +        .no_sdcard = 1,
>       },
>   };
>   

Recently I looked in monitor and thought about how to dismiss them from 
our board )

Acked-by: Evgeny Voevodin <e.voevodin@samsung.com>


-- 
Kind regards,
Evgeny Voevodin,
Technical Leader,
Mobile Group,
Samsung Moscow Research Center,
e-mail: e.voevodin@samsung.com

[Qemu-devel] [PATCH 09/23] xilinx-zynq: Suppress unused default drives

[Markus Armbruster]

Cc: Peter Crosthwaite <peter.crosthwaite@petalogix.com>

Suppress default floppy and CD-ROM drives.  SD card was already
suppressed.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/xilinx_zynq.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index 7e6c273..ebca914 100644
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -146,6 +146,8 @@ static QEMUMachine zynq_machine = {
     .init = zynq_init,
     .use_scsi = 1,
     .max_cpus = 1,
+    .no_floppy = 1,
+    .no_cdrom = 1,
     .no_sdcard = 1
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH 10/23] collie gumstix mainstone tosa vexpress z2: Suppress unused default drives

[Markus Armbruster]

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

[Qemu-devel] [PATCH 11/23] axis-dev88: Suppress unused default drives

[Markus Armbruster]

Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>

Suppress default floppy, CD-ROM and SD card drives.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/axis_dev88.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index eab6327..9a9da15 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -354,6 +354,9 @@ static QEMUMachine axisdev88_machine = {
     .desc = "AXIS devboard 88",
     .init = axisdev88_init,
     .is_default = 1,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void axisdev88_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH 12/23] pc xen: Suppress unused default drives

[Markus Armbruster]

Cc: Anthony Liguori <aliguori@us.ibm.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Suppress default SD card drive for machines pc-*, isapc, xenfv, xenpv.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/pc_piix.c        | 11 +++++++++++
 hw/xen_machine_pv.c |  1 +
 2 files changed, 12 insertions(+)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 0c0096f..7ca5c26 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -355,6 +355,7 @@ static QEMUMachine pc_machine_v1_2 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .no_sdcard = 1,
     .is_default = 1,
 };
 
@@ -382,6 +383,7 @@ static QEMUMachine pc_machine_v1_1 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .no_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_1_1,
         { /* end of list */ }
@@ -417,6 +419,7 @@ static QEMUMachine pc_machine_v1_0 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .no_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_1_0,
         { /* end of list */ }
@@ -432,6 +435,7 @@ static QEMUMachine pc_machine_v0_15 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .no_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_15,
         { /* end of list */ }
@@ -464,6 +468,7 @@ static QEMUMachine pc_machine_v0_14 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .no_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_14, 
         {
@@ -497,6 +502,7 @@ static QEMUMachine pc_machine_v0_13 = {
     .desc = "Standard PC",
     .init = pc_init_pci_no_kvmclock,
     .max_cpus = 255,
+    .no_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_13,
         {
@@ -534,6 +540,7 @@ static QEMUMachine pc_machine_v0_12 = {
     .desc = "Standard PC",
     .init = pc_init_pci_no_kvmclock,
     .max_cpus = 255,
+    .no_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_12,
         {
@@ -567,6 +574,7 @@ static QEMUMachine pc_machine_v0_11 = {
     .desc = "Standard PC, qemu 0.11",
     .init = pc_init_pci_no_kvmclock,
     .max_cpus = 255,
+    .no_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_11,
         {
@@ -588,6 +596,7 @@ static QEMUMachine pc_machine_v0_10 = {
     .desc = "Standard PC, qemu 0.10",
     .init = pc_init_pci_no_kvmclock,
     .max_cpus = 255,
+    .no_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_11,
         {
@@ -621,6 +630,7 @@ static QEMUMachine isapc_machine = {
     .desc = "ISA-only PC",
     .init = pc_init_isa,
     .max_cpus = 1,
+    .no_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         {
             .driver   = "pc-sysfw",
@@ -636,6 +646,7 @@ static QEMUMachine xenfv_machine = {
     .name = "xenfv",
     .desc = "Xen Fully-virtualized PC",
     .init = pc_xen_hvm_init,
+    .no_sdcard = 1,
     .max_cpus = HVM_MAX_VCPUS,
     .default_machine_opts = "accel=xen",
 };
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 4b72aa7..6f7bff2 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -115,6 +115,7 @@ static QEMUMachine xenpv_machine = {
     .desc = "Xen Para-virtualized PC",
     .init = xen_init_pv,
     .max_cpus = 1,
+    .no_sdcard = 1,
     .default_machine_opts = "accel=xen",
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH 13/23] lm32: Suppress unused default drives

[Markus Armbruster]

Cc: Michael Walle <michael@walle.cc>

Suppress default floppy and CD-ROM drives for machines lm32-evr,
lm32-uclinux, milkymist.

Suppress default SD card drive for machines lm32-evr, lm32-uclinux.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/lm32_boards.c | 6 ++++++
 hw/milkymist.c   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index b76d800..973f89e 100644
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -290,6 +290,9 @@ static QEMUMachine lm32_evr_machine = {
     .name = "lm32-evr",
     .desc = "LatticeMico32 EVR32 eval system",
     .init = lm32_evr_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
     .is_default = 1
 };
 
@@ -297,6 +300,9 @@ static QEMUMachine lm32_uclinux_machine = {
     .name = "lm32-uclinux",
     .desc = "lm32 platform for uClinux and u-boot by Theobroma Systems",
     .init = lm32_uclinux_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
     .is_default = 0
 };
 
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 2e7235b..d58afe4 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -207,6 +207,8 @@ static QEMUMachine milkymist_machine = {
     .name = "milkymist",
     .desc = "Milkymist One",
     .init = milkymist_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
     .is_default = 0
 };
 
-- 
1.7.11.2

Re: [Qemu-devel] [PATCH 13/23] lm32: Suppress unused default drives

[Michael Walle]

Am Donnerstag 09 August 2012, 15:31:14 schrieb Markus Armbruster:
> Cc: Michael Walle <michael@walle.cc>
> 
> Suppress default floppy and CD-ROM drives for machines lm32-evr,
> lm32-uclinux, milkymist.
> 
> Suppress default SD card drive for machines lm32-evr, lm32-uclinux.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  hw/lm32_boards.c | 6 ++++++
>  hw/milkymist.c   | 2 ++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
> index b76d800..973f89e 100644
> --- a/hw/lm32_boards.c
> +++ b/hw/lm32_boards.c
> @@ -290,6 +290,9 @@ static QEMUMachine lm32_evr_machine = {
>      .name = "lm32-evr",
>      .desc = "LatticeMico32 EVR32 eval system",
>      .init = lm32_evr_init,
> +    .no_floppy = 1,
> +    .no_cdrom = 1,
> +    .no_sdcard = 1,
>      .is_default = 1
>  };
> 
> @@ -297,6 +300,9 @@ static QEMUMachine lm32_uclinux_machine = {
>      .name = "lm32-uclinux",
>      .desc = "lm32 platform for uClinux and u-boot by Theobroma Systems",
>      .init = lm32_uclinux_init,
> +    .no_floppy = 1,
> +    .no_cdrom = 1,
> +    .no_sdcard = 1,
>      .is_default = 0
>  };
> 
> diff --git a/hw/milkymist.c b/hw/milkymist.c
> index 2e7235b..d58afe4 100644
> --- a/hw/milkymist.c
> +++ b/hw/milkymist.c
> @@ -207,6 +207,8 @@ static QEMUMachine milkymist_machine = {
>      .name = "milkymist",
>      .desc = "Milkymist One",
>      .init = milkymist_init,
> +    .no_floppy = 1,
> +    .no_cdrom = 1,
>      .is_default = 0
>  };

Acked-by: Michael Walle <michael@walle.cc>

-- 
Michael

[Qemu-devel] [PATCH 14/23] m68k: Suppress unused default drives

[Markus Armbruster]

Cc: Paul Brook <paul@codesourcery.com

Suppress default floppy, CD-ROM and SD card drives for machines
an5206, dummy, mcf5208evb.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/an5206.c     | 3 +++
 hw/dummy_m68k.c | 3 +++
 hw/mcf5208.c    | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/hw/an5206.c b/hw/an5206.c
index 25407c0..80158581 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -86,6 +86,9 @@ static QEMUMachine an5206_machine = {
     .name = "an5206",
     .desc = "Arnewsh 5206",
     .init = an5206_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void an5206_machine_init(void)
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 7cc7a99..8bb4e7d 100644
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -73,6 +73,9 @@ static QEMUMachine dummy_m68k_machine = {
     .name = "dummy",
     .desc = "Dummy board",
     .init = dummy_m68k_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void dummy_m68k_machine_init(void)
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index ee25b1b..c87a323 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -291,6 +291,9 @@ static QEMUMachine mcf5208evb_machine = {
     .name = "mcf5208evb",
     .desc = "MCF5206EVB",
     .init = mcf5208evb_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
     .is_default = 1,
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH 15/23] microblaze: Suppress unused default drives

[Markus Armbruster]

Cc: Peter Crosthwaite <peter.crosthwaite@petalogix.com>

Suppress default floppy, CD-ROM and SD card drives for machines
petalogix-ml605 and petalogix-s3adsp1800.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/petalogix_ml605_mmu.c      | 3 +++
 hw/petalogix_s3adsp1800_mmu.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 6a7d0c0..8839ced 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -144,6 +144,9 @@ static QEMUMachine petalogix_ml605_machine = {
     .name = "petalogix-ml605",
     .desc = "PetaLogix linux refdesign for xilinx ml605 little endian",
     .init = petalogix_ml605_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
     .is_default = 0
 };
 
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 2cf6882..c1a6e95 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -117,6 +117,9 @@ static QEMUMachine petalogix_s3adsp1800_machine = {
     .name = "petalogix-s3adsp1800",
     .desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800",
     .init = petalogix_s3adsp1800_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
     .is_default = 1
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH 16/23] mips_jazz: Suppress unused default drives

[Markus Armbruster]

Cc: Hervé Poussineau <hpoussin@reactos.org>

Suppress default SD card drive for machines magnum, pica61.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/mips_jazz.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index db927f1..c6a1ace 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -326,6 +326,7 @@ static QEMUMachine mips_magnum_machine = {
     .desc = "MIPS Magnum",
     .init = mips_magnum_init,
     .use_scsi = 1,
+    .no_sdcard = 1,
 };
 
 static QEMUMachine mips_pica61_machine = {
@@ -333,6 +334,7 @@ static QEMUMachine mips_pica61_machine = {
     .desc = "Acer Pica 61",
     .init = mips_pica61_init,
     .use_scsi = 1,
+    .no_sdcard = 1,
 };
 
 static void mips_jazz_machine_init(void)
-- 
1.7.11.2

Re: [Qemu-devel] [PATCH 16/23] mips_jazz: Suppress unused default drives

[Hervé Poussineau]

Markus Armbruster a écrit :
> Cc: Hervé Poussineau <hpoussin@reactos.org>
> 
> Suppress default SD card drive for machines magnum, pica61.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---

Acked-by: Hervé Poussineau <hpoussin@reactos.org>

[Qemu-devel] [PATCH 17/23] mips_malta mips_r4k: Suppress unused default drives

[Markus Armbruster]

Cc: Aurelien Jarno <aurelien@aurel32.net>

Suppress default SD card drive for machines malta, mips.

Suppress default floppy drive for machine mips.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/mips_malta.c | 1 +
 hw/mips_r4k.c   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 351c88e..c1c52ac 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -1019,6 +1019,7 @@ static QEMUMachine mips_malta_machine = {
     .desc = "MIPS Malta Core LV",
     .init = mips_malta_init,
     .max_cpus = 16,
+    .no_sdcard = 1,
     .is_default = 1,
 };
 
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 967a76e..d9f6dc5 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -299,6 +299,8 @@ static QEMUMachine mips_machine = {
     .name = "mips",
     .desc = "mips r4k platform",
     .init = mips_r4k_init,
+    .no_floppy = 1,
+    .no_sdcard = 1,
 };
 
 static void mips_machine_init(void)
-- 
1.7.11.2

Re: [Qemu-devel] [PATCH 17/23] mips_malta mips_r4k: Suppress unused default drives

[Stefan Weil]

Am 09.08.2012 15:31, schrieb Markus Armbruster:
> Cc: Aurelien Jarno <aurelien@aurel32.net>
>
> Suppress default SD card drive for machines malta, mips.
>
> Suppress default floppy drive for machine mips.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   hw/mips_malta.c | 1 +
>   hw/mips_r4k.c   | 2 ++
>   2 files changed, 3 insertions(+)
>
> diff --git a/hw/mips_malta.c b/hw/mips_malta.c
> index 351c88e..c1c52ac 100644
> --- a/hw/mips_malta.c
> +++ b/hw/mips_malta.c
> @@ -1019,6 +1019,7 @@ static QEMUMachine mips_malta_machine = {
>       .desc = "MIPS Malta Core LV",
>       .init = mips_malta_init,
>       .max_cpus = 16,
> +    .no_sdcard = 1,
>       .is_default = 1,
>   };
>   
> diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
> index 967a76e..d9f6dc5 100644
> --- a/hw/mips_r4k.c
> +++ b/hw/mips_r4k.c
> @@ -299,6 +299,8 @@ static QEMUMachine mips_machine = {
>       .name = "mips",
>       .desc = "mips r4k platform",
>       .init = mips_r4k_init,
> +    .no_floppy = 1,
> +    .no_sdcard = 1,
>   };
>   
>   static void mips_machine_init(void)

Reviewed-by: Stefan Weil <sw@weilnetz.de>

I'd prefer using 'true' instead of '1' (and changing the
variables to type bool), but that can be done later.

Regards,

Stefan W.

[Qemu-devel] [PATCH 18/23] mips_fulong2e, mips_mipssim: Suppress unused default drives

[Markus Armbruster]

Suppress default floppy and SD card drive for machines fulong2e,
mipssim.

Suppress default CD-ROM drive for machine mipssim.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/mips_fulong2e.c | 2 ++
 hw/mips_mipssim.c  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 38e4b86..78b1832 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -396,6 +396,8 @@ QEMUMachine mips_fulong2e_machine = {
     .name = "fulong2e",
     .desc = "Fulong 2e mini pc",
     .init = mips_fulong2e_init,
+    .no_floppy = 1,
+    .no_sdcard = 1,
 };
 
 static void mips_fulong2e_machine_init(void)
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 830f635..faa0eb9 100644
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -226,6 +226,9 @@ static QEMUMachine mips_mipssim_machine = {
     .name = "mipssim",
     .desc = "MIPS MIPSsim platform",
     .init = mips_mipssim_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void mips_mipssim_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH 19/23] or32-sim: Suppress unused default drives

[Markus Armbruster]

Suppress default floppy, CD-ROM and SD card drive.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/openrisc_sim.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index 55e97f0..13631ea 100644
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -139,6 +139,9 @@ static QEMUMachine openrisc_sim_machine = {
     .desc = "or32 simulation",
     .init = openrisc_sim_init,
     .max_cpus = 1,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
     .is_default = 1,
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH 20/23] ppc: Suppress unused default drives

[Markus Armbruster]

Cc: Alexander Graf <agraf@suse.de>
Cc: Andreas Färber <andreas.faerber@web.de>
Cc: qemu-ppc@nongnu.org

Suppress default floppy drive for machines ref405ep, taihu, bamboo,
mac99, g3beige, virtex-ml507.

Suppress default CD-ROM drive for machines ref405ep, taihu, bamboo,
virtex-ml507.

Suppress default SD card drive for machines ref405ep, taihu, bamboo,
mac88, g3beige, prep, virtex-ml507.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/ppc405_boards.c | 6 ++++++
 hw/ppc440_bamboo.c | 3 +++
 hw/ppc_newworld.c  | 2 ++
 hw/ppc_oldworld.c  | 2 ++
 hw/ppc_prep.c      | 1 +
 hw/virtex_ml507.c  | 3 +++
 6 files changed, 17 insertions(+)

diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 476775d..08f90f1 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -363,6 +363,9 @@ static QEMUMachine ref405ep_machine = {
     .name = "ref405ep",
     .desc = "ref405ep",
     .init = ref405ep_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 /*****************************************************************************/
@@ -652,6 +655,9 @@ static QEMUMachine taihu_machine = {
     .name = "taihu",
     .desc = "taihu",
     .init = taihu_405ep_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void ppc405_machine_init(void)
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 0dd4dab..5cb0d35 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -294,6 +294,9 @@ static QEMUMachine bamboo_machine = {
     .name = "bamboo",
     .desc = "bamboo",
     .init = bamboo_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void bamboo_machine_init(void)
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 4e2a6e6..1e41c2b 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -423,6 +423,8 @@ static QEMUMachine core99_machine = {
     .desc = "Mac99 based PowerMAC",
     .init = ppc_core99_init,
     .max_cpus = MAX_CPUS,
+    .no_floppy = 1,
+    .no_sdcard = 1,
 #ifdef TARGET_PPC64
     .is_default = 1,
 #endif
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index f2c6908..bcecc0a 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -338,6 +338,8 @@ static QEMUMachine heathrow_machine = {
     .desc = "Heathrow based PowerMAC",
     .init = ppc_heathrow_init,
     .max_cpus = MAX_CPUS,
+    .no_floppy = 1,
+    .no_sdcard = 1,
 #ifndef TARGET_PPC64
     .is_default = 1,
 #endif
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index be2b268..9393022 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -694,6 +694,7 @@ static QEMUMachine prep_machine = {
     .desc = "PowerPC PREP platform",
     .init = ppc_prep_init,
     .max_cpus = MAX_CPUS,
+    .no_sdcard = 1,
 };
 
 static void prep_machine_init(void)
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 79bc0d1..62b56c0 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -264,6 +264,9 @@ static QEMUMachine virtex_machine = {
     .name = "virtex-ml507",
     .desc = "Xilinx Virtex ML507 reference design",
     .init = virtex_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void virtex_machine_init(void)
-- 
1.7.11.2

Re: [Qemu-devel] [PATCH 20/23] ppc: Suppress unused default drives

[Andreas Färber]

Am 09.08.2012 15:31, schrieb Markus Armbruster:
> Cc: Alexander Graf <agraf@suse.de>
> Cc: Andreas Färber <andreas.faerber@web.de>
> Cc: qemu-ppc@nongnu.org
> 
> Suppress default floppy drive for machines ref405ep, taihu, bamboo,
> mac99, g3beige, virtex-ml507.
> 
> Suppress default CD-ROM drive for machines ref405ep, taihu, bamboo,
> virtex-ml507.
> 
> Suppress default SD card drive for machines ref405ep, taihu, bamboo,
> mac88, g3beige, prep, virtex-ml507.

mac99

> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  hw/ppc405_boards.c | 6 ++++++
>  hw/ppc440_bamboo.c | 3 +++
>  hw/ppc_newworld.c  | 2 ++
>  hw/ppc_oldworld.c  | 2 ++
>  hw/ppc_prep.c      | 1 +
>  hw/virtex_ml507.c  | 3 +++
>  6 files changed, 17 insertions(+)
[...]
> diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
> index 4e2a6e6..1e41c2b 100644
> --- a/hw/ppc_newworld.c
> +++ b/hw/ppc_newworld.c
> @@ -423,6 +423,8 @@ static QEMUMachine core99_machine = {
>      .desc = "Mac99 based PowerMAC",
>      .init = ppc_core99_init,
>      .max_cpus = MAX_CPUS,
> +    .no_floppy = 1,
> +    .no_sdcard = 1,
>  #ifdef TARGET_PPC64
>      .is_default = 1,
>  #endif

Ack.

> diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
> index f2c6908..bcecc0a 100644
> --- a/hw/ppc_oldworld.c
> +++ b/hw/ppc_oldworld.c
> @@ -338,6 +338,8 @@ static QEMUMachine heathrow_machine = {
>      .desc = "Heathrow based PowerMAC",
>      .init = ppc_heathrow_init,
>      .max_cpus = MAX_CPUS,
> +    .no_floppy = 1,
> +    .no_sdcard = 1,
>  #ifndef TARGET_PPC64
>      .is_default = 1,
>  #endif

Ack for SD.

Not sure about the floppy. I thought the beige Old World machines used
to have a floppy with some incompatible Apple formatting... Did they use
a controller we don't implement? If so, then .no_floppy should get a
comment.

> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
> index be2b268..9393022 100644
> --- a/hw/ppc_prep.c
> +++ b/hw/ppc_prep.c
> @@ -694,6 +694,7 @@ static QEMUMachine prep_machine = {
>      .desc = "PowerPC PREP platform",
>      .init = ppc_prep_init,
>      .max_cpus = MAX_CPUS,
> +    .no_sdcard = 1,
>  };
>  
>  static void prep_machine_init(void)

Ack.

> diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
> index 79bc0d1..62b56c0 100644
> --- a/hw/virtex_ml507.c
> +++ b/hw/virtex_ml507.c
> @@ -264,6 +264,9 @@ static QEMUMachine virtex_machine = {
>      .name = "virtex-ml507",
>      .desc = "Xilinx Virtex ML507 reference design",
>      .init = virtex_init,
> +    .no_floppy = 1,
> +    .no_cdrom = 1,
> +    .no_sdcard = 1,
>  };
>  
>  static void virtex_machine_init(void)

Markus, independent of this patch, might it make sense to invert the
logic here so that machine authors don't need to know the list of what
.no_ options to specify?

Andreas

Re: [Qemu-devel] [PATCH 20/23] ppc: Suppress unused default drives

[Markus Armbruster]

Andreas Färber <andreas.faerber@web.de> writes:

> Am 09.08.2012 15:31, schrieb Markus Armbruster:
>> Cc: Alexander Graf <agraf@suse.de>
>> Cc: Andreas Färber <andreas.faerber@web.de>
>> Cc: qemu-ppc@nongnu.org
>> 
>> Suppress default floppy drive for machines ref405ep, taihu, bamboo,
>> mac99, g3beige, virtex-ml507.
>> 
>> Suppress default CD-ROM drive for machines ref405ep, taihu, bamboo,
>> virtex-ml507.
>> 
>> Suppress default SD card drive for machines ref405ep, taihu, bamboo,
>> mac88, g3beige, prep, virtex-ml507.
>
> mac99

Oopsie.  Thanks!

>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  hw/ppc405_boards.c | 6 ++++++
>>  hw/ppc440_bamboo.c | 3 +++
>>  hw/ppc_newworld.c  | 2 ++
>>  hw/ppc_oldworld.c  | 2 ++
>>  hw/ppc_prep.c      | 1 +
>>  hw/virtex_ml507.c  | 3 +++
>>  6 files changed, 17 insertions(+)
> [...]
>> diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
>> index 4e2a6e6..1e41c2b 100644
>> --- a/hw/ppc_newworld.c
>> +++ b/hw/ppc_newworld.c
>> @@ -423,6 +423,8 @@ static QEMUMachine core99_machine = {
>>      .desc = "Mac99 based PowerMAC",
>>      .init = ppc_core99_init,
>>      .max_cpus = MAX_CPUS,
>> +    .no_floppy = 1,
>> +    .no_sdcard = 1,
>>  #ifdef TARGET_PPC64
>>      .is_default = 1,
>>  #endif
>
> Ack.
>
>> diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
>> index f2c6908..bcecc0a 100644
>> --- a/hw/ppc_oldworld.c
>> +++ b/hw/ppc_oldworld.c
>> @@ -338,6 +338,8 @@ static QEMUMachine heathrow_machine = {
>>      .desc = "Heathrow based PowerMAC",
>>      .init = ppc_heathrow_init,
>>      .max_cpus = MAX_CPUS,
>> +    .no_floppy = 1,
>> +    .no_sdcard = 1,
>>  #ifndef TARGET_PPC64
>>      .is_default = 1,
>>  #endif
>
> Ack for SD.
>
> Not sure about the floppy. I thought the beige Old World machines used
> to have a floppy with some incompatible Apple formatting... Did they use
> a controller we don't implement? If so, then .no_floppy should get a
> comment.

I have no idea.  Alex?

>> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
>> index be2b268..9393022 100644
>> --- a/hw/ppc_prep.c
>> +++ b/hw/ppc_prep.c
>> @@ -694,6 +694,7 @@ static QEMUMachine prep_machine = {
>>      .desc = "PowerPC PREP platform",
>>      .init = ppc_prep_init,
>>      .max_cpus = MAX_CPUS,
>> +    .no_sdcard = 1,
>>  };
>>  
>>  static void prep_machine_init(void)
>
> Ack.
>
>> diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
>> index 79bc0d1..62b56c0 100644
>> --- a/hw/virtex_ml507.c
>> +++ b/hw/virtex_ml507.c
>> @@ -264,6 +264,9 @@ static QEMUMachine virtex_machine = {
>>      .name = "virtex-ml507",
>>      .desc = "Xilinx Virtex ML507 reference design",
>>      .init = virtex_init,
>> +    .no_floppy = 1,
>> +    .no_cdrom = 1,
>> +    .no_sdcard = 1,
>>  };
>>  
>>  static void virtex_machine_init(void)
>
> Markus, independent of this patch, might it make sense to invert the
> logic here so that machine authors don't need to know the list of what
> .no_ options to specify?

Leaning towards yes.

Re: [Qemu-devel] [PATCH 20/23] ppc: Suppress unused default drives

[Alexander Graf]

On 09.08.2012, at 16:54, Markus Armbruster <armbru@redhat.com> wrote:

> Andreas Färber <andreas.faerber@web.de> writes:
> 
>> Am 09.08.2012 15:31, schrieb Markus Armbruster:
>>> Cc: Alexander Graf <agraf@suse.de>
>>> Cc: Andreas Färber <andreas.faerber@web.de>
>>> Cc: qemu-ppc@nongnu.org
>>> 
>>> Suppress default floppy drive for machines ref405ep, taihu, bamboo,
>>> mac99, g3beige, virtex-ml507.
>>> 
>>> Suppress default CD-ROM drive for machines ref405ep, taihu, bamboo,
>>> virtex-ml507.
>>> 
>>> Suppress default SD card drive for machines ref405ep, taihu, bamboo,
>>> mac88, g3beige, prep, virtex-ml507.
>> 
>> mac99
> 
> Oopsie.  Thanks!
> 
>>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>> ---
>>> hw/ppc405_boards.c | 6 ++++++
>>> hw/ppc440_bamboo.c | 3 +++
>>> hw/ppc_newworld.c  | 2 ++
>>> hw/ppc_oldworld.c  | 2 ++
>>> hw/ppc_prep.c      | 1 +
>>> hw/virtex_ml507.c  | 3 +++
>>> 6 files changed, 17 insertions(+)
>> [...]
>>> diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
>>> index 4e2a6e6..1e41c2b 100644
>>> --- a/hw/ppc_newworld.c
>>> +++ b/hw/ppc_newworld.c
>>> @@ -423,6 +423,8 @@ static QEMUMachine core99_machine = {
>>>     .desc = "Mac99 based PowerMAC",
>>>     .init = ppc_core99_init,
>>>     .max_cpus = MAX_CPUS,
>>> +    .no_floppy = 1,
>>> +    .no_sdcard = 1,
>>> #ifdef TARGET_PPC64
>>>     .is_default = 1,
>>> #endif
>> 
>> Ack.
>> 
>>> diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
>>> index f2c6908..bcecc0a 100644
>>> --- a/hw/ppc_oldworld.c
>>> +++ b/hw/ppc_oldworld.c
>>> @@ -338,6 +338,8 @@ static QEMUMachine heathrow_machine = {
>>>     .desc = "Heathrow based PowerMAC",
>>>     .init = ppc_heathrow_init,
>>>     .max_cpus = MAX_CPUS,
>>> +    .no_floppy = 1,
>>> +    .no_sdcard = 1,
>>> #ifndef TARGET_PPC64
>>>     .is_default = 1,
>>> #endif
>> 
>> Ack for SD.
>> 
>> Not sure about the floppy. I thought the beige Old World machines used
>> to have a floppy with some incompatible Apple formatting... Did they use
>> a controller we don't implement? If so, then .no_floppy should get a
>> comment.
> 
> I have no idea.  Alex?

I'd have to check wikipedia all the same :)

Alex

Re: [Qemu-devel] [PATCH 20/23] ppc: Suppress unused default drives

[Markus Armbruster]

Alexander Graf <agraf@suse.de> writes:

> On 09.08.2012, at 16:54, Markus Armbruster <armbru@redhat.com> wrote:
>
>> Andreas Färber <andreas.faerber@web.de> writes:
>> 
>>> Am 09.08.2012 15:31, schrieb Markus Armbruster:
>>>> Cc: Alexander Graf <agraf@suse.de>
>>>> Cc: Andreas Färber <andreas.faerber@web.de>
>>>> Cc: qemu-ppc@nongnu.org
>>>> 
>>>> Suppress default floppy drive for machines ref405ep, taihu, bamboo,
>>>> mac99, g3beige, virtex-ml507.
>>>> 
>>>> Suppress default CD-ROM drive for machines ref405ep, taihu, bamboo,
>>>> virtex-ml507.
>>>> 
>>>> Suppress default SD card drive for machines ref405ep, taihu, bamboo,
>>>> mac88, g3beige, prep, virtex-ml507.
>>> 
>>> mac99
>> 
>> Oopsie.  Thanks!
>> 
>>>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>>> ---
>>>> hw/ppc405_boards.c | 6 ++++++
>>>> hw/ppc440_bamboo.c | 3 +++
>>>> hw/ppc_newworld.c  | 2 ++
>>>> hw/ppc_oldworld.c  | 2 ++
>>>> hw/ppc_prep.c      | 1 +
>>>> hw/virtex_ml507.c  | 3 +++
>>>> 6 files changed, 17 insertions(+)
>>> [...]
>>>> diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
>>>> index 4e2a6e6..1e41c2b 100644
>>>> --- a/hw/ppc_newworld.c
>>>> +++ b/hw/ppc_newworld.c
>>>> @@ -423,6 +423,8 @@ static QEMUMachine core99_machine = {
>>>>     .desc = "Mac99 based PowerMAC",
>>>>     .init = ppc_core99_init,
>>>>     .max_cpus = MAX_CPUS,
>>>> +    .no_floppy = 1,
>>>> +    .no_sdcard = 1,
>>>> #ifdef TARGET_PPC64
>>>>     .is_default = 1,
>>>> #endif
>>> 
>>> Ack.
>>> 
>>>> diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
>>>> index f2c6908..bcecc0a 100644
>>>> --- a/hw/ppc_oldworld.c
>>>> +++ b/hw/ppc_oldworld.c
>>>> @@ -338,6 +338,8 @@ static QEMUMachine heathrow_machine = {
>>>>     .desc = "Heathrow based PowerMAC",
>>>>     .init = ppc_heathrow_init,
>>>>     .max_cpus = MAX_CPUS,
>>>> +    .no_floppy = 1,
>>>> +    .no_sdcard = 1,
>>>> #ifndef TARGET_PPC64
>>>>     .is_default = 1,
>>>> #endif
>>> 
>>> Ack for SD.
>>> 
>>> Not sure about the floppy. I thought the beige Old World machines used
>>> to have a floppy with some incompatible Apple formatting... Did they use
>>> a controller we don't implement? If so, then .no_floppy should get a
>>> comment.
>> 
>> I have no idea.  Alex?
>
> I'd have to check wikipedia all the same :)

All right, I did: they had some kind of floppy.  No clue what kind.

And we already have a comment:

            /* TOFIX: for now, the second IDE channel is not properly
             *        used by OHW. The Mac floppy disk are not emulated.
             *        For now, OHW cannot boot from the network.
             */

Andreas, still want a comment next to .no_floppy?

Re: [Qemu-devel] [PATCH 20/23] ppc: Suppress unused default drives

[Andreas Färber]

Am 15.08.2012 14:30, schrieb Markus Armbruster:
> Alexander Graf <agraf@suse.de> writes:
> 
>> On 09.08.2012, at 16:54, Markus Armbruster <armbru@redhat.com> wrote:
>>
>>> Andreas Färber <andreas.faerber@web.de> writes:
>>>
>>>> Am 09.08.2012 15:31, schrieb Markus Armbruster:
>>>>> diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
>>>>> index f2c6908..bcecc0a 100644
>>>>> --- a/hw/ppc_oldworld.c
>>>>> +++ b/hw/ppc_oldworld.c
>>>>> @@ -338,6 +338,8 @@ static QEMUMachine heathrow_machine = {
>>>>>     .desc = "Heathrow based PowerMAC",
>>>>>     .init = ppc_heathrow_init,
>>>>>     .max_cpus = MAX_CPUS,
>>>>> +    .no_floppy = 1,
>>>>> +    .no_sdcard = 1,
>>>>> #ifndef TARGET_PPC64
>>>>>     .is_default = 1,
>>>>> #endif
>>>>
>>>> Ack for SD.
>>>>
>>>> Not sure about the floppy. I thought the beige Old World machines used
>>>> to have a floppy with some incompatible Apple formatting... Did they use
>>>> a controller we don't implement? If so, then .no_floppy should get a
>>>> comment.
>>>
>>> I have no idea.  Alex?
>>
>> I'd have to check wikipedia all the same :)
> 
> All right, I did: they had some kind of floppy.  No clue what kind.
> 
> And we already have a comment:
> 
>             /* TOFIX: for now, the second IDE channel is not properly
>              *        used by OHW. The Mac floppy disk are not emulated.
>              *        For now, OHW cannot boot from the network.
>              */
> 
> Andreas, still want a comment next to .no_floppy?

Nah, no need then. :)

We should rather spend the time on getting OpenBIOS working with PReP...
o:-)

Andreas

[Qemu-devel] [PATCH 21/23] sh4: Suppress unused default drives

[Markus Armbruster]

Cc: Magnus Damm <magnus.damm@gmail.com>

Suppress default floppy, CD-ROM and SD card drives for machines r2d,
shix.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/r2d.c  | 3 +++
 hw/shix.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/hw/r2d.c b/hw/r2d.c
index 0f16e81..fc7f681 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -344,6 +344,9 @@ static QEMUMachine r2d_machine = {
     .name = "r2d",
     .desc = "r2d-plus board",
     .init = r2d_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void r2d_machine_init(void)
diff --git a/hw/shix.c b/hw/shix.c
index dd9ce17..550e5df 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -93,6 +93,9 @@ static QEMUMachine shix_machine = {
     .name = "shix",
     .desc = "shix card",
     .init = shix_init,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
     .is_default = 1,
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH 22/23] sparc: Suppress unused default drives

[Markus Armbruster]

Cc: Blue Swirl <blauwirbel@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 <armbru@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

Re: [Qemu-devel] [PATCH 22/23] sparc: Suppress unused default drives

[Blue Swirl]

On Thu, Aug 9, 2012 at 1:31 PM, Markus Armbruster <armbru@redhat.com> wrote:
> Cc: Blue Swirl <blauwirbel@gmail.com>

Acked-by: Blue Swirl <blauwirbel@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 <armbru@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
>

[Qemu-devel] [PATCH 23/23] xtensa: Suppress unused default drives

[Markus Armbruster]

Cc: Max Filippov <jcmvbkbc@gmail.com>

Suppress default floppy, CD-ROM and SD card drives for machines lx60,
lx200, sim.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/xtensa_lx60.c | 6 ++++++
 hw/xtensa_sim.c  | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index c4f616f..f89e255 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -303,6 +303,9 @@ static QEMUMachine xtensa_lx60_machine = {
     .desc = "lx60 EVB (dc232b)",
     .init = xtensa_lx60_init,
     .max_cpus = 4,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static QEMUMachine xtensa_lx200_machine = {
@@ -310,6 +313,9 @@ static QEMUMachine xtensa_lx200_machine = {
     .desc = "lx200 EVB (dc232b)",
     .init = xtensa_lx200_init,
     .max_cpus = 4,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void xtensa_lx_machines_init(void)
diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 1ce07fb..f1246d6 100644
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -113,6 +113,9 @@ static QEMUMachine xtensa_sim_machine = {
     .desc = "sim machine (dc232b)",
     .init = xtensa_sim_init,
     .max_cpus = 4,
+    .no_floppy = 1,
+    .no_cdrom = 1,
+    .no_sdcard = 1,
 };
 
 static void xtensa_sim_machine_init(void)
-- 
1.7.11.2

Re: [Qemu-devel] [PATCH 23/23] xtensa: Suppress unused default drives

[Max Filippov]

On Thu, Aug 9, 2012 at 5:31 PM, Markus Armbruster <armbru@redhat.com> wrote:
> Cc: Max Filippov <jcmvbkbc@gmail.com>
>
> Suppress default floppy, CD-ROM and SD card drives for machines lx60,
> lx200, sim.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Acked-by: Max Filippov <jcmvbkbc@gmail.com>

Though I'd agree with Andreas about inverting default device creation logic.

-- 
Thanks.
-- Max

Re: [Qemu-devel] [PATCH 00/23] Suppress unused default drives

[Peter Maydell]

On 9 August 2012 14:31, Markus Armbruster <armbru@redhat.com> wrote:
> We create a number of default drives for machines to use: floppy,
> CD-ROM, SD card.  Machines can suppress the ones they don't use, but
> few do.  Fix that.

For clarity: what are the negative effects that result from
machines not saying no_floppy &c ?

-- PMM

Re: [Qemu-devel] [PATCH 00/23] Suppress unused default drives

[Markus Armbruster]

Peter Maydell <peter.maydell@linaro.org> writes:

> On 9 August 2012 14:31, Markus Armbruster <armbru@redhat.com> wrote:
>> We create a number of default drives for machines to use: floppy,
>> CD-ROM, SD card.  Machines can suppress the ones they don't use, but
>> few do.  Fix that.
>
> For clarity: what are the negative effects that result from
> machines not saying no_floppy &c ?

"info block" shows the unused default drives.  For instance,

    $ qemu-system-x86_64 -vnc :0 -monitor stdio 
    QEMU 1.1.50 monitor - type 'help' for more information
    (qemu) info block
    ide1-cd0: removable=1 locked=0 tray-open=0 io-status=ok [not inserted]
    floppy0: removable=1 locked=0 tray-open=0 [not inserted]
    sd0: removable=1 locked=0 tray-open=0 [not inserted]
    pflash0: removable=0 file=/work/armbru/qemu/bld-x86/pc-bios/bios.bin ro=1 drv=raw encrypted=0 bps=0 bps_rd=0 bps_wr=0 iops=0 iops_rd=0 iops_wr=0

Drive sd0 is unused here.  Might confuse the uninitiated.  Moreover, you
*can* use it for something entirely else, if=sd notwithstanding:

    (qemu) device_add lsi
    (qemu) device_add scsi-cd,drive=sd0

Re: [Qemu-devel] [PATCH 00/23] Suppress unused default drives

[Peter Maydell]

On 9 August 2012 15:08, Markus Armbruster <armbru@redhat.com> wrote:
> Peter Maydell <peter.maydell@linaro.org> writes:
>> For clarity: what are the negative effects that result from
>> machines not saying no_floppy &c ?
>
> "info block" shows the unused default drives.  For instance,
>
>     $ qemu-system-x86_64 -vnc :0 -monitor stdio
>     QEMU 1.1.50 monitor - type 'help' for more information
>     (qemu) info block
>     ide1-cd0: removable=1 locked=0 tray-open=0 io-status=ok [not inserted]
>     floppy0: removable=1 locked=0 tray-open=0 [not inserted]
>     sd0: removable=1 locked=0 tray-open=0 [not inserted]
>     pflash0: removable=0 file=/work/armbru/qemu/bld-x86/pc-bios/bios.bin ro=1 drv=raw encrypted=0 bps=0 bps_rd=0 bps_wr=0 iops=0 iops_rd=0 iops_wr=0
>
> Drive sd0 is unused here.  Might confuse the uninitiated.  Moreover, you
> *can* use it for something entirely else, if=sd notwithstanding:
>
>     (qemu) device_add lsi
>     (qemu) device_add scsi-cd,drive=sd0

If/when we get a PCI SD card controller model, would all the PCI
using machines need to be added to take the 'no default sd card'
setting out again, or does it get overridden anyway if you say
"and I'd like an sd controller"?

-- PMM

Re: [Qemu-devel] [PATCH 00/23] Suppress unused default drives

[Markus Armbruster]

Peter Maydell <peter.maydell@linaro.org> writes:

> On 9 August 2012 15:08, Markus Armbruster <armbru@redhat.com> wrote:
>> Peter Maydell <peter.maydell@linaro.org> writes:
>>> For clarity: what are the negative effects that result from
>>> machines not saying no_floppy &c ?
>>
>> "info block" shows the unused default drives.  For instance,
>>
>>     $ qemu-system-x86_64 -vnc :0 -monitor stdio
>>     QEMU 1.1.50 monitor - type 'help' for more information
>>     (qemu) info block
>>     ide1-cd0: removable=1 locked=0 tray-open=0 io-status=ok [not inserted]
>>     floppy0: removable=1 locked=0 tray-open=0 [not inserted]
>>     sd0: removable=1 locked=0 tray-open=0 [not inserted]
>>     pflash0: removable=0
>> file=/work/armbru/qemu/bld-x86/pc-bios/bios.bin ro=1 drv=raw
>> encrypted=0 bps=0 bps_rd=0 bps_wr=0 iops=0 iops_rd=0 iops_wr=0
>>
>> Drive sd0 is unused here.  Might confuse the uninitiated.  Moreover, you
>> *can* use it for something entirely else, if=sd notwithstanding:
>>
>>     (qemu) device_add lsi
>>     (qemu) device_add scsi-cd,drive=sd0
>
> If/when we get a PCI SD card controller model, would all the PCI
> using machines need to be added to take the 'no default sd card'
> setting out again, or does it get overridden anyway if you say
> "and I'd like an sd controller"?

".no_sdcard = 0" makes sense only when the board uses the default IF_SD
drive.

Existence of an PCI SD card device model for the user to -device is not
relevant for the board's QEMUmachine member no_sdcard.  QEMUmachine
describes the board, not devices that could be added to it.

Only when we add an SD card to a board should its QEMUmachine no_sdcard
go back to 0.

Re: [Qemu-devel] [PATCH 00/23] Suppress unused default drives

[Paul Brook]

> > *can* use it for something entirely else, if=sd notwithstanding:
> >     (qemu) device_add lsi
> >     (qemu) device_add scsi-cd,drive=sd0
> 
> If/when we get a PCI SD card controller model, would all the PCI
> using machines need to be added to take the 'no default sd card'
> setting out again, or does it get overridden anyway if you say
> "and I'd like an sd controller"?

For SD cards we shouldn't need this to start with.  Why are we creating SD 
cards when there's no host controller to connect them to?  Surely we shold be 
able to figure that out automatically.  Especially important for board 
variants with multiple SD interfaces.

Is this all a hangover from before we have proper -drive options?

Paul

Re: [Qemu-devel] [PATCH 00/23] Suppress unused default drives

[Markus Armbruster]

Paul Brook <paul@codesourcery.com> writes:

>> > *can* use it for something entirely else, if=sd notwithstanding:
>> >     (qemu) device_add lsi
>> >     (qemu) device_add scsi-cd,drive=sd0
>> 
>> If/when we get a PCI SD card controller model, would all the PCI
>> using machines need to be added to take the 'no default sd card'
>> setting out again, or does it get overridden anyway if you say
>> "and I'd like an sd controller"?
>
> For SD cards we shouldn't need this to start with.  Why are we creating SD 
> cards when there's no host controller to connect them to?  Surely we shold be 
> able to figure that out automatically.  Especially important for board 
> variants with multiple SD interfaces.
>
> Is this all a hangover from before we have proper -drive options?

As far as I can tell, we used to create default drives unconditionally.
Commit aa40fc9c (v0.13) added -nodefaults to suppress them all, and
commit ac33f8fa (v0.13) added means for boards to suppress them
selectively.

Commit e3260506 (v1.1) suppressed SD card for xilinx-zynq-a9, and commit
ad0bbc56 (v1.1) suppress all three for s390-virtio.

My patch series fixes up all boards to suppress all unused drives.
Better late than never.

We can certainly try to detect "board uses default drive X"
automatically, so that boards don't have to declare their need
explicitly.  But considering how close we are to the freeze, I prefer my
simple and safe fix for now.  We can always improve on it later.