From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3DZh-0002bm-P3 for qemu-devel@nongnu.org; Fri, 04 Jul 2014 20:11:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X3DZb-0005GJ-KC for qemu-devel@nongnu.org; Fri, 04 Jul 2014 20:11:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3DZb-0005G7-C1 for qemu-devel@nongnu.org; Fri, 04 Jul 2014 20:11:23 -0400 From: Eduardo Habkost Date: Fri, 4 Jul 2014 21:09:48 -0300 Message-Id: <1404519002-10224-22-git-send-email-ehabkost@redhat.com> In-Reply-To: <1404519002-10224-1-git-send-email-ehabkost@redhat.com> References: <1404519002-10224-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC v3 21/35] q35: Use PCMachineClass.pci_enabled field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , "Michael S. Tsirkin" , Alexander Graf , Don Slutz , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Little step towards making the q35 and piix init functions converge, to eliminate duplication. Signed-off-by: Eduardo Habkost --- hw/i386/pc_q35.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 491fee7..d50dd89 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -64,6 +64,8 @@ static bool has_reserved_memory = true; static void pc_q35_init(MachineState *machine) { PCMachineState *pcms = PC_MACHINE(machine); + PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); + bool pci_enabled = pcmc->pci_enabled; ram_addr_t below_4g_mem_size, above_4g_mem_size; Q35PCIHost *q35_host; PCIHostState *phb; @@ -77,7 +79,6 @@ static void pc_q35_init(MachineState *machine) MemoryRegion *ram_memory; GSIState *gsi_state; ISABus *isa_bus; - int pci_enabled = 1; qemu_irq *cpu_irq; qemu_irq *gsi; qemu_irq *i8259; @@ -341,8 +342,10 @@ static void pc_q35_init_1_4(MachineState *machine) static void pc_q35_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + PCMachineClass *pcmc = PC_MACHINE_CLASS(oc); mc->desc = "Standard PC (Q35 + ICH9, 2009)"; mc->hot_add_cpu = pc_hot_add_cpu; + pcmc->pci_enabled = true; } #define TYPE_PC_Q35_MACHINE "pc-q35" TYPE_MACHINE_SUFFIX -- 1.9.3