From patchwork Wed May 11 17:11:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 777562 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4BHKCpk012397 for ; Wed, 11 May 2011 17:20:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752740Ab1EKRSX (ORCPT ); Wed, 11 May 2011 13:18:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39608 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751535Ab1EKRSD (ORCPT ); Wed, 11 May 2011 13:18:03 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4BHBLxP011496 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 11 May 2011 13:11:21 -0400 Received: from mothafucka.localdomain (ovpn-113-104.phx2.redhat.com [10.3.113.104]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4BHBIHD023697; Wed, 11 May 2011 13:11:19 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: qemu-devel@nongnu.org, avi@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com Subject: [PATCH] Add an isa device for SGA Date: Wed, 11 May 2011 14:11:17 -0300 Message-Id: <1305133877-4163-1-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 11 May 2011 17:20:12 +0000 (UTC) This patch adds a dummy legacy ISA device whose responsibility is to deploy sgabios, an option rom for a serial graphics adapter. The proposal is that this device is always-on when -nographics, but can otherwise be enable in any setup when -device sga is used. Signed-off-by: Glauber Costa --- Makefile.target | 2 +- hw/pc.c | 2 ++ hw/pc.h | 3 +++ hw/sga.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 1 deletions(-) create mode 100644 hw/sga.c diff --git a/Makefile.target b/Makefile.target index fdbdc6c..004ea7e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -224,7 +224,7 @@ obj-$(CONFIG_KVM) += ivshmem.o # Hardware support obj-i386-y += vga.o obj-i386-y += mc146818rtc.o i8259.o pc.o -obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o +obj-i386-y += cirrus_vga.o sga.o apic.o ioapic.o piix_pci.o obj-i386-y += vmport.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += extboot.o diff --git a/hw/pc.c b/hw/pc.c index 8d351ba..56c3887 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1096,6 +1096,8 @@ void pc_vga_init(PCIBus *pci_bus) isa_vga_init(); } } + + isa_sga_init(); } static void cpu_request_exit(void *opaque, int irq, int level) diff --git a/hw/pc.h b/hw/pc.h index 1291e2d..a00e054 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -219,6 +219,9 @@ int isa_vga_mm_init(target_phys_addr_t vram_base, void pci_cirrus_vga_init(PCIBus *bus); void isa_cirrus_vga_init(void); +/* serial graphics */ +void isa_sga_init(void); + /* ne2000.c */ static inline bool isa_ne2000_init(int base, int irq, NICInfo *nd) { diff --git a/hw/sga.c b/hw/sga.c new file mode 100644 index 0000000..411191b --- /dev/null +++ b/hw/sga.c @@ -0,0 +1,49 @@ +#include "pci.h" +#include "pc.h" +#include "loader.h" +#include "sysemu.h" + +#define SGABIOS_FILENAME "sgabios.bin" + +typedef struct ISAGAState { + ISADevice dev; +} ISASGAState; + +/* We can have both -device, and the initfn called, so better + * avoid to have the rom loaded twice */ +static void deploy_rom(void) +{ + static int rom_deployed = 0; + + if (!rom_deployed++) { + rom_add_vga(SGABIOS_FILENAME); + } +} + +static int isa_cirrus_vga_initfn(ISADevice *dev) +{ + deploy_rom(); + + return 0; +} + +void isa_sga_init(void) +{ + if (display_type == DT_NOGRAPHIC) { + deploy_rom(); + } +} + +static ISADeviceInfo sga_info = { + .qdev.name = "sga", + .qdev.desc = "Serial Graphics Adapter", + .qdev.size = sizeof(ISASGAState), + .init = isa_cirrus_vga_initfn, +}; + +static void sga_register(void) +{ + isa_qdev_register(&sga_info); +} + +device_init(sga_register);