[Qemu-devel] [PATCH v2 for-1.2 00/27] Suppress unused default drives

[Qemu-devel] [PATCH v2 for-1.2 00/27] 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.

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: Guan Xuetao <gxt@mprc.pku.edu.cn>
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

v2:
  Make default drives opt-in instead of opt-out for boards (Andreas)
  Cover new target unicore32
  Bonus fix for unicore32 -M puv3 without -kernel
  Cover mpc8544ds, pseries (missed in v1)

Markus Armbruster (27):
  puv3: Require -kernel
  leon mips_fulong2e: Give QEMUMachine internal linkage
  hw: Make default drives opt-in instead of opt-out for boards
  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
  unicore32: Suppress unused default drives
  xtensa: Suppress unused default drives

 hw/alpha_dp264.c    |  1 +
 hw/boards.h         |  6 +++---
 hw/gumstix.c        |  2 ++
 hw/integratorcp.c   |  1 +
 hw/leon3.c          |  2 +-
 hw/mainstone.c      |  1 +
 hw/milkymist.c      |  1 +
 hw/mips_fulong2e.c  |  3 ++-
 hw/mips_jazz.c      |  4 ++++
 hw/mips_malta.c     |  2 ++
 hw/mips_r4k.c       |  1 +
 hw/nseries.c        |  2 ++
 hw/omap_sx1.c       |  2 ++
 hw/palm.c           |  1 +
 hw/pc_piix.c        | 22 ++++++++++++++++++++++
 hw/ppc_newworld.c   |  1 +
 hw/ppc_oldworld.c   |  1 +
 hw/ppc_prep.c       |  2 ++
 hw/puv3.c           |  5 +++++
 hw/realview.c       |  6 ++++++
 hw/s390-virtio.c    |  3 ---
 hw/spapr.c          |  1 +
 hw/spitz.c          |  4 ++++
 hw/stellaris.c      |  1 +
 hw/sun4m.c          | 21 +++++++++++++++++++++
 hw/sun4u.c          |  6 ++++++
 hw/tosa.c           |  1 +
 hw/versatilepb.c    |  4 ++++
 hw/vexpress.c       |  2 ++
 hw/xen_machine_pv.c |  2 ++
 hw/xilinx_zynq.c    |  1 -
 hw/z2.c             |  1 +
 vl.c                |  6 +++---
 33 files changed, 107 insertions(+), 12 deletions(-)

-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 01/27] puv3: Require -kernel

[Markus Armbruster]

Without it, puv3_load_kernel() asserts.

Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>

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

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

diff --git a/hw/puv3.c b/hw/puv3.c
index 43f7216..8aad17f 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -97,6 +97,11 @@ static void puv3_init(ram_addr_t ram_size, const char *boot_device,
 {
     CPUUniCore32State *env;
 
+    if (!kernel_filename) {
+        fprintf(stderr, "Kernel image must be specified\n");
+        exit(1);
+    }
+
     if (initrd_filename) {
         hw_error("Please use kernel built-in initramdisk.\n");
     }
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 02/27] leon mips_fulong2e: Give QEMUMachine internal linkage

[Markus Armbruster]

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

diff --git a/hw/leon3.c b/hw/leon3.c
index 878d3aa..7a9729d 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -210,7 +210,7 @@ static void leon3_generic_hw_init(ram_addr_t  ram_size,
     }
 }
 
-QEMUMachine leon3_generic_machine = {
+static QEMUMachine leon3_generic_machine = {
     .name     = "leon3_generic",
     .desc     = "Leon-3 generic",
     .init     = leon3_generic_hw_init,
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 38e4b86..d4a8672 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -392,7 +392,7 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device,
     network_init();
 }
 
-QEMUMachine mips_fulong2e_machine = {
+static QEMUMachine mips_fulong2e_machine = {
     .name = "fulong2e",
     .desc = "Fulong 2e mini pc",
     .init = mips_fulong2e_init,
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 03/27] hw: Make default drives opt-in instead of opt-out for boards

[Markus Armbruster]

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: Guan Xuetao <gxt@mprc.pku.edu.cn>
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

Replace QEMUMachine no_floppy, no_cdrom, no_sdcard by use_floppy,
use_cdrom, use_sdcard.  No functional change.

Boards can suppress default floppy, CD-ROM and SD card, but it takes
explicit initializers.  Most boards lack them, and end up with unused
(and useless) default drives.

This commit flips the sense of these flags, so that boards need
explicit initializers to get default drives.  This should make it
harder to screw up there.

The next few commits will clean up the existing unused default drives.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/alpha_dp264.c              |  3 +++
 hw/an5206.c                   |  3 +++
 hw/axis_dev88.c               |  3 +++
 hw/boards.h                   |  6 +++---
 hw/collie.c                   |  3 +++
 hw/dummy_m68k.c               |  3 +++
 hw/exynos4_boards.c           |  6 ++++++
 hw/gumstix.c                  |  6 ++++++
 hw/highbank.c                 |  3 +++
 hw/integratorcp.c             |  3 +++
 hw/kzm.c                      |  3 +++
 hw/leon3.c                    |  3 +++
 hw/lm32_boards.c              |  6 ++++++
 hw/mainstone.c                |  3 +++
 hw/mcf5208.c                  |  3 +++
 hw/milkymist.c                |  3 +++
 hw/mips_fulong2e.c            |  3 +++
 hw/mips_jazz.c                |  6 ++++++
 hw/mips_malta.c               |  3 +++
 hw/mips_mipssim.c             |  3 +++
 hw/mips_r4k.c                 |  3 +++
 hw/musicpal.c                 |  3 +++
 hw/nseries.c                  |  6 ++++++
 hw/omap_sx1.c                 |  6 ++++++
 hw/openrisc_sim.c             |  3 +++
 hw/palm.c                     |  3 +++
 hw/pc_piix.c                  | 33 +++++++++++++++++++++++++++++++++
 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             |  3 +++
 hw/ppc_oldworld.c             |  3 +++
 hw/ppc_prep.c                 |  3 +++
 hw/ppce500_mpc8544ds.c        |  3 +++
 hw/puv3.c                     |  3 +++
 hw/r2d.c                      |  3 +++
 hw/realview.c                 | 12 ++++++++++++
 hw/s390-virtio.c              |  3 ---
 hw/shix.c                     |  3 +++
 hw/spapr.c                    |  3 +++
 hw/spitz.c                    | 12 ++++++++++++
 hw/stellaris.c                |  6 ++++++
 hw/sun4m.c                    | 36 ++++++++++++++++++++++++++++++++++++
 hw/sun4u.c                    |  9 +++++++++
 hw/tosa.c                     |  3 +++
 hw/versatilepb.c              |  6 ++++++
 hw/vexpress.c                 |  6 ++++++
 hw/virtex_ml507.c             |  3 +++
 hw/xen_machine_pv.c           |  3 +++
 hw/xilinx_zynq.c              |  3 ++-
 hw/xtensa_lx60.c              |  6 ++++++
 hw/xtensa_sim.c               |  3 +++
 hw/z2.c                       |  3 +++
 vl.c                          |  6 +++---
 55 files changed, 281 insertions(+), 10 deletions(-)

diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index 9eb939f..06661e3 100644
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -169,6 +169,9 @@ static QEMUMachine clipper_machine = {
     .desc = "Alpha DP264/CLIPPER",
     .init = clipper_init,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
diff --git a/hw/an5206.c b/hw/an5206.c
index 25407c0..4a0aebb 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void an5206_machine_init(void)
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index eab6327..982b921 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -353,6 +353,9 @@ static QEMUMachine axisdev88_machine = {
     .name = "axis-dev88",
     .desc = "AXIS devboard 88",
     .init = axisdev88_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
diff --git a/hw/boards.h b/hw/boards.h
index 59c01d0..61d4239 100644
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -22,9 +22,9 @@ typedef struct QEMUMachine {
     unsigned int no_serial:1,
         no_parallel:1,
         use_virtcon:1,
-        no_floppy:1,
-        no_cdrom:1,
-        no_sdcard:1;
+        use_floppy:1,
+        use_cdrom:1,
+        use_sdcard:1;
     int is_default;
     const char *default_machine_opts;
     GlobalProperty *compat_props;
diff --git a/hw/collie.c b/hw/collie.c
index 56f89a9..8c0fecd 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void collie_machine_init(void)
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 7cc7a99..1f42a13 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void dummy_m68k_machine_init(void)
diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index 4bb0a60..8daff43 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,
+        .use_floppy = 1,
+        .use_cdrom = 1,
+        .use_sdcard = 1,
     },
     [EXYNOS4_BOARD_SMDKC210] = {
         .name = "smdkc210",
         .desc = "Samsung SMDKC210 board (Exynos4210)",
         .init = smdkc210_init,
         .max_cpus = EXYNOS4210_NCPUS,
+        .use_floppy = 1,
+        .use_cdrom = 1,
+        .use_sdcard = 1,
     },
 };
 
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 13a36ea..955acfe 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -127,12 +127,18 @@ static QEMUMachine connex_machine = {
     .name = "connex",
     .desc = "Gumstix Connex (PXA255)",
     .init = connex_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine verdex_machine = {
     .name = "verdex",
     .desc = "Gumstix Verdex (PXA270)",
     .init = verdex_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void gumstix_machine_init(void)
diff --git a/hw/highbank.c b/hw/highbank.c
index 11aa131..c1b404b 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void highbank_machine_init(void)
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index d0e2e90..b152cc7 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -509,6 +509,9 @@ static QEMUMachine integratorcp_machine = {
     .name = "integratorcp",
     .desc = "ARM Integrator/CP (ARM926EJ-S)",
     .init = integratorcp_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
diff --git a/hw/kzm.c b/hw/kzm.c
index 6a5e9df..a471048 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void kzm_machine_init(void)
diff --git a/hw/leon3.c b/hw/leon3.c
index 7a9729d..aa67e1a 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -215,6 +215,9 @@ 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/lm32_boards.c b/hw/lm32_boards.c
index b76d800..3ed984d 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 0
 };
 
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 97687b6..29b24ac 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -184,6 +184,9 @@ static QEMUMachine mainstone2_machine = {
     .name = "mainstone",
     .desc = "Mainstone II (PXA27x)",
     .init = mainstone_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void mainstone_machine_init(void)
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index ee25b1b..cc7afba 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -291,6 +291,9 @@ static QEMUMachine mcf5208evb_machine = {
     .name = "mcf5208evb",
     .desc = "MCF5206EVB",
     .init = mcf5208evb_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 2e7235b..194d3b5 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -207,6 +207,9 @@ static QEMUMachine milkymist_machine = {
     .name = "milkymist",
     .desc = "Milkymist One",
     .init = milkymist_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 0
 };
 
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index d4a8672..702ec6a 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -396,6 +396,9 @@ static QEMUMachine mips_fulong2e_machine = {
     .name = "fulong2e",
     .desc = "Fulong 2e mini pc",
     .init = mips_fulong2e_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void mips_fulong2e_machine_init(void)
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index db927f1..0e203cb 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -326,6 +326,9 @@ static QEMUMachine mips_magnum_machine = {
     .desc = "MIPS Magnum",
     .init = mips_magnum_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine mips_pica61_machine = {
@@ -333,6 +336,9 @@ static QEMUMachine mips_pica61_machine = {
     .desc = "Acer Pica 61",
     .init = mips_pica61_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void mips_jazz_machine_init(void)
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 351c88e..f86d977 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -1019,6 +1019,9 @@ static QEMUMachine mips_malta_machine = {
     .desc = "MIPS Malta Core LV",
     .init = mips_malta_init,
     .max_cpus = 16,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 830f635..8e97790 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void mips_mipssim_machine_init(void)
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 967a76e..f7adfdc 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -299,6 +299,9 @@ static QEMUMachine mips_machine = {
     .name = "mips",
     .desc = "mips r4k platform",
     .init = mips_r4k_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void mips_machine_init(void)
diff --git a/hw/musicpal.c b/hw/musicpal.c
index ad725b5..3861056 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void musicpal_machine_init(void)
diff --git a/hw/nseries.c b/hw/nseries.c
index 4df2670..dfa158c 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -1409,12 +1409,18 @@ 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,
 };
 
 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,
 };
 
 static void nseries_machine_init(void)
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index abca341..a5d7b85 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -231,12 +231,18 @@ static QEMUMachine sx1_machine_v2 = {
     .name = "sx1",
     .desc = "Siemens SX1 (OMAP310) V2",
     .init = sx1_init_v2,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine sx1_machine_v1 = {
     .name = "sx1-v1",
     .desc = "Siemens SX1 (OMAP310) V1",
     .init = sx1_init_v1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void sx1_machine_init(void)
diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index 55e97f0..2b77846 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
diff --git a/hw/palm.c b/hw/palm.c
index bacdc90..50c53dd 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -279,6 +279,9 @@ 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,
 };
 
 static void palmte_machine_init(void)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 0c0096f..9374198 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -355,6 +355,9 @@ static QEMUMachine pc_machine_v1_2 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
@@ -382,6 +385,9 @@ static QEMUMachine pc_machine_v1_1 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_1_1,
         { /* end of list */ }
@@ -417,6 +423,9 @@ static QEMUMachine pc_machine_v1_0 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_1_0,
         { /* end of list */ }
@@ -432,6 +441,9 @@ static QEMUMachine pc_machine_v0_15 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_15,
         { /* end of list */ }
@@ -464,6 +476,9 @@ static QEMUMachine pc_machine_v0_14 = {
     .desc = "Standard PC",
     .init = pc_init_pci,
     .max_cpus = 255,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_14, 
         {
@@ -497,6 +512,9 @@ static QEMUMachine pc_machine_v0_13 = {
     .desc = "Standard PC",
     .init = pc_init_pci_no_kvmclock,
     .max_cpus = 255,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_13,
         {
@@ -534,6 +552,9 @@ static QEMUMachine pc_machine_v0_12 = {
     .desc = "Standard PC",
     .init = pc_init_pci_no_kvmclock,
     .max_cpus = 255,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_12,
         {
@@ -567,6 +588,9 @@ static QEMUMachine pc_machine_v0_11 = {
     .desc = "Standard PC, qemu 0.11",
     .init = pc_init_pci_no_kvmclock,
     .max_cpus = 255,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_11,
         {
@@ -588,6 +612,9 @@ static QEMUMachine pc_machine_v0_10 = {
     .desc = "Standard PC, qemu 0.10",
     .init = pc_init_pci_no_kvmclock,
     .max_cpus = 255,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_11,
         {
@@ -621,6 +648,9 @@ static QEMUMachine isapc_machine = {
     .desc = "ISA-only PC",
     .init = pc_init_isa,
     .max_cpus = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         {
             .driver   = "pc-sysfw",
@@ -637,6 +667,9 @@ static QEMUMachine xenfv_machine = {
     .desc = "Xen Fully-virtualized PC",
     .init = pc_xen_hvm_init,
     .max_cpus = HVM_MAX_VCPUS,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .default_machine_opts = "accel=xen",
 };
 #endif
diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index dced648..7703d54 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -148,6 +148,9 @@ static QEMUMachine petalogix_ml605_machine = {
     .name = "petalogix-ml605",
     .desc = "PetaLogix linux refdesign for xilinx ml605 little endian",
     .init = petalogix_ml605_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 0
 };
 
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 2cf6882..d534c07 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1
 };
 
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 476775d..8c5af01 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 /*****************************************************************************/
@@ -652,6 +655,9 @@ static QEMUMachine taihu_machine = {
     .name = "taihu",
     .desc = "taihu",
     .init = taihu_405ep_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void ppc405_machine_init(void)
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 0dd4dab..4b9a1e5 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void bamboo_machine_init(void)
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 4e2a6e6..f7197d3 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -423,6 +423,9 @@ static QEMUMachine core99_machine = {
     .desc = "Mac99 based PowerMAC",
     .init = ppc_core99_init,
     .max_cpus = MAX_CPUS,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 #ifdef TARGET_PPC64
     .is_default = 1,
 #endif
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index f2c6908..9f56b73 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -338,6 +338,9 @@ static QEMUMachine heathrow_machine = {
     .desc = "Heathrow based PowerMAC",
     .init = ppc_heathrow_init,
     .max_cpus = MAX_CPUS,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 #ifndef TARGET_PPC64
     .is_default = 1,
 #endif
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index be2b268..d8b3441 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -694,6 +694,9 @@ static QEMUMachine prep_machine = {
     .desc = "PowerPC PREP platform",
     .init = ppc_prep_init,
     .max_cpus = MAX_CPUS,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void prep_machine_init(void)
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index 8b9fd83..1e5801e 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -600,6 +600,9 @@ static QEMUMachine mpc8544ds_machine = {
     .desc = "mpc8544ds",
     .init = mpc8544ds_init,
     .max_cpus = 15,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void mpc8544ds_machine_init(void)
diff --git a/hw/puv3.c b/hw/puv3.c
index 8aad17f..bf03336 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -124,6 +124,9 @@ static QEMUMachine puv3_machine = {
     .name = "puv3",
     .desc = "PKUnity Version-3 based on UniCore32",
     .init = puv3_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
     .use_scsi = 0,
 };
diff --git a/hw/r2d.c b/hw/r2d.c
index 0f16e81..e4812ea 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void r2d_machine_init(void)
diff --git a/hw/realview.c b/hw/realview.c
index 19db4d0..a91f35f 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -383,6 +383,9 @@ static QEMUMachine realview_eb_machine = {
     .desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)",
     .init = realview_eb_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine realview_eb_mpcore_machine = {
@@ -391,12 +394,18 @@ static QEMUMachine realview_eb_mpcore_machine = {
     .init = realview_eb_mpcore_init,
     .use_scsi = 1,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine realview_pb_a8_machine = {
     .name = "realview-pb-a8",
     .desc = "ARM RealView Platform Baseboard for Cortex-A8",
     .init = realview_pb_a8_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine realview_pbx_a9_machine = {
@@ -405,6 +414,9 @@ static QEMUMachine realview_pbx_a9_machine = {
     .init = realview_pbx_a9_init,
     .use_scsi = 1,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void realview_machine_init(void)
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 47eed35..b10fba2 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -334,11 +334,8 @@ static QEMUMachine s390_machine = {
     .alias = "s390",
     .desc = "VirtIO based S390 machine",
     .init = s390_init,
-    .no_cdrom = 1,
-    .no_floppy = 1,
     .no_serial = 1,
     .no_parallel = 1,
-    .no_sdcard = 1,
     .use_virtcon = 1,
     .max_cpus = 255,
     .is_default = 1,
diff --git a/hw/shix.c b/hw/shix.c
index dd9ce17..0f2a7c7 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
diff --git a/hw/spapr.c b/hw/spapr.c
index 81c9343..a744451 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -800,6 +800,9 @@ static QEMUMachine spapr_machine = {
     .max_cpus = MAX_CPUS,
     .no_parallel = 1,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void spapr_machine_init(void)
diff --git a/hw/spitz.c b/hw/spitz.c
index 20e7835..addd1c8 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -976,24 +976,36 @@ static QEMUMachine akitapda_machine = {
     .name = "akita",
     .desc = "Akita PDA (PXA270)",
     .init = akita_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine spitzpda_machine = {
     .name = "spitz",
     .desc = "Spitz PDA (PXA270)",
     .init = spitz_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine borzoipda_machine = {
     .name = "borzoi",
     .desc = "Borzoi PDA (PXA270)",
     .init = borzoi_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine terrierpda_machine = {
     .name = "terrier",
     .desc = "Terrier PDA (PXA270)",
     .init = terrier_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void spitz_machine_init(void)
diff --git a/hw/stellaris.c b/hw/stellaris.c
index 562fbbf..7e65517 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -1378,12 +1378,18 @@ static QEMUMachine lm3s811evb_machine = {
     .name = "lm3s811evb",
     .desc = "Stellaris LM3S811EVB",
     .init = lm3s811evb_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine lm3s6965evb_machine = {
     .name = "lm3s6965evb",
     .desc = "Stellaris LM3S6965EVB",
     .init = lm3s6965evb_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void stellaris_machine_init(void)
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 0f909b5..4d260c1 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -1386,6 +1386,9 @@ static QEMUMachine ss5_machine = {
     .desc = "Sun4m platform, SPARCstation 5",
     .init = ss5_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
@@ -1395,6 +1398,9 @@ static QEMUMachine ss10_machine = {
     .init = ss10_init,
     .use_scsi = 1,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine ss600mp_machine = {
@@ -1403,6 +1409,9 @@ 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 = {
@@ -1411,6 +1420,9 @@ static QEMUMachine ss20_machine = {
     .init = ss20_init,
     .use_scsi = 1,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine voyager_machine = {
@@ -1418,6 +1430,9 @@ static QEMUMachine voyager_machine = {
     .desc = "Sun4m platform, SPARCstation Voyager",
     .init = vger_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine ss_lx_machine = {
@@ -1425,6 +1440,9 @@ static QEMUMachine ss_lx_machine = {
     .desc = "Sun4m platform, SPARCstation LX",
     .init = ss_lx_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine ss4_machine = {
@@ -1432,6 +1450,9 @@ static QEMUMachine ss4_machine = {
     .desc = "Sun4m platform, SPARCstation 4",
     .init = ss4_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine scls_machine = {
@@ -1439,6 +1460,9 @@ static QEMUMachine scls_machine = {
     .desc = "Sun4m platform, SPARCClassic",
     .init = scls_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine sbook_machine = {
@@ -1446,6 +1470,9 @@ static QEMUMachine sbook_machine = {
     .desc = "Sun4m platform, SPARCbook",
     .init = sbook_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static const struct sun4d_hwdef sun4d_hwdefs[] = {
@@ -1664,6 +1691,9 @@ 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 = {
@@ -1672,6 +1702,9 @@ 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[] = {
@@ -1847,6 +1880,9 @@ static QEMUMachine ss2_machine = {
     .desc = "Sun4c platform, SPARCstation 2",
     .init = ss2_init,
     .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 137a7c6..e6d1132 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -963,6 +963,9 @@ static QEMUMachine sun4u_machine = {
     .desc = "Sun4u platform",
     .init = sun4u_init,
     .max_cpus = 1, // XXX for now
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .is_default = 1,
 };
 
@@ -971,6 +974,9 @@ static QEMUMachine sun4v_machine = {
     .desc = "Sun4v platform",
     .init = sun4v_init,
     .max_cpus = 1, // XXX for now
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine niagara_machine = {
@@ -978,6 +984,9 @@ static QEMUMachine niagara_machine = {
     .desc = "Sun4v platform, Niagara",
     .init = niagara_init,
     .max_cpus = 1, // XXX for now
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void sun4u_register_types(void)
diff --git a/hw/tosa.c b/hw/tosa.c
index 297a8c2..59629a2 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -250,6 +250,9 @@ static QEMUMachine tosapda_machine = {
     .name = "tosa",
     .desc = "Tosa PDA (PXA255)",
     .init = tosa_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void tosapda_machine_init(void)
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 4fd5d9b..38c4982 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -369,6 +369,9 @@ static QEMUMachine versatilepb_machine = {
     .desc = "ARM Versatile/PB (ARM926EJ-S)",
     .init = vpb_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine versatileab_machine = {
@@ -376,6 +379,9 @@ static QEMUMachine versatileab_machine = {
     .desc = "ARM Versatile/AB (ARM926EJ-S)",
     .init = vab_init,
     .use_scsi = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void versatile_machine_init(void)
diff --git a/hw/vexpress.c b/hw/vexpress.c
index b615844..3f01654 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -478,6 +478,9 @@ static QEMUMachine vexpress_a9_machine = {
     .init = vexpress_a9_init,
     .use_scsi = 1,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine vexpress_a15_machine = {
@@ -486,6 +489,9 @@ static QEMUMachine vexpress_a15_machine = {
     .init = vexpress_a15_init,
     .use_scsi = 1,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void vexpress_machine_init(void)
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 79bc0d1..a1d71f5 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,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void virtex_machine_init(void)
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 4b72aa7..f3660fa 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -115,6 +115,9 @@ static QEMUMachine xenpv_machine = {
     .desc = "Xen Para-virtualized PC",
     .init = xen_init_pv,
     .max_cpus = 1,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
     .default_machine_opts = "accel=xen",
 };
 
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index 7e6c273..1f16a34 100644
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -146,7 +146,8 @@ static QEMUMachine zynq_machine = {
     .init = zynq_init,
     .use_scsi = 1,
     .max_cpus = 1,
-    .no_sdcard = 1
+    .use_floppy = 1,
+    .use_cdrom = 1,
 };
 
 static void zynq_machine_init(void)
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index 3653f65..7276e08 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -303,6 +303,9 @@ static QEMUMachine xtensa_lx60_machine = {
     .desc = "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
     .init = xtensa_lx60_init,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static QEMUMachine xtensa_lx200_machine = {
@@ -310,6 +313,9 @@ static QEMUMachine xtensa_lx200_machine = {
     .desc = "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
     .init = xtensa_lx200_init,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void xtensa_lx_machines_init(void)
diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 831460b..1b14d1f 100644
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -114,6 +114,9 @@ static QEMUMachine xtensa_sim_machine = {
     .is_default = true,
     .init = xtensa_sim_init,
     .max_cpus = 4,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void xtensa_sim_machine_init(void)
diff --git a/hw/z2.c b/hw/z2.c
index 289cee9..97cf093 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -371,6 +371,9 @@ static QEMUMachine z2_machine = {
     .name = "z2",
     .desc = "Zipit Z2 (PXA27x)",
     .init = z2_init,
+    .use_floppy = 1,
+    .use_cdrom = 1,
+    .use_sdcard = 1,
 };
 
 static void z2_machine_init(void)
diff --git a/vl.c b/vl.c
index d01256a..05b618d 100644
--- a/vl.c
+++ b/vl.c
@@ -3337,13 +3337,13 @@ int main(int argc, char **argv, char **envp)
     if (!machine->use_virtcon) {
         default_virtcon = 0;
     }
-    if (machine->no_floppy) {
+    if (!machine->use_floppy) {
         default_floppy = 0;
     }
-    if (machine->no_cdrom) {
+    if (!machine->use_cdrom) {
         default_cdrom = 0;
     }
-    if (machine->no_sdcard) {
+    if (!machine->use_sdcard) {
         default_sdcard = 0;
     }
 
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 04/27] 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 deletions(-)

diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index 06661e3..836fb41 100644
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -169,9 +169,7 @@ static QEMUMachine clipper_machine = {
     .desc = "Alpha DP264/CLIPPER",
     .init = clipper_init,
     .max_cpus = 4,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1,
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 05/27] 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 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

[Qemu-devel] [PATCH v2 for-1.2 06/27] 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 deletions(-)

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

[Qemu-devel] [PATCH v2 for-1.2 07/27] 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 deletions(-)

diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index b152cc7..66b97a0 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -509,8 +509,6 @@ static QEMUMachine integratorcp_machine = {
     .name = "integratorcp",
     .desc = "ARM Integrator/CP (ARM926EJ-S)",
     .init = integratorcp_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
     .is_default = 1,
 };
diff --git a/hw/realview.c b/hw/realview.c
index a91f35f..1bfacfb 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -383,7 +383,6 @@ static QEMUMachine realview_eb_machine = {
     .desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)",
     .init = realview_eb_init,
     .use_scsi = 1,
-    .use_floppy = 1,
     .use_cdrom = 1,
     .use_sdcard = 1,
 };
@@ -394,7 +393,6 @@ static QEMUMachine realview_eb_mpcore_machine = {
     .init = realview_eb_mpcore_init,
     .use_scsi = 1,
     .max_cpus = 4,
-    .use_floppy = 1,
     .use_cdrom = 1,
     .use_sdcard = 1,
 };
@@ -403,8 +401,6 @@ static QEMUMachine realview_pb_a8_machine = {
     .name = "realview-pb-a8",
     .desc = "ARM RealView Platform Baseboard for Cortex-A8",
     .init = realview_pb_a8_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -414,8 +410,6 @@ static QEMUMachine realview_pbx_a9_machine = {
     .init = realview_pbx_a9_init,
     .use_scsi = 1,
     .max_cpus = 4,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/stellaris.c b/hw/stellaris.c
index 7e65517..5cd863e 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -1378,17 +1378,12 @@ static QEMUMachine lm3s811evb_machine = {
     .name = "lm3s811evb",
     .desc = "Stellaris LM3S811EVB",
     .init = lm3s811evb_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine lm3s6965evb_machine = {
     .name = "lm3s6965evb",
     .desc = "Stellaris LM3S6965EVB",
     .init = lm3s6965evb_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 38c4982..c03dee8 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -369,7 +369,6 @@ static QEMUMachine versatilepb_machine = {
     .desc = "ARM Versatile/PB (ARM926EJ-S)",
     .init = vpb_init,
     .use_scsi = 1,
-    .use_floppy = 1,
     .use_cdrom = 1,
     .use_sdcard = 1,
 };
@@ -379,7 +378,6 @@ static QEMUMachine versatileab_machine = {
     .desc = "ARM Versatile/AB (ARM926EJ-S)",
     .init = vab_init,
     .use_scsi = 1,
-    .use_floppy = 1,
     .use_cdrom = 1,
     .use_sdcard = 1,
 };
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 08/27] 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 deletions(-)

diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index a5d7b85..6643a8e 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -231,8 +231,6 @@ static QEMUMachine sx1_machine_v2 = {
     .name = "sx1",
     .desc = "Siemens SX1 (OMAP310) V2",
     .init = sx1_init_v2,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -240,8 +238,6 @@ static QEMUMachine sx1_machine_v1 = {
     .name = "sx1-v1",
     .desc = "Siemens SX1 (OMAP310) V1",
     .init = sx1_init_v1,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 09/27] 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 deletions(-)

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

[Qemu-devel] [PATCH v2 for-1.2 10/27] 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 deletions(-)

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

[Qemu-devel] [PATCH v2 for-1.2 11/27] 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 deletions(-)

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

[Qemu-devel] [PATCH v2 for-1.2 12/27] 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 deletions(-)

diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index 1f16a34..b532953 100644
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -146,8 +146,6 @@ static QEMUMachine zynq_machine = {
     .init = zynq_init,
     .use_scsi = 1,
     .max_cpus = 1,
-    .use_floppy = 1,
-    .use_cdrom = 1,
 };
 
 static void zynq_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 13/27] 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 deletions(-)

diff --git a/hw/collie.c b/hw/collie.c
index 8c0fecd..56f89a9 100644
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -61,9 +61,6 @@ static QEMUMachine collie_machine = {
     .name = "collie",
     .desc = "Collie PDA (SA-1110)",
     .init = collie_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void collie_machine_init(void)
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 955acfe..9250117 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -127,8 +127,6 @@ static QEMUMachine connex_machine = {
     .name = "connex",
     .desc = "Gumstix Connex (PXA255)",
     .init = connex_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -136,8 +134,6 @@ static QEMUMachine verdex_machine = {
     .name = "verdex",
     .desc = "Gumstix Verdex (PXA270)",
     .init = verdex_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 29b24ac..09d49cb 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -184,8 +184,6 @@ static QEMUMachine mainstone2_machine = {
     .name = "mainstone",
     .desc = "Mainstone II (PXA27x)",
     .init = mainstone_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/tosa.c b/hw/tosa.c
index 59629a2..2973e0a 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -250,8 +250,6 @@ static QEMUMachine tosapda_machine = {
     .name = "tosa",
     .desc = "Tosa PDA (PXA255)",
     .init = tosa_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/vexpress.c b/hw/vexpress.c
index 3f01654..7c0becc 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -478,8 +478,6 @@ static QEMUMachine vexpress_a9_machine = {
     .init = vexpress_a9_init,
     .use_scsi = 1,
     .max_cpus = 4,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
@@ -489,8 +487,6 @@ static QEMUMachine vexpress_a15_machine = {
     .init = vexpress_a15_init,
     .use_scsi = 1,
     .max_cpus = 4,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
diff --git a/hw/z2.c b/hw/z2.c
index 97cf093..f29978d 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -371,8 +371,6 @@ static QEMUMachine z2_machine = {
     .name = "z2",
     .desc = "Zipit Z2 (PXA27x)",
     .init = z2_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 14/27] 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 deletions(-)

diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index 982b921..eab6327 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -353,9 +353,6 @@ static QEMUMachine axisdev88_machine = {
     .name = "axis-dev88",
     .desc = "AXIS devboard 88",
     .init = axisdev88_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1,
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 15/27] 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 deletions(-)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 9374198..593f6b2 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -357,7 +357,6 @@ static QEMUMachine pc_machine_v1_2 = {
     .max_cpus = 255,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1,
 };
 
@@ -387,7 +386,6 @@ static QEMUMachine pc_machine_v1_1 = {
     .max_cpus = 255,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_1_1,
         { /* end of list */ }
@@ -425,7 +423,6 @@ static QEMUMachine pc_machine_v1_0 = {
     .max_cpus = 255,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_1_0,
         { /* end of list */ }
@@ -443,7 +440,6 @@ static QEMUMachine pc_machine_v0_15 = {
     .max_cpus = 255,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_15,
         { /* end of list */ }
@@ -478,7 +474,6 @@ static QEMUMachine pc_machine_v0_14 = {
     .max_cpus = 255,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_14, 
         {
@@ -514,7 +509,6 @@ static QEMUMachine pc_machine_v0_13 = {
     .max_cpus = 255,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_13,
         {
@@ -554,7 +548,6 @@ static QEMUMachine pc_machine_v0_12 = {
     .max_cpus = 255,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_12,
         {
@@ -590,7 +583,6 @@ static QEMUMachine pc_machine_v0_11 = {
     .max_cpus = 255,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_11,
         {
@@ -614,7 +606,6 @@ static QEMUMachine pc_machine_v0_10 = {
     .max_cpus = 255,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         PC_COMPAT_0_11,
         {
@@ -650,7 +641,6 @@ static QEMUMachine isapc_machine = {
     .max_cpus = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .compat_props = (GlobalProperty[]) {
         {
             .driver   = "pc-sysfw",
@@ -669,7 +659,6 @@ static QEMUMachine xenfv_machine = {
     .max_cpus = HVM_MAX_VCPUS,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .default_machine_opts = "accel=xen",
 };
 #endif
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index f3660fa..8baf8dc 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -117,7 +117,6 @@ static QEMUMachine xenpv_machine = {
     .max_cpus = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .default_machine_opts = "accel=xen",
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 16/27] 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 deletions(-)

diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index 3ed984d..b76d800 100644
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -290,9 +290,6 @@ static QEMUMachine lm32_evr_machine = {
     .name = "lm32-evr",
     .desc = "LatticeMico32 EVR32 eval system",
     .init = lm32_evr_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1
 };
 
@@ -300,9 +297,6 @@ static QEMUMachine lm32_uclinux_machine = {
     .name = "lm32-uclinux",
     .desc = "lm32 platform for uClinux and u-boot by Theobroma Systems",
     .init = lm32_uclinux_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 0
 };
 
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 194d3b5..c1aaeab 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -207,8 +207,6 @@ static QEMUMachine milkymist_machine = {
     .name = "milkymist",
     .desc = "Milkymist One",
     .init = milkymist_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
     .use_sdcard = 1,
     .is_default = 0
 };
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 17/27] 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 deletions(-)

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

[Qemu-devel] [PATCH v2 for-1.2 18/27] 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 deletions(-)

diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 7703d54..dced648 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -148,9 +148,6 @@ static QEMUMachine petalogix_ml605_machine = {
     .name = "petalogix-ml605",
     .desc = "PetaLogix linux refdesign for xilinx ml605 little endian",
     .init = petalogix_ml605_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 0
 };
 
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index d534c07..2cf6882 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -117,9 +117,6 @@ static QEMUMachine petalogix_s3adsp1800_machine = {
     .name = "petalogix-s3adsp1800",
     .desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800",
     .init = petalogix_s3adsp1800_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 19/27] 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 deletions(-)

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 0e203cb..d5dffb6 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -328,7 +328,6 @@ static QEMUMachine mips_magnum_machine = {
     .use_scsi = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine mips_pica61_machine = {
@@ -338,7 +337,6 @@ static QEMUMachine mips_pica61_machine = {
     .use_scsi = 1,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void mips_jazz_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 20/27] 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 deletions(-)

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index f86d977..7a9acfd 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -1021,7 +1021,6 @@ static QEMUMachine mips_malta_machine = {
     .max_cpus = 16,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1,
 };
 
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index f7adfdc..ac3ceff 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -299,9 +299,7 @@ static QEMUMachine mips_machine = {
     .name = "mips",
     .desc = "mips r4k platform",
     .init = mips_r4k_init,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void mips_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 21/27] 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 deletions(-)

diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 702ec6a..b1281b2 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -396,9 +396,7 @@ static QEMUMachine mips_fulong2e_machine = {
     .name = "fulong2e",
     .desc = "Fulong 2e mini pc",
     .init = mips_fulong2e_init,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void mips_fulong2e_machine_init(void)
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 8e97790..830f635 100644
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -226,9 +226,6 @@ static QEMUMachine mips_mipssim_machine = {
     .name = "mipssim",
     .desc = "MIPS MIPSsim platform",
     .init = mips_mipssim_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void mips_mipssim_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 22/27] 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 deletions(-)

diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index 2b77846..55e97f0 100644
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -139,9 +139,6 @@ static QEMUMachine openrisc_sim_machine = {
     .desc = "or32 simulation",
     .init = openrisc_sim_init,
     .max_cpus = 1,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1,
 };
 
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 23/27] 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, mpc8544ds, pseries, virtex-ml507.

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

Suppress default SD card drive for machines ref405ep, taihu, bamboo,
mac99, g3beige, prep, mpc8544ds, pseries, 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/ppce500_mpc8544ds.c | 3 ---
 hw/spapr.c             | 2 --
 hw/virtex_ml507.c      | 3 ---
 8 files changed, 22 deletions(-)

diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 8c5af01..476775d 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -363,9 +363,6 @@ static QEMUMachine ref405ep_machine = {
     .name = "ref405ep",
     .desc = "ref405ep",
     .init = ref405ep_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 /*****************************************************************************/
@@ -655,9 +652,6 @@ static QEMUMachine taihu_machine = {
     .name = "taihu",
     .desc = "taihu",
     .init = taihu_405ep_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void ppc405_machine_init(void)
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 4b9a1e5..0dd4dab 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -294,9 +294,6 @@ static QEMUMachine bamboo_machine = {
     .name = "bamboo",
     .desc = "bamboo",
     .init = bamboo_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void bamboo_machine_init(void)
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index f7197d3..58158c3 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -423,9 +423,7 @@ static QEMUMachine core99_machine = {
     .desc = "Mac99 based PowerMAC",
     .init = ppc_core99_init,
     .max_cpus = MAX_CPUS,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 #ifdef TARGET_PPC64
     .is_default = 1,
 #endif
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 9f56b73..66b020d 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -338,9 +338,7 @@ static QEMUMachine heathrow_machine = {
     .desc = "Heathrow based PowerMAC",
     .init = ppc_heathrow_init,
     .max_cpus = MAX_CPUS,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 #ifndef TARGET_PPC64
     .is_default = 1,
 #endif
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index d8b3441..350849a 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -696,7 +696,6 @@ static QEMUMachine prep_machine = {
     .max_cpus = MAX_CPUS,
     .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void prep_machine_init(void)
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index 1e5801e..8b9fd83 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -600,9 +600,6 @@ static QEMUMachine mpc8544ds_machine = {
     .desc = "mpc8544ds",
     .init = mpc8544ds_init,
     .max_cpus = 15,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void mpc8544ds_machine_init(void)
diff --git a/hw/spapr.c b/hw/spapr.c
index a744451..8e5a9b9 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -800,9 +800,7 @@ static QEMUMachine spapr_machine = {
     .max_cpus = MAX_CPUS,
     .no_parallel = 1,
     .use_scsi = 1,
-    .use_floppy = 1,
     .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void spapr_machine_init(void)
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index a1d71f5..79bc0d1 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -264,9 +264,6 @@ static QEMUMachine virtex_machine = {
     .name = "virtex-ml507",
     .desc = "Xilinx Virtex ML507 reference design",
     .init = virtex_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void virtex_machine_init(void)
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 24/27] 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 deletions(-)

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

[Qemu-devel] [PATCH v2 for-1.2 25/27] 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 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

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

[Markus Armbruster]

Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>

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

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

diff --git a/hw/puv3.c b/hw/puv3.c
index bf03336..8aad17f 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -124,9 +124,6 @@ static QEMUMachine puv3_machine = {
     .name = "puv3",
     .desc = "PKUnity Version-3 based on UniCore32",
     .init = puv3_init,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
     .is_default = 1,
     .use_scsi = 0,
 };
-- 
1.7.11.2

[Qemu-devel] [PATCH v2 for-1.2 27/27] 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 deletions(-)

diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index 7276e08..3653f65 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -303,9 +303,6 @@ static QEMUMachine xtensa_lx60_machine = {
     .desc = "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
     .init = xtensa_lx60_init,
     .max_cpus = 4,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static QEMUMachine xtensa_lx200_machine = {
@@ -313,9 +310,6 @@ static QEMUMachine xtensa_lx200_machine = {
     .desc = "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
     .init = xtensa_lx200_init,
     .max_cpus = 4,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void xtensa_lx_machines_init(void)
diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 1b14d1f..831460b 100644
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -114,9 +114,6 @@ static QEMUMachine xtensa_sim_machine = {
     .is_default = true,
     .init = xtensa_sim_init,
     .max_cpus = 4,
-    .use_floppy = 1,
-    .use_cdrom = 1,
-    .use_sdcard = 1,
 };
 
 static void xtensa_sim_machine_init(void)
-- 
1.7.11.2

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

[Alexander Graf]

On 15.08.2012, at 21:17, Markus Armbruster 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.
> 
> I split this into parts that share target and maintainer for review.
> 
> 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: Guan Xuetao <gxt@mprc.pku.edu.cn>
> 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
> 
> v2:
>  Make default drives opt-in instead of opt-out for boards (Andreas)
>  Cover new target unicore32
>  Bonus fix for unicore32 -M puv3 without -kernel
>  Cover mpc8544ds, pseries (missed in v1)

Nack from my POV. Too late for 1.2. Better get this in early for 1.3.


Alex

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

[Peter Maydell]

On 15 August 2012 20:25, Alexander Graf <agraf@suse.de> wrote:
> On 15.08.2012, at 21:17, Markus Armbruster 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.

>> v2:
>>  Make default drives opt-in instead of opt-out for boards (Andreas)
>>  Cover new target unicore32
>>  Bonus fix for unicore32 -M puv3 without -kernel
>>  Cover mpc8544ds, pseries (missed in v1)
>
> Nack from my POV. Too late for 1.2. Better get this in early for 1.3.

Agree. I also think we should follow up Paul Brook's suggestion
that we don't need to have any kind of "default sd card" flag
at all. Floppy is weird because we don't properly separate out
the drive and the controller, right? Not sure about cdrom...

-- PMM

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

[Anthony Liguori]

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

> On 15 August 2012 20:25, Alexander Graf <agraf@suse.de> wrote:
>> On 15.08.2012, at 21:17, Markus Armbruster 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.
>
>>> v2:
>>>  Make default drives opt-in instead of opt-out for boards (Andreas)
>>>  Cover new target unicore32
>>>  Bonus fix for unicore32 -M puv3 without -kernel
>>>  Cover mpc8544ds, pseries (missed in v1)
>>
>> Nack from my POV. Too late for 1.2. Better get this in early for 1.3.

No, it's not too late for 1.2.

The release process is pretty clear.  Major features needed to be posted
before August 1st.  The late to get non-bug fixes in is today.

This is not a major feature but more importantly, has gone through a few
revisions and has gotten positive review comments.

So let's not just go around declaring things as being "too late".  If
something needs more review or hasn't gotten adequate review, it's
perfectly acceptable to point that out.  But please don't just Nack and
say it's too late.

> Agree. I also think we should follow up Paul Brook's suggestion
> that we don't need to have any kind of "default sd card" flag
> at all. Floppy is weird because we don't properly separate out
> the drive and the controller, right? Not sure about cdrom...

This is a valid critique and suggests that more review is needed.
Given that, I won't pick this up today.  But let's not throw around
Nacks without justification.

Regards,

Anthony Liguori

>
> -- PMM

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

[Alexander Graf]

Am 15.08.2012 um 21:58 schrieb Anthony Liguori <anthony@codemonkey.ws>:

> Peter Maydell <peter.maydell@linaro.org> writes:
> 
>> On 15 August 2012 20:25, Alexander Graf <agraf@suse.de> wrote:
>>> On 15.08.2012, at 21:17, Markus Armbruster 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.
>> 
>>>> v2:
>>>> Make default drives opt-in instead of opt-out for boards (Andreas)
>>>> Cover new target unicore32
>>>> Bonus fix for unicore32 -M puv3 without -kernel
>>>> Cover mpc8544ds, pseries (missed in v1)
>>> 
>>> Nack from my POV. Too late for 1.2. Better get this in early for 1.3.
> 
> No, it's not too late for 1.2.
> 
> The release process is pretty clear.  Major features needed to be posted
> before August 1st.  The late to get non-bug fixes in is today.
> 
> This is not a major feature but more importantly, has gone through a few
> revisions and has gotten positive review comments.
> 
> So let's not just go around declaring things as being "too late".  If
> something needs more review or hasn't gotten adequate review, it's
> perfectly acceptable to point that out.  But please don't just Nack and
> say it's too late.
> 
>> Agree. I also think we should follow up Paul Brook's suggestion
>> that we don't need to have any kind of "default sd card" flag
>> at all. Floppy is weird because we don't properly separate out
>> the drive and the controller, right? Not sure about cdrom...
> 
> This is a valid critique and suggests that more review is needed.
> Given that, I won't pick this up today.  But let's not throw around
> Nacks without justification.

Look at the number of board it touches. I don't want to have a change as big as that (all it takes is a typo to screw up) in just before we start a short rc phase. Especially since this patch set doesn't fix any bug I'm aware of or introduces major user visible improvement.


Alex

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

[Markus Armbruster]

Anthony Liguori <anthony@codemonkey.ws> writes:

> Peter Maydell <peter.maydell@linaro.org> writes:
>
>> On 15 August 2012 20:25, Alexander Graf <agraf@suse.de> wrote:
>>> On 15.08.2012, at 21:17, Markus Armbruster 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.
>>
>>>> v2:
>>>>  Make default drives opt-in instead of opt-out for boards (Andreas)
>>>>  Cover new target unicore32
>>>>  Bonus fix for unicore32 -M puv3 without -kernel
>>>>  Cover mpc8544ds, pseries (missed in v1)
>>>
>>> Nack from my POV. Too late for 1.2. Better get this in early for 1.3.

What's the risk?

For the record, I tested every single machine to make sure it still gets
default drives for any drive it uses.

> No, it's not too late for 1.2.
>
> The release process is pretty clear.  Major features needed to be posted
> before August 1st.  The late to get non-bug fixes in is today.
>
> This is not a major feature but more importantly, has gone through a few
> revisions and has gotten positive review comments.
>
> So let's not just go around declaring things as being "too late".  If
> something needs more review or hasn't gotten adequate review, it's
> perfectly acceptable to point that out.  But please don't just Nack and
> say it's too late.
>
>> Agree. I also think we should follow up Paul Brook's suggestion
>> that we don't need to have any kind of "default sd card" flag
>> at all. Floppy is weird because we don't properly separate out
>> the drive and the controller, right? Not sure about cdrom...
>
> This is a valid critique and suggests that more review is needed.
> Given that, I won't pick this up today.  But let's not throw around
> Nacks without justification.

Paul's idea is worth pursuing.  But I don't think we should reject a
improvement we can have now just we can imagine an even nicer
improvement we may have some day.  Taking the former now doesn't make
the latter any harder.

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

[Peter Maydell]

On 15 August 2012 20:58, Anthony Liguori <anthony@codemonkey.ws> wrote:
> Peter Maydell <peter.maydell@linaro.org> writes:
>> On 15 August 2012 20:25, Alexander Graf <agraf@suse.de> wrote:
>>> Nack from my POV. Too late for 1.2. Better get this in early for 1.3.
>
> No, it's not too late for 1.2.
>
> The release process is pretty clear.  Major features needed to be posted
> before August 1st.  The late to get non-bug fixes in is today.

Yes. I don't think that means "it's OK to send out a patchset that
isn't just doing cosmetic fixes to a generally OK previous version
on the day of feature freeze and expect that people will have time
to review it".

Basically, if this wasn't freeze day I'd expect a patchseries like this
to sit on the list for at least three days or so for review. Saying "nack"
here is a stake in the ground to say "this shouldn't be committed just
because it happens to be freeze day today".

> This is not a major feature but more importantly, has gone through a few
> revisions and has gotten positive review comments.

Anything touching 50 files is "major feature" IMHO, and the first
version of this patchset went out just 6 days ago.

Short rc phases only work if people are reasonably sensible about
not putting in enormous numbers of patches right at the freeze
deadline, IMHO. This patchset doesn't meet the "value obtained
for amount of disruption / quality of review" bar for me, is all.

-- PMM

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

[Anthony Liguori]

Markus Armbruster <armbru@redhat.com> writes:

> Anthony Liguori <anthony@codemonkey.ws> writes:
>
>> Peter Maydell <peter.maydell@linaro.org> writes:
>>
>>> On 15 August 2012 20:25, Alexander Graf <agraf@suse.de> wrote:
>>>> On 15.08.2012, at 21:17, Markus Armbruster 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.
>>>
>>>>> v2:
>>>>>  Make default drives opt-in instead of opt-out for boards (Andreas)
>>>>>  Cover new target unicore32
>>>>>  Bonus fix for unicore32 -M puv3 without -kernel
>>>>>  Cover mpc8544ds, pseries (missed in v1)
>>>>
>>>> Nack from my POV. Too late for 1.2. Better get this in early for 1.3.
>
> What's the risk?
>
> For the record, I tested every single machine to make sure it still gets
> default drives for any drive it uses.
>
>> No, it's not too late for 1.2.
>>
>> The release process is pretty clear.  Major features needed to be posted
>> before August 1st.  The late to get non-bug fixes in is today.
>>
>> This is not a major feature but more importantly, has gone through a few
>> revisions and has gotten positive review comments.
>>
>> So let's not just go around declaring things as being "too late".  If
>> something needs more review or hasn't gotten adequate review, it's
>> perfectly acceptable to point that out.  But please don't just Nack and
>> say it's too late.
>>
>>> Agree. I also think we should follow up Paul Brook's suggestion
>>> that we don't need to have any kind of "default sd card" flag
>>> at all. Floppy is weird because we don't properly separate out
>>> the drive and the controller, right? Not sure about cdrom...
>>
>> This is a valid critique and suggests that more review is needed.
>> Given that, I won't pick this up today.  But let's not throw around
>> Nacks without justification.
>
> Paul's idea is worth pursuing.  But I don't think we should reject a
> improvement we can have now just we can imagine an even nicer
> improvement we may have some day.  Taking the former now doesn't make
> the latter any harder.

If doing it a different way means touching 50 files again, then it's
best not to rush into that.  There is something to be said to for
avoiding unnecessary churn.

Regards,

Anthony Liguori

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

[Anthony Liguori]

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

> On 15 August 2012 20:58, Anthony Liguori <anthony@codemonkey.ws> wrote:
>> Peter Maydell <peter.maydell@linaro.org> writes:
>>> On 15 August 2012 20:25, Alexander Graf <agraf@suse.de> wrote:
>>>> Nack from my POV. Too late for 1.2. Better get this in early for 1.3.
>>
>> No, it's not too late for 1.2.
>>
>> The release process is pretty clear.  Major features needed to be posted
>> before August 1st.  The late to get non-bug fixes in is today.
>
> Yes. I don't think that means "it's OK to send out a patchset that
> isn't just doing cosmetic fixes to a generally OK previous version
> on the day of feature freeze and expect that people will have time
> to review it".
>
> Basically, if this wasn't freeze day I'd expect a patchseries like this
> to sit on the list for at least three days or so for review.
>
>> This is not a major feature but more importantly, has gone through a few
>> revisions and has gotten positive review comments.
>
> Anything touching 50 files is "major feature" IMHO, and the first
> version of this patchset went out just 6 days ago.
>
> Short rc phases only work if people are reasonably sensible about
> not putting in enormous numbers of patches right at the freeze
> deadline, IMHO. This patchset doesn't meet the "value obtained
> for amount of disruption / quality of review" bar for me, is all.

http://ozlabs.org/~rusty/index.cgi/tech/2007-05-04.html

It's not that I disagree with you.  I think this is good feedback for a
series like this.

I just don't want people sending out single sentence "Nack" emails for
patch series just because we're at the end of the release cycle.  It
sets the wrong tone IMHO.

Regards,

Anthony Liguori

>
> -- PMM

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

[Peter Maydell]

On 15 August 2012 21:57, Anthony Liguori <anthony@codemonkey.ws> wrote:
> http://ozlabs.org/~rusty/index.cgi/tech/2007-05-04.html
>
> It's not that I disagree with you.  I think this is good feedback for a
> series like this.
>
> I just don't want people sending out single sentence "Nack" emails for
> patch series just because we're at the end of the release cycle.  It
> sets the wrong tone IMHO.

Yeah, I think you and Rusty are right; I'll try to keep my use of 'nak'
down in future...

-- PMM

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

[Markus Armbruster]

Anthony Liguori <anthony@codemonkey.ws> writes:

> Markus Armbruster <armbru@redhat.com> writes:
>
>> Anthony Liguori <anthony@codemonkey.ws> writes:
>>
>>> Peter Maydell <peter.maydell@linaro.org> writes:
>>>
>>>> On 15 August 2012 20:25, Alexander Graf <agraf@suse.de> wrote:
>>>>> On 15.08.2012, at 21:17, Markus Armbruster 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.
>>>>
>>>>>> v2:
>>>>>>  Make default drives opt-in instead of opt-out for boards (Andreas)
>>>>>>  Cover new target unicore32
>>>>>>  Bonus fix for unicore32 -M puv3 without -kernel
>>>>>>  Cover mpc8544ds, pseries (missed in v1)
>>>>>
>>>>> Nack from my POV. Too late for 1.2. Better get this in early for 1.3.
>>
>> What's the risk?
>>
>> For the record, I tested every single machine to make sure it still gets
>> default drives for any drive it uses.
>>
>>> No, it's not too late for 1.2.
>>>
>>> The release process is pretty clear.  Major features needed to be posted
>>> before August 1st.  The late to get non-bug fixes in is today.
>>>
>>> This is not a major feature but more importantly, has gone through a few
>>> revisions and has gotten positive review comments.
>>>
>>> So let's not just go around declaring things as being "too late".  If
>>> something needs more review or hasn't gotten adequate review, it's
>>> perfectly acceptable to point that out.  But please don't just Nack and
>>> say it's too late.
>>>
>>>> Agree. I also think we should follow up Paul Brook's suggestion
>>>> that we don't need to have any kind of "default sd card" flag
>>>> at all. Floppy is weird because we don't properly separate out
>>>> the drive and the controller, right? Not sure about cdrom...
>>>
>>> This is a valid critique and suggests that more review is needed.
>>> Given that, I won't pick this up today.  But let's not throw around
>>> Nacks without justification.
>>
>> Paul's idea is worth pursuing.  But I don't think we should reject a
>> improvement we can have now just we can imagine an even nicer
>> improvement we may have some day.  Taking the former now doesn't make
>> the latter any harder.
>
> If doing it a different way means touching 50 files again, then it's
> best not to rush into that.  There is something to be said to for
> avoiding unnecessary churn.

Three cases:

1. Reject my small improvement now, take the nicer improvement later.

2. Take the small improvement now, take the nicer improvement later.
The latter has to remove 94 lines ".no_FOO = 1" it wouldn't have to in
case 1.  BFD.

3. Reject the small improvement now, nicer improvement fails to
materialize.  

I think you're exaggerating the 2's drawback and ignoring 3's.

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

[Markus Armbruster]

Markus Armbruster <armbru@redhat.com> writes:

> Anthony Liguori <anthony@codemonkey.ws> writes:
>
>> Markus Armbruster <armbru@redhat.com> writes:
>>
>>> Anthony Liguori <anthony@codemonkey.ws> writes:
>>>
>>>> Peter Maydell <peter.maydell@linaro.org> writes:
>>>>
>>>>> On 15 August 2012 20:25, Alexander Graf <agraf@suse.de> wrote:
>>>>>> On 15.08.2012, at 21:17, Markus Armbruster 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.
>>>>>
>>>>>>> v2:
>>>>>>>  Make default drives opt-in instead of opt-out for boards (Andreas)
>>>>>>>  Cover new target unicore32
>>>>>>>  Bonus fix for unicore32 -M puv3 without -kernel
>>>>>>>  Cover mpc8544ds, pseries (missed in v1)
>>>>>>
>>>>>> Nack from my POV. Too late for 1.2. Better get this in early for 1.3.
>>>
>>> What's the risk?
>>>
>>> For the record, I tested every single machine to make sure it still gets
>>> default drives for any drive it uses.
>>>
>>>> No, it's not too late for 1.2.
>>>>
>>>> The release process is pretty clear.  Major features needed to be posted
>>>> before August 1st.  The late to get non-bug fixes in is today.
>>>>
>>>> This is not a major feature but more importantly, has gone through a few
>>>> revisions and has gotten positive review comments.
>>>>
>>>> So let's not just go around declaring things as being "too late".  If
>>>> something needs more review or hasn't gotten adequate review, it's
>>>> perfectly acceptable to point that out.  But please don't just Nack and
>>>> say it's too late.
>>>>
>>>>> Agree. I also think we should follow up Paul Brook's suggestion
>>>>> that we don't need to have any kind of "default sd card" flag
>>>>> at all. Floppy is weird because we don't properly separate out
>>>>> the drive and the controller, right? Not sure about cdrom...
>>>>
>>>> This is a valid critique and suggests that more review is needed.
>>>> Given that, I won't pick this up today.  But let's not throw around
>>>> Nacks without justification.
>>>
>>> Paul's idea is worth pursuing.  But I don't think we should reject a
>>> improvement we can have now just we can imagine an even nicer
>>> improvement we may have some day.  Taking the former now doesn't make
>>> the latter any harder.
>>
>> If doing it a different way means touching 50 files again, then it's
>> best not to rush into that.  There is something to be said to for
>> avoiding unnecessary churn.
>
> Three cases:
>
> 1. Reject my small improvement now, take the nicer improvement later.
>
> 2. Take the small improvement now, take the nicer improvement later.
> The latter has to remove 94 lines ".no_FOO = 1" it wouldn't have to in
> case 1.  BFD.
>
> 3. Reject the small improvement now, nicer improvement fails to
> materialize.  
>
> I think you're exaggerating the 2's drawback and ignoring 3's.

PS: By "now" I mean "before this series bit-rots", not "in time for
1.2".

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

[Peter Maydell]

On 15 August 2012 20:36, Peter Maydell <peter.maydell@linaro.org> wrote:
> I also think we should follow up Paul Brook's suggestion
> that we don't need to have any kind of "default sd card" flag
> at all. Floppy is weird because we don't properly separate out
> the drive and the controller, right? Not sure about cdrom...

So I looked at the IF_SD users, which fall into two categories:

(1) ssi-sd.c, pl181.c, milkymist-memcard.c
These are all SD controller models, which in init do something
along the lines of
    dinfo = drive_get_next(IF_SD);
    s->card = sd_init(dinfo ? dinfo->bdrv : NULL, 0);
so they correctly handle there being no drive provided by
the user (sd_init() treats NULL bdrv as like "no card present").

(2) omap1.c, omap2.c, pxa2xx.c
These are board models, which do:
    dinfo = drive_get(IF_SD, 0, 0);
    if (!dinfo) {
        fprintf(stderr, "qemu: missing SecureDigital device\n");
        exit(1);
    }
    s->mmc = pxa2xx_mmci_init(address_space, 0x41100000, dinfo->bdrv,
                    qdev_get_gpio_in(s->pic, PXA2XX_PIC_MMC),
                    qdev_get_gpio_in(s->dma, PXA2XX_RX_RQ_MMCI),
                    qdev_get_gpio_in(s->dma, PXA2XX_TX_RQ_MMCI));

ie they do the drive_get themselves and pass the bdrv to the
MMC/SD controller model, which assumes it's not NULL.

So we should convert the case (2) systems to behave like (1)
and then we can drop the creation of a "default" sd card.

-- PMM

Re: [Qemu-devel] [PATCH v2 for-1.2 18/27] microblaze: Suppress unused default drives

[Peter Crosthwaite]

On Thu, Aug 16, 2012 at 5:17 AM, Markus Armbruster <armbru@redhat.com> wrote:
> 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>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@petalogix.com>
> ---
>  hw/petalogix_ml605_mmu.c      | 3 ---
>  hw/petalogix_s3adsp1800_mmu.c | 3 ---
>  2 files changed, 6 deletions(-)
>
> diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
> index 7703d54..dced648 100644
> --- a/hw/petalogix_ml605_mmu.c
> +++ b/hw/petalogix_ml605_mmu.c
> @@ -148,9 +148,6 @@ static QEMUMachine petalogix_ml605_machine = {
>      .name = "petalogix-ml605",
>      .desc = "PetaLogix linux refdesign for xilinx ml605 little endian",
>      .init = petalogix_ml605_init,
> -    .use_floppy = 1,
> -    .use_cdrom = 1,
> -    .use_sdcard = 1,
>      .is_default = 0
>  };
>
> diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
> index d534c07..2cf6882 100644
> --- a/hw/petalogix_s3adsp1800_mmu.c
> +++ b/hw/petalogix_s3adsp1800_mmu.c
> @@ -117,9 +117,6 @@ static QEMUMachine petalogix_s3adsp1800_machine = {
>      .name = "petalogix-s3adsp1800",
>      .desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800",
>      .init = petalogix_s3adsp1800_init,
> -    .use_floppy = 1,
> -    .use_cdrom = 1,
> -    .use_sdcard = 1,
>      .is_default = 1
>  };
>
> --
> 1.7.11.2
>

Re: [Qemu-devel] [PATCH v2 for-1.2 12/27] xilinx-zynq: Suppress unused default drives

[Peter Crosthwaite]

On Thu, Aug 16, 2012 at 5:17 AM, Markus Armbruster <armbru@redhat.com> wrote:
> 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>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@petalogix.com>
> ---
>  hw/xilinx_zynq.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
> index 1f16a34..b532953 100644
> --- a/hw/xilinx_zynq.c
> +++ b/hw/xilinx_zynq.c
> @@ -146,8 +146,6 @@ static QEMUMachine zynq_machine = {
>      .init = zynq_init,
>      .use_scsi = 1,
>      .max_cpus = 1,
> -    .use_floppy = 1,
> -    .use_cdrom = 1,
>  };
>
>  static void zynq_machine_init(void)
> --
> 1.7.11.2
>