From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LweEu-0005WL-02 for qemu-devel@nongnu.org; Wed, 22 Apr 2009 11:19:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LweEt-0005Vs-5r for qemu-devel@nongnu.org; Wed, 22 Apr 2009 11:19:55 -0400 Received: from [199.232.76.173] (port=45057 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LweEs-0005Vn-V3 for qemu-devel@nongnu.org; Wed, 22 Apr 2009 11:19:55 -0400 Received: from savannah.gnu.org ([199.232.41.3]:33630 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LweEs-00041N-LY for qemu-devel@nongnu.org; Wed, 22 Apr 2009 11:19:54 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LweEr-0004A5-TS for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:19:53 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LweEr-00049N-GY for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:19:53 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Wed, 22 Apr 2009 15:19:53 +0000 Subject: [Qemu-devel] [7228] xen: add -vga xenfb option, configure xenfb (Gerd Hoffmann) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Signed-off-by: Anthony Liguori 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);