From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lp8AS-0008KD-PP for qemu-devel@nongnu.org; Wed, 01 Apr 2009 17:40:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lp8AJ-0008Ci-Lx for qemu-devel@nongnu.org; Wed, 01 Apr 2009 17:40:15 -0400 Received: from [199.232.76.173] (port=51191 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lp8AI-0008Bx-PC for qemu-devel@nongnu.org; Wed, 01 Apr 2009 17:40:06 -0400 Received: from mx2.redhat.com ([66.187.237.31]:59191) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lp8AH-0001fN-Sg for qemu-devel@nongnu.org; Wed, 01 Apr 2009 17:40:06 -0400 From: Gerd Hoffmann Date: Wed, 1 Apr 2009 23:39:42 +0200 Message-Id: <1238621982-18333-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1238621982-18333-1-git-send-email-kraxel@redhat.com> References: <1238621982-18333-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 10/10] xen: add -vga xenfb option, configure xenfb Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, xen-devel@lists.xensource.com Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/xen_machine_pv.c | 6 ++++++ qemu-options.hx | 2 +- sysemu.h | 1 + vl.c | 4 ++++ 4 files changed, 12 insertions(+), 1 deletions(-) diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 5607127..0e12bfe 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -82,6 +82,12 @@ static void xen_init_pv(ram_addr_t ram_size, int vga_ram_size, 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); diff --git a/qemu-options.hx b/qemu-options.hx index 895fa89..79c71ac 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -452,7 +452,7 @@ Rotate graphical output 90 deg left (only PXA LCD). 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} diff --git a/sysemu.h b/sysemu.h index 7b356b3..e22612b 100644 --- a/sysemu.h +++ b/sysemu.h @@ -87,6 +87,7 @@ extern int bios_size; 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; diff --git a/vl.c b/vl.c index 243fc0f..1d9ea73 100644 --- a/vl.c +++ b/vl.c @@ -215,6 +215,7 @@ static int rtc_date_offset = -1; /* -1 means no change */ 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; @@ -4152,12 +4153,15 @@ static void select_vgahw (const char *p) 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); -- 1.6.1.3