From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmLPP-0002Qa-PE for qemu-devel@nongnu.org; Wed, 04 Jul 2012 04:58:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmLPI-0003Fp-Ns for qemu-devel@nongnu.org; Wed, 04 Jul 2012 04:58:03 -0400 Received: from mail-gh0-f173.google.com ([209.85.160.173]:63604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmLPI-0003FU-Gu for qemu-devel@nongnu.org; Wed, 04 Jul 2012 04:57:56 -0400 Received: by ghrr14 with SMTP id r14so6695930ghr.4 for ; Wed, 04 Jul 2012 01:57:53 -0700 (PDT) From: Wanpeng Li Date: Wed, 4 Jul 2012 16:56:43 +0800 Message-Id: <1341392203-15766-1-git-send-email-liwp.linux@gmail.com> Subject: [Qemu-devel] [PATCH] cleanup pc_vga_init function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Wanpeng Li , qemu-devel@nongnu.org From: Wanpeng Li Since function pc_vga_init doesn't need to return DeviceState any more, just cleanup. Signed-off-by: Wanpneg Li --- hw/pc.c | 18 +++++++----------- hw/pc.h | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index c7e9ab3..f387448 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1037,39 +1037,35 @@ qemu_irq *pc_allocate_cpu_irq(void) return qemu_allocate_irqs(pic_irq_request, NULL, 1); } -DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) +void pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) { - DeviceState *dev = NULL; - if (cirrus_vga_enabled) { if (pci_bus) { - dev = pci_cirrus_vga_init(pci_bus); + pci_cirrus_vga_init(pci_bus); } else { - dev = &isa_create_simple(isa_bus, "isa-cirrus-vga")->qdev; + isa_create_simple(isa_bus, "isa-cirrus-vga"); } } else if (vmsvga_enabled) { if (pci_bus) { - dev = pci_vmsvga_init(pci_bus); + pci_vmsvga_init(pci_bus); } else { fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); } #ifdef CONFIG_SPICE } else if (qxl_enabled) { if (pci_bus) { - dev = &pci_create_simple(pci_bus, -1, "qxl-vga")->qdev; + pci_create_simple(pci_bus, -1, "qxl-vga"); } else { fprintf(stderr, "%s: qxl: no PCI bus\n", __FUNCTION__); } #endif } else if (std_vga_enabled) { if (pci_bus) { - dev = pci_vga_init(pci_bus); + pci_vga_init(pci_bus); } else { - dev = isa_vga_init(isa_bus); + isa_vga_init(isa_bus); } } - - return dev; } static void cpu_request_exit(void *opaque, int irq, int level) diff --git a/hw/pc.h b/hw/pc.h index 31ccb6f..616864e 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -115,7 +115,7 @@ void *pc_memory_init(MemoryRegion *system_memory, MemoryRegion *rom_memory, MemoryRegion **ram_memory); qemu_irq *pc_allocate_cpu_irq(void); -DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); +void pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, ISADevice **floppy, -- 1.7.5.4