From patchwork Thu Aug 9 13:31:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 176093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CAB8B2C00E4 for ; Thu, 9 Aug 2012 23:38:13 +1000 (EST) Received: from localhost ([::1]:46808 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzSqi-0003TR-NP for incoming@patchwork.ozlabs.org; Thu, 09 Aug 2012 09:32:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzSpo-0001ax-8g for qemu-devel@nongnu.org; Thu, 09 Aug 2012 09:31:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SzSpm-0001l6-Jf for qemu-devel@nongnu.org; Thu, 09 Aug 2012 09:31:32 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:37591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzSpm-0001jF-8D; Thu, 09 Aug 2012 09:31:30 -0400 Received: from blackfin.pond.sub.org (p5B329920.dip.t-dialin.net [91.50.153.32]) by oxygen.pond.sub.org (Postfix) with ESMTPA id EB976A3E12; Thu, 9 Aug 2012 15:31:26 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 76D892005F; Thu, 9 Aug 2012 15:31:26 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 9 Aug 2012 15:31:21 +0200 Message-Id: <1344519084-21847-21-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344519084-21847-1-git-send-email-armbru@redhat.com> References: <1344519084-21847-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Alexander Graf Subject: [Qemu-devel] [PATCH 20/23] ppc: Suppress unused default drives X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Cc: Alexander Graf Cc: Andreas Färber Cc: qemu-ppc@nongnu.org Suppress default floppy drive for machines ref405ep, taihu, bamboo, mac99, g3beige, virtex-ml507. Suppress default CD-ROM drive for machines ref405ep, taihu, bamboo, virtex-ml507. Suppress default SD card drive for machines ref405ep, taihu, bamboo, mac88, g3beige, prep, virtex-ml507. Signed-off-by: Markus Armbruster --- hw/ppc405_boards.c | 6 ++++++ hw/ppc440_bamboo.c | 3 +++ hw/ppc_newworld.c | 2 ++ hw/ppc_oldworld.c | 2 ++ hw/ppc_prep.c | 1 + hw/virtex_ml507.c | 3 +++ 6 files changed, 17 insertions(+) diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c index 476775d..08f90f1 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc405_boards.c @@ -363,6 +363,9 @@ static QEMUMachine ref405ep_machine = { .name = "ref405ep", .desc = "ref405ep", .init = ref405ep_init, + .no_floppy = 1, + .no_cdrom = 1, + .no_sdcard = 1, }; /*****************************************************************************/ @@ -652,6 +655,9 @@ static QEMUMachine taihu_machine = { .name = "taihu", .desc = "taihu", .init = taihu_405ep_init, + .no_floppy = 1, + .no_cdrom = 1, + .no_sdcard = 1, }; static void ppc405_machine_init(void) diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 0dd4dab..5cb0d35 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -294,6 +294,9 @@ static QEMUMachine bamboo_machine = { .name = "bamboo", .desc = "bamboo", .init = bamboo_init, + .no_floppy = 1, + .no_cdrom = 1, + .no_sdcard = 1, }; static void bamboo_machine_init(void) diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 4e2a6e6..1e41c2b 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -423,6 +423,8 @@ static QEMUMachine core99_machine = { .desc = "Mac99 based PowerMAC", .init = ppc_core99_init, .max_cpus = MAX_CPUS, + .no_floppy = 1, + .no_sdcard = 1, #ifdef TARGET_PPC64 .is_default = 1, #endif diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index f2c6908..bcecc0a 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -338,6 +338,8 @@ static QEMUMachine heathrow_machine = { .desc = "Heathrow based PowerMAC", .init = ppc_heathrow_init, .max_cpus = MAX_CPUS, + .no_floppy = 1, + .no_sdcard = 1, #ifndef TARGET_PPC64 .is_default = 1, #endif diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index be2b268..9393022 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -694,6 +694,7 @@ static QEMUMachine prep_machine = { .desc = "PowerPC PREP platform", .init = ppc_prep_init, .max_cpus = MAX_CPUS, + .no_sdcard = 1, }; static void prep_machine_init(void) diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index 79bc0d1..62b56c0 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c @@ -264,6 +264,9 @@ static QEMUMachine virtex_machine = { .name = "virtex-ml507", .desc = "Xilinx Virtex ML507 reference design", .init = virtex_init, + .no_floppy = 1, + .no_cdrom = 1, + .no_sdcard = 1, }; static void virtex_machine_init(void)