aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/man/xl.cfg.pod.58
-rw-r--r--tools/libxl/xl_cmdimpl.c14
2 files changed, 20 insertions, 2 deletions
diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
index 48e05c4a7c..66c9d9d825 100644
--- a/docs/man/xl.cfg.pod.5
+++ b/docs/man/xl.cfg.pod.5
@@ -998,7 +998,7 @@ option (see below).
The default amount of video ram for stdvga is 8MB which is sufficient
for e.g. 1600x1200 at 32bpp.
-When using the emulated Cirrus graphics card (B<stdvga=0>)
+When using the emulated Cirrus graphics card (B<vga="cirrus">)
the amount of video ram is fixed at 4MB which is sufficient
for 1024x768 at 32 bpp.
@@ -1014,6 +1014,12 @@ emulated graphics device. The default is false which means to emulate
a Cirrus Logic GD5446 VGA card. If your guest supports VBE 2.0 or
later (e.g. Windows XP onwards) then you should enable this.
stdvga supports more video ram and bigger resolutions than Cirrus.
+This option is deprecated, use vga="stdvga" instead.
+
+=item B<vga="STRING">
+
+Selects the emulated video card (stdvga|cirrus).
+The default is cirrus.
=item B<vnc=BOOLEAN>
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 9c554ba040..003b12963d 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -1474,7 +1474,19 @@ skip_vfb:
#undef parse_extra_args
if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) {
- if (!xlu_cfg_get_long(config, "stdvga", &l, 0))
+ if (!xlu_cfg_get_string (config, "vga", &buf, 0)) {
+ if (!strcmp(buf, "stdvga")) {
+ b_info->u.hvm.vga.kind
+ = LIBXL_VGA_INTERFACE_TYPE_STD;
+ } else if (!strcmp(buf, "cirrus")) {
+ b_info->u.hvm.vga.kind
+ = LIBXL_VGA_INTERFACE_TYPE_CIRRUS;
+ } else {
+ fprintf(stderr,
+ "Unknown vga \"%s\" specified\n", buf);
+ exit(1);
+ }
+ } else if (!xlu_cfg_get_long(config, "stdvga", &l, 0))
b_info->u.hvm.vga.kind = l ? LIBXL_VGA_INTERFACE_TYPE_STD :
LIBXL_VGA_INTERFACE_TYPE_CIRRUS;