Patchwork [v2] Add an isa device for SGA

login
register
mail settings
Submitter Glauber Costa
Date May 12, 2011, 12:55 p.m.
Message ID <1305204913-13321-1-git-send-email-glommer@redhat.com>
Download mbox | patch
Permalink /patch/95302/
State New
Headers show

Comments

Glauber Costa - May 12, 2011, 12:55 p.m.
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.

[v2: suggestions on qdev by Markus ]

Signed-off-by: Glauber Costa <glommer@redhat.com>
---
 Makefile.target |    2 +-
 hw/pc.c         |    4 ++++
 hw/pc.h         |    3 +++
 hw/sga.c        |   31 +++++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 1 deletions(-)
 create mode 100644 hw/sga.c
Markus Armbruster - May 13, 2011, 8:43 a.m.
Glauber Costa <glommer@redhat.com> writes:

> 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.
>
> [v2: suggestions on qdev by Markus ]

One more question: should "-device sga" suppress the default VGA?  The
other three VGA devices do; check out default_list[] in vl.c.

[...]
> 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);
> +

No longer exists, please drop.

>  /* ne2000.c */
>  static inline bool isa_ne2000_init(int base, int irq, NICInfo *nd)
>  {
[...]
Glauber Costa - May 13, 2011, 1 p.m.
On Fri, May 13, 2011 at 10:43:33AM +0200, Markus Armbruster wrote:
> Glauber Costa <glommer@redhat.com> writes:
> 
> > 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.
> >
> > [v2: suggestions on qdev by Markus ]
> 
> One more question: should "-device sga" suppress the default VGA?  The
> other three VGA devices do; check out default_list[] in vl.c.
No, it should not. This rom is specially designed not to:
It will chain all int10h requests to whatever it was there before.

> 
> [...]
> > 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);
> > +
> 
> No longer exists, please drop.
You're right, my bad.

Anthony, is it needed to send a v3 to take this away, or will you remove manually ?
Brad Hards - May 16, 2011, 8:21 a.m.
On Thu, 12 May 2011 10:55:13 pm Glauber Costa wrote:
> 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.
Perhaps could use documentation changes, especially a reference to the 
location for the ROM image (given that came up as a question on the original 
patch series)

Brad

Patch

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..78bf7de 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1096,6 +1096,10 @@  void pc_vga_init(PCIBus *pci_bus)
             isa_vga_init();
         }
     }
+
+    if (display_type == DT_NOGRAPHIC) {
+        isa_create_simple("sga");
+    }
 }
 
 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..08cef56
--- /dev/null
+++ b/hw/sga.c
@@ -0,0 +1,31 @@ 
+#include "pci.h"
+#include "pc.h"
+#include "loader.h"
+#include "sysemu.h"
+
+#define SGABIOS_FILENAME "sgabios.bin"
+
+typedef struct ISAGAState {
+    ISADevice dev;
+} ISASGAState;
+
+
+static int isa_cirrus_vga_initfn(ISADevice *dev)
+{
+    rom_add_vga(SGABIOS_FILENAME);
+    return 0;
+}
+
+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);