From patchwork Tue Nov 22 01:12:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9440415 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 258B9606DB for ; Tue, 22 Nov 2016 01:30:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A52A28743 for ; Tue, 22 Nov 2016 01:30:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C4E22876B; Tue, 22 Nov 2016 01:30:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6311C28743 for ; Tue, 22 Nov 2016 01:30:39 +0000 (UTC) Received: from localhost ([::1]:52705 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8zuw-0002re-Jq for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Nov 2016 20:30:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8zeK-0005xz-QF for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8zeG-00053i-K8 for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c8zeG-00053C-DY for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:24 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C157C057FAD; Tue, 22 Nov 2016 01:13:23 +0000 (UTC) Received: from localhost (ovpn-116-207.phx2.redhat.com [10.3.116.207]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAM1DLxS009537; Mon, 21 Nov 2016 20:13:22 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org, Markus Armbruster , Marcel Apfelbaum , "Michael S. Tsirkin" Date: Mon, 21 Nov 2016 23:12:11 -0200 Message-Id: <1479777133-23567-14-git-send-email-ehabkost@redhat.com> In-Reply-To: <1479777133-23567-1-git-send-email-ehabkost@redhat.com> References: <1479777133-23567-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 22 Nov 2016 01:13:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC 13/15] mips: Initialize default bus lists X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yongbok Kim , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Populate default_bus_types for some machines. Work in progress, I didn't check if all machines were converted (so we could enable strict mode for mips in qmp-machine-info.py). Cc: Aurelien Jarno Cc: Yongbok Kim Signed-off-by: Eduardo Habkost --- hw/mips/mips_malta.c | 7 +++++++ hw/mips/mips_r4k.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index cf48f42..af25595 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -57,6 +57,7 @@ #include "sysemu/kvm.h" #include "exec/semihost.h" #include "hw/mips/cps.h" +#include "hw/usb.h" //#define DEBUG_BOARD_INIT @@ -1266,6 +1267,12 @@ static void mips_malta_machine_init(MachineClass *mc) mc->init = mips_malta_init; mc->max_cpus = 16; mc->is_default = 1; + machine_class_add_default_bus(mc, "floppy-bus"); //FIXME: use macro + machine_class_add_default_bus(mc, "i2c-bus"); //FIXME: use macro + machine_class_add_default_bus(mc, TYPE_PCI_BUS); + machine_class_add_default_bus(mc, TYPE_ISA_BUS); + machine_class_add_default_bus(mc, "IDE");//FIXME: use macro + machine_class_add_default_bus(mc, TYPE_USB_BUS); } DEFINE_MACHINE("malta", mips_malta_machine_init) diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 27548c4..69ca97a 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -306,6 +306,8 @@ static void mips_machine_init(MachineClass *mc) { mc->desc = "mips r4k platform"; mc->init = mips_r4k_init; + machine_class_add_default_bus(mc, TYPE_ISA_BUS); + machine_class_add_default_bus(mc, "IDE");//FIXME: use macro } DEFINE_MACHINE("mips", mips_machine_init)