[Xen-changelog] [xen-unstable] tools/libxl: Added vga parameter for hvm domUs

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Fabio Fantoni <fabio.fantoni@xxxxxxxxxx>
# Date 1360935146 0
# Node ID cdaf12e33d05a116fa638b7fe951a35d52fcf3f4
# Parent  59161c5b3aa1e7c820adccecec216848e80375e8
tools/libxl: Added vga parameter for hvm domUs

Usage:
  vga="stdvga"|"cirrus"

- Default option is cirrus.
- Prints error and exit if unknown value is passed.
- stdvga parameter is now deprecated.
- Updated xl.cfg man.

Signed-off-by: Fabio Fantoni <fabio.fantoni@xxxxxxxxxx>
Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 59161c5b3aa1 -r cdaf12e33d05 docs/man/xl.cfg.pod.5
--- a/docs/man/xl.cfg.pod.5     Fri Feb 15 13:32:26 2013 +0000
+++ b/docs/man/xl.cfg.pod.5     Fri Feb 15 13:32:26 2013 +0000
@@ -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
 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 -r 59161c5b3aa1 -r cdaf12e33d05 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Fri Feb 15 13:32:26 2013 +0000
+++ b/tools/libxl/xl_cmdimpl.c  Fri Feb 15 13:32:26 2013 +0000
@@ -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;
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog