From patchwork Fri Nov 25 22:05:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9448185 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 9BA506075F for ; Fri, 25 Nov 2016 22:33:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77A7227FA7 for ; Fri, 25 Nov 2016 22:33:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5983C2808F; Fri, 25 Nov 2016 22:33:44 +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 C00F027FA7 for ; Fri, 25 Nov 2016 22:33:43 +0000 (UTC) Received: from localhost ([::1]:48211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAP3u-0000sZ-T9 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 25 Nov 2016 17:33:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAOdw-0006o6-32 for qemu-devel@nongnu.org; Fri, 25 Nov 2016 17:06:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cAOdu-0000Wd-Tb for qemu-devel@nongnu.org; Fri, 25 Nov 2016 17:06:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cAOdu-0000VI-LI for qemu-devel@nongnu.org; Fri, 25 Nov 2016 17:06:50 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 DADDA90230 for ; Fri, 25 Nov 2016 22:06:49 +0000 (UTC) Received: from localhost (ovpn-116-207.phx2.redhat.com [10.3.116.207]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAPM6m5v005861; Fri, 25 Nov 2016 17:06:49 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org, Markus Armbruster , Marcel Apfelbaum , "Michael S. Tsirkin" Date: Fri, 25 Nov 2016 20:05:56 -0200 Message-Id: <1480111556-32586-21-git-send-email-ehabkost@redhat.com> In-Reply-To: <1480111556-32586-1-git-send-email-ehabkost@redhat.com> References: <1480111556-32586-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 25 Nov 2016 22:06:49 +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 v2 20/20] pc: 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Populate the always_available_buses list for the PC machines. This will allow qmp-machine-info.py to run in strict mode for x86. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Use the new machine_class_add_always_available_bus() function, include bus IDs * Report legacy PCI and PCIe on q35 pcie.0 bus * Make sure legacy PCI is reported on i440fx --- hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 25 +++++++++++++++++++++++++ hw/i386/pc_q35.c | 21 +++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a9e64a8..67e41c1 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2298,6 +2298,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->hot_add_cpu = pc_hot_add_cpu; mc->max_cpus = 255; mc->reset = pc_machine_reset; + machine_class_add_always_available_bus(mc, "sysbus", TYPE_SYSTEM_BUS); hc->pre_plug = pc_machine_device_pre_plug_cb; hc->plug = pc_machine_device_plug_cb; hc->unplug_request = pc_machine_device_unplug_request_cb; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a59bbb9..d0162a9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -430,11 +430,26 @@ static void pc_xen_hvm_init(MachineState *machine) static void pc_i440fx_machine_options(MachineClass *m) { + MachineBusInfo *pci0; + m->family = "pc_piix"; m->desc = "Standard PC (i440FX + PIIX, 1996)"; m->hot_add_cpu = pc_hot_add_cpu; m->default_machine_opts = "firmware=bios-256k.bin"; m->default_display = "std"; + pci0 = machine_class_add_always_available_bus(m, "pci.0", TYPE_PCI_BUS); + + /* Sanity check to ensure we are reporting only legacy PCI devices as supported */ + assert(pci0->accepted_device_types != NULL && + pci0->accepted_device_types->next == NULL && + !strcmp(pci0->accepted_device_types->value, + INTERFACE_LEGACY_PCI_DEVICE)); + + machine_class_add_always_available_bus(m, "floppy-bus.0", "floppy-bus"); //FIXME: use macro + machine_class_add_always_available_bus(m, "i2c", "i2c-bus"); //FIXME: use macro + machine_class_add_always_available_bus(m, "isa.0", TYPE_ISA_BUS); + machine_class_add_always_available_bus(m, "ide.0", "IDE");//FIXME: use macro + machine_class_add_always_available_bus(m, "ide.1", "IDE");//FIXME: use macro } static void pc_i440fx_2_8_machine_options(MachineClass *m) @@ -1083,6 +1098,10 @@ static void isapc_machine_options(MachineClass *m) m->max_cpus = 1; m->option_rom_has_mr = true; m->rom_file_has_mr = false; + machine_class_add_always_available_bus(m, "floppy-bus.0", "floppy-bus"); //FIXME: use macro + machine_class_add_always_available_bus(m, "isa.0", TYPE_ISA_BUS); + machine_class_add_always_available_bus(m, "ide.0", "IDE");//FIXME: use macro + machine_class_add_always_available_bus(m, "ide.1", "IDE");//FIXME: use macro pcmc->pci_enabled = false; pcmc->has_acpi_build = false; pcmc->smbios_defaults = false; @@ -1102,6 +1121,12 @@ static void xenfv_machine_options(MachineClass *m) m->max_cpus = HVM_MAX_VCPUS; m->default_machine_opts = "accel=xen"; m->hot_add_cpu = pc_hot_add_cpu; + machine_class_add_always_available_bus(m, "floppy-bus.0", "floppy-bus"); //FIXME: use macro + machine_class_add_always_available_bus(m, "i2c", "i2c-bus"); //FIXME: use macro + machine_class_add_always_available_bus(m, "pci.0", TYPE_PCI_BUS); + machine_class_add_always_available_bus(m, "isa.0", TYPE_ISA_BUS); + machine_class_add_always_available_bus(m, "ide.0", "IDE");//FIXME: use macro + machine_class_add_always_available_bus(m, "ide.1", "IDE");//FIXME: use macro } DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b40d19e..11f918c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -283,6 +283,9 @@ static void pc_q35_init(MachineState *machine) static void pc_q35_machine_options(MachineClass *m) { + MachineBusInfo *pcie; + strList *new; + m->family = "pc_q35"; m->desc = "Standard PC (Q35 + ICH9, 2009)"; m->hot_add_cpu = pc_hot_add_cpu; @@ -292,6 +295,24 @@ static void pc_q35_machine_options(MachineClass *m) m->no_floppy = 1; m->has_dynamic_sysbus = true; m->max_cpus = 288; + + pcie = machine_class_add_always_available_bus(m, "pcie.0", TYPE_PCIE_BUS); + /* The root bus doesn't use the TYPE_PCIE_BUS default: it also accepts + * legacy PCI devices. + */ + new = g_new0(strList, 1); + new->value = g_strdup(INTERFACE_LEGACY_PCI_DEVICE); + new->next = pcie->accepted_device_types; + pcie->accepted_device_types = new; + + machine_class_add_always_available_bus(m, "i2c", "i2c-bus"); //FIXME: use macro + machine_class_add_always_available_bus(m, "isa.0", TYPE_ISA_BUS); + machine_class_add_always_available_bus(m, "ide.0", "IDE");//FIXME: use macro + machine_class_add_always_available_bus(m, "ide.1", "IDE");//FIXME: use macro + machine_class_add_always_available_bus(m, "ide.2", "IDE");//FIXME: use macro + machine_class_add_always_available_bus(m, "ide.3", "IDE");//FIXME: use macro + machine_class_add_always_available_bus(m, "ide.4", "IDE");//FIXME: use macro + machine_class_add_always_available_bus(m, "ide.5", "IDE");//FIXME: use macro } static void pc_q35_2_8_machine_options(MachineClass *m)