From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8ze8-0005of-Mk for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8ze6-0004yb-KN for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53370) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c8ze6-0004y5-B0 for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:13:14 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 6BA4B85545 for ; Tue, 22 Nov 2016 01:13:13 +0000 (UTC) From: Eduardo Habkost Date: Mon, 21 Nov 2016 23:12:08 -0200 Message-Id: <1479777133-23567-11-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> Subject: [Qemu-devel] [RFC 10/15] pc: Initialize default bus lists List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Markus Armbruster , Marcel Apfelbaum , "Michael S. Tsirkin" Populate the default_bus_types list for the PC machines. This will allow qmp-machine-info.py to run in strict mode for x86. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 13 +++++++++++++ hw/i386/pc_q35.c | 4 ++++ tests/qmp-machine-info.py | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a54a468..055f46a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -435,6 +435,11 @@ static void pc_i440fx_machine_options(MachineClass *m) m->hot_add_cpu = pc_hot_add_cpu; m->default_machine_opts = "firmware=bios-256k.bin"; m->default_display = "std"; + machine_class_add_default_bus(m, "floppy-bus"); //FIXME: use macro + machine_class_add_default_bus(m, "i2c-bus"); //FIXME: use macro + machine_class_add_default_bus(m, TYPE_PCI_BUS); + machine_class_add_default_bus(m, TYPE_ISA_BUS); + machine_class_add_default_bus(m, "IDE");//FIXME: use macro } static void pc_i440fx_2_8_machine_options(MachineClass *m) @@ -1079,6 +1084,9 @@ 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_default_bus(m, "floppy-bus"); //FIXME: use macro + machine_class_add_default_bus(m, TYPE_ISA_BUS); + machine_class_add_default_bus(m, "IDE");//FIXME: use macro pcmc->pci_enabled = false; pcmc->has_acpi_build = false; pcmc->smbios_defaults = false; @@ -1098,6 +1106,11 @@ 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_default_bus(m, "floppy-bus"); //FIXME: use macro + machine_class_add_default_bus(m, "i2c-bus"); //FIXME: use macro + machine_class_add_default_bus(m, TYPE_PCI_BUS); + machine_class_add_default_bus(m, TYPE_ISA_BUS); + machine_class_add_default_bus(m, "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..4602852 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -292,6 +292,10 @@ static void pc_q35_machine_options(MachineClass *m) m->no_floppy = 1; m->has_dynamic_sysbus = true; m->max_cpus = 288; + machine_class_add_default_bus(m, "i2c-bus"); //FIXME: use macro + machine_class_add_default_bus(m, TYPE_PCIE_BUS); + machine_class_add_default_bus(m, TYPE_ISA_BUS); + machine_class_add_default_bus(m, "IDE");//FIXME: use macro } static void pc_q35_2_8_machine_options(MachineClass *m) diff --git a/tests/qmp-machine-info.py b/tests/qmp-machine-info.py index 5258434..a43cd1b 100755 --- a/tests/qmp-machine-info.py +++ b/tests/qmp-machine-info.py @@ -12,7 +12,7 @@ logger = logging.getLogger('qemu.tests.machineinfo') BLACKLIST = set(['xenpv', 'xenfv']) # architectures where machines are expected to report all available buses: -STRICT_ARCHES = set() +STRICT_ARCHES = set(['x86_64', 'i386']) class QueryMachinesTest(unittest.TestCase): def walkQOMTree(self, vm, path): -- 2.7.4