qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Paul Brook <paul@codesourcery.com>,
	anthony@codemonkey.ws
Subject: [Qemu-devel] [PATCH v2 for-1.2 07/27] integratorcp, realview, stellaris, versatilepb: Suppress unused default drives
Date: Wed, 15 Aug 2012 21:17:20 +0200	[thread overview]
Message-ID: <1345058260-16229-8-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1345058260-16229-1-git-send-email-armbru@redhat.com>

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

  parent reply	other threads:[~2012-08-15 19:17 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-15 19:17 [Qemu-devel] [PATCH v2 for-1.2 00/27] Suppress unused default drives Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 01/27] puv3: Require -kernel Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 02/27] leon mips_fulong2e: Give QEMUMachine internal linkage Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 03/27] hw: Make default drives opt-in instead of opt-out for boards Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 04/27] alpha_dp264: Suppress unused default drives Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 05/27] nseries palm spitz: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 06/27] highbank: " Markus Armbruster
2012-08-15 19:17 ` Markus Armbruster [this message]
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 08/27] omap_sx1: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 09/27] kzm: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 10/27] musicpal: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 11/27] exynos4: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 12/27] xilinx-zynq: " Markus Armbruster
2012-08-17  4:55   ` Peter Crosthwaite
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 13/27] collie gumstix mainstone tosa vexpress z2: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 14/27] axis-dev88: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 15/27] pc xen: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 16/27] lm32: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 17/27] m68k: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 18/27] microblaze: " Markus Armbruster
2012-08-17  4:54   ` Peter Crosthwaite
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 19/27] mips_jazz: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 20/27] mips_malta mips_r4k: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 21/27] mips_fulong2e, mips_mipssim: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 22/27] or32-sim: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 23/27] ppc: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 24/27] sh4: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 25/27] sparc: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 26/27] unicore32: " Markus Armbruster
2012-08-15 19:17 ` [Qemu-devel] [PATCH v2 for-1.2 27/27] xtensa: " Markus Armbruster
2012-08-15 19:25 ` [Qemu-devel] [PATCH v2 for-1.2 00/27] " Alexander Graf
2012-08-15 19:36   ` Peter Maydell
2012-08-15 19:58     ` Anthony Liguori
2012-08-15 20:11       ` Alexander Graf
2012-08-15 20:30       ` Markus Armbruster
2012-08-15 20:48         ` Anthony Liguori
2012-08-15 21:31           ` Markus Armbruster
2012-08-15 21:34             ` Markus Armbruster
2012-08-15 20:31       ` Peter Maydell
2012-08-15 20:57         ` Anthony Liguori
2012-08-15 21:04           ` Peter Maydell
2012-08-16 12:01     ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345058260-16229-8-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=paul@codesourcery.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).