xen: add -vga xenfb option, configure xenfb (Gerd Hoffmann)
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7228 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
28b85ed8db
commit
94909d9fd9
|
@ -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("qdisk", &xen_blkdev_ops);
|
||||||
xen_be_register("qnic", &xen_netdev_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 */
|
/* configure disks */
|
||||||
for (i = 0; i < 16; i++) {
|
for (i = 0; i < 16; i++) {
|
||||||
index = drive_get_index(IF_XEN, 0, i);
|
index = drive_get_index(IF_XEN, 0, i);
|
||||||
|
|
|
@ -465,7 +465,7 @@ Rotate graphical output 90 deg left (only PXA LCD).
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
DEF("vga", HAS_ARG, QEMU_OPTION_vga,
|
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")
|
" select video card type\n")
|
||||||
STEXI
|
STEXI
|
||||||
@item -vga @var{type}
|
@item -vga @var{type}
|
||||||
|
|
1
sysemu.h
1
sysemu.h
|
@ -88,6 +88,7 @@ extern int bios_size;
|
||||||
extern int cirrus_vga_enabled;
|
extern int cirrus_vga_enabled;
|
||||||
extern int std_vga_enabled;
|
extern int std_vga_enabled;
|
||||||
extern int vmsvga_enabled;
|
extern int vmsvga_enabled;
|
||||||
|
extern int xenfb_enabled;
|
||||||
extern int graphic_width;
|
extern int graphic_width;
|
||||||
extern int graphic_height;
|
extern int graphic_height;
|
||||||
extern int graphic_depth;
|
extern int graphic_depth;
|
||||||
|
|
4
vl.c
4
vl.c
|
@ -216,6 +216,7 @@ static int rtc_date_offset = -1; /* -1 means no change */
|
||||||
int cirrus_vga_enabled = 1;
|
int cirrus_vga_enabled = 1;
|
||||||
int std_vga_enabled = 0;
|
int std_vga_enabled = 0;
|
||||||
int vmsvga_enabled = 0;
|
int vmsvga_enabled = 0;
|
||||||
|
int xenfb_enabled = 0;
|
||||||
#ifdef TARGET_SPARC
|
#ifdef TARGET_SPARC
|
||||||
int graphic_width = 1024;
|
int graphic_width = 1024;
|
||||||
int graphic_height = 768;
|
int graphic_height = 768;
|
||||||
|
@ -4225,12 +4226,15 @@ static void select_vgahw (const char *p)
|
||||||
cirrus_vga_enabled = 0;
|
cirrus_vga_enabled = 0;
|
||||||
std_vga_enabled = 0;
|
std_vga_enabled = 0;
|
||||||
vmsvga_enabled = 0;
|
vmsvga_enabled = 0;
|
||||||
|
xenfb_enabled = 0;
|
||||||
if (strstart(p, "std", &opts)) {
|
if (strstart(p, "std", &opts)) {
|
||||||
std_vga_enabled = 1;
|
std_vga_enabled = 1;
|
||||||
} else if (strstart(p, "cirrus", &opts)) {
|
} else if (strstart(p, "cirrus", &opts)) {
|
||||||
cirrus_vga_enabled = 1;
|
cirrus_vga_enabled = 1;
|
||||||
} else if (strstart(p, "vmware", &opts)) {
|
} else if (strstart(p, "vmware", &opts)) {
|
||||||
vmsvga_enabled = 1;
|
vmsvga_enabled = 1;
|
||||||
|
} else if (strstart(p, "xenfb", &opts)) {
|
||||||
|
xenfb_enabled = 1;
|
||||||
} else if (!strstart(p, "none", &opts)) {
|
} else if (!strstart(p, "none", &opts)) {
|
||||||
invalid_vga:
|
invalid_vga:
|
||||||
fprintf(stderr, "Unknown vga type: %s\n", p);
|
fprintf(stderr, "Unknown vga type: %s\n", p);
|
||||||
|
|
Loading…
Reference in New Issue