[Qemu-devel] [7228] xen: add -vga xenfb option, configure xenfb (Gerd Hoffmann)

[Anthony Liguori]

Revision: 7228
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7228
Author:   aliguori
Date:     2009-04-22 15:19:53 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
xen: add -vga xenfb option, configure xenfb (Gerd Hoffmann)


Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/hw/xen_machine_pv.c
    trunk/qemu-options.hx
    trunk/sysemu.h
    trunk/vl.c

Modified: trunk/hw/xen_machine_pv.c
===================================================================
--- trunk/hw/xen_machine_pv.c   2009-04-22 15:19:48 UTC (rev 7227)
+++ trunk/hw/xen_machine_pv.c   2009-04-22 15:19:53 UTC (rev 7228)
@@ -82,6 +82,12 @@
     xen_be_register("qdisk", &xen_blkdev_ops);
     xen_be_register("qnic", &xen_netdev_ops);
 
+    /* configure framebuffer */
+    if (xenfb_enabled) {
+        xen_config_dev_vfb(0, "vnc");
+        xen_config_dev_vkbd(0);
+    }
+
     /* configure disks */
     for (i = 0; i < 16; i++) {
         index = drive_get_index(IF_XEN, 0, i);

Modified: trunk/qemu-options.hx
===================================================================
--- trunk/qemu-options.hx       2009-04-22 15:19:48 UTC (rev 7227)
+++ trunk/qemu-options.hx       2009-04-22 15:19:53 UTC (rev 7228)
@@ -465,7 +465,7 @@
 ETEXI
 
 DEF("vga", HAS_ARG, QEMU_OPTION_vga,
-    "-vga [std|cirrus|vmware|none]\n"
+    "-vga [std|cirrus|vmware|xenfb|none]\n"
     "                select video card type\n")
 STEXI
 @item -vga @var{type}

Modified: trunk/sysemu.h
===================================================================
--- trunk/sysemu.h      2009-04-22 15:19:48 UTC (rev 7227)
+++ trunk/sysemu.h      2009-04-22 15:19:53 UTC (rev 7228)
@@ -88,6 +88,7 @@
 extern int cirrus_vga_enabled;
 extern int std_vga_enabled;
 extern int vmsvga_enabled;
+extern int xenfb_enabled;
 extern int graphic_width;
 extern int graphic_height;
 extern int graphic_depth;

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2009-04-22 15:19:48 UTC (rev 7227)
+++ trunk/vl.c  2009-04-22 15:19:53 UTC (rev 7228)
@@ -216,6 +216,7 @@
 int cirrus_vga_enabled = 1;
 int std_vga_enabled = 0;
 int vmsvga_enabled = 0;
+int xenfb_enabled = 0;
 #ifdef TARGET_SPARC
 int graphic_width = 1024;
 int graphic_height = 768;
@@ -4225,12 +4226,15 @@
     cirrus_vga_enabled = 0;
     std_vga_enabled = 0;
     vmsvga_enabled = 0;
+    xenfb_enabled = 0;
     if (strstart(p, "std", &opts)) {
         std_vga_enabled = 1;
     } else if (strstart(p, "cirrus", &opts)) {
         cirrus_vga_enabled = 1;
     } else if (strstart(p, "vmware", &opts)) {
         vmsvga_enabled = 1;
+    } else if (strstart(p, "xenfb", &opts)) {
+        xenfb_enabled = 1;
     } else if (!strstart(p, "none", &opts)) {
     invalid_vga:
         fprintf(stderr, "Unknown vga type: %s\n", p);