From patchwork Wed Aug 15 19:17:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 177780 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 2244C2C0087 for ; Thu, 16 Aug 2012 05:38:51 +1000 (EST) Received: from localhost ([::1]:41187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1jEl-0000OV-T3 for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 15:26:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1jDz-0006SY-PB for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1jDw-0006R4-OT for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:25:51 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:35670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1jDw-0006OI-Cu for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:25:48 -0400 Received: from blackfin.pond.sub.org (p57B0FBD1.dip.t-dialin.net [87.176.251.209]) by oxygen.pond.sub.org (Postfix) with ESMTPA id A111E9FE59; Wed, 15 Aug 2012 21:25:46 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 79F2A20068; Wed, 15 Aug 2012 21:17:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2012 21:17:38 +0200 Message-Id: <1345058260-16229-26-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1345058260-16229-1-git-send-email-armbru@redhat.com> References: <1345058260-16229-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: Blue Swirl , anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v2 for-1.2 25/27] sparc: 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: Blue Swirl 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 --- 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)