[PATCH 1/3] vga: simplify vga builds

[Gerd Hoffmann]

Add a kconfig menu to pick the vga variant, stick the vendorr
and device ids as defaults into Kconfig.

Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
 vgasrc/Kconfig | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/vgasrc/Kconfig b/vgasrc/Kconfig
index 27a24c9..391eecd 100644
--- a/vgasrc/Kconfig
+++ b/vgasrc/Kconfig
@@ -58,6 +58,22 @@ menu "VGA ROM"
     endchoice
 
     choice
+        depends on VGA_BOCHS
+        prompt "bochs vga variant"
+        default VGA_BOCHS_STDVGA
+
+        config VGA_BOCHS_STDVGA
+            bool "qemu stdvga / bochs svga"
+
+        config VGA_BOCHS_VMWARE
+            bool "qemu vmware svga"
+
+        config VGA_BOCHS_QXL
+            bool "qemu qxl vga"
+
+    endchoice
+
+    choice
         depends on VGA_GEODEGX2 || VGA_GEODELX
         prompt "Output Mode"
         default VGA_OUTPUT_CRT
@@ -140,7 +156,9 @@ menu "VGA ROM"
         hex
         prompt "PCI Vendor ID" if OVERRIDE_PCI_ID
         default 0x1013 if VGA_CIRRUS
-        default 0x1234 if VGA_BOCHS
+        default 0x1234 if VGA_BOCHS_STDVGA
+        default 0x15ad if VGA_BOCHS_VMWARE
+        default 0x1b36 if VGA_BOCHS_QXL
         default 0x100b if VGA_GEODEGX2
         default 0x1022 if VGA_GEODELX
         default 0x0000
@@ -152,7 +170,9 @@ menu "VGA ROM"
         hex
         prompt "PCI Vendor ID" if OVERRIDE_PCI_ID
         default 0x00b8 if VGA_CIRRUS
-        default 0x1111 if VGA_BOCHS
+        default 0x1111 if VGA_BOCHS_STDVGA
+        default 0x0405 if VGA_BOCHS_VMWARE
+        default 0x0100 if VGA_BOCHS_QXL
         default 0x0030 if VGA_GEODEGX2
         default 0x2081 if VGA_GEODELX
         default 0x0000
-- 
1.8.3.1

[PATCH 2/3] vga: rework virtio-vga support

[Gerd Hoffmann]

Unlike planned earlier virtio-vga will be compatible with
the qemu stdvga, with the framebuffer in bar 0.  Drop the
virtio-vga chunk, update comment accordingly.

Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
 vgasrc/bochsvga.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index ee6f437..aa82fc5 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -403,10 +403,7 @@ bochsvga_setup(void)
         case 0x15ad: /* qemu vmware vga */
             barid = 1;
             break;
-        case 0x1af4: /* virtio-vga */
-            barid = 2;
-            break;
-        default: /* stdvga, qxl */
+        default: /* stdvga, qxl, virtio */
             barid = 0;
             break;
         }
-- 
1.8.3.1

[PATCH 3/3] vga: add virtio-vga to kconfig

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
 vgasrc/Kconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vgasrc/Kconfig b/vgasrc/Kconfig
index 391eecd..2837f3e 100644
--- a/vgasrc/Kconfig
+++ b/vgasrc/Kconfig
@@ -71,6 +71,9 @@ menu "VGA ROM"
         config VGA_BOCHS_QXL
             bool "qemu qxl vga"
 
+        config VGA_BOCHS_VIRTIO
+            bool "qemu virtio vga"
+
     endchoice
 
     choice
@@ -159,6 +162,7 @@ menu "VGA ROM"
         default 0x1234 if VGA_BOCHS_STDVGA
         default 0x15ad if VGA_BOCHS_VMWARE
         default 0x1b36 if VGA_BOCHS_QXL
+        default 0x1af4 if VGA_BOCHS_VIRTIO
         default 0x100b if VGA_GEODEGX2
         default 0x1022 if VGA_GEODELX
         default 0x0000
@@ -173,6 +177,7 @@ menu "VGA ROM"
         default 0x1111 if VGA_BOCHS_STDVGA
         default 0x0405 if VGA_BOCHS_VMWARE
         default 0x0100 if VGA_BOCHS_QXL
+        default 0x1050 if VGA_BOCHS_VIRTIO
         default 0x0030 if VGA_GEODEGX2
         default 0x2081 if VGA_GEODELX
         default 0x0000
-- 
1.8.3.1

[Kevin O'Connor]

On Wed, Jun 10, 2015 at 01:06:28PM +0200, Gerd Hoffmann wrote:
  Add a kconfig menu to pick the vga variant, stick the
vendorr
 and device ids as defaults into Kconfig.
 
 Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
The series looks good to me.

-Kevin

[Gerd Hoffmann]

On Mi, 2015-06-10 at 10:36 -0400, Kevin O'Connor wrote:
  On Wed, Jun 10, 2015 at 01:06:28PM +0200, Gerd
Hoffmann wrote:
  Add a kconfig menu to pick the vga variant, stick
the vendorr
 and device ids as defaults into Kconfig.
 
 Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
 
 The series looks good to me.
Pushed.

cheers,
  Gerd