ZhouPeng
2012-May-30 10:22 UTC
[PATCH QXL 1/2] libxl:refactor the code of stdvga option support
Hi Ian,
Sorry for late reply.
I agree most of your review suggestion on this patch in my last send,
but nothing has been modified yet.
I want to send all the two patches supporting qxl first.
Then I will send the second version based on suggestion from this list together.
---------------------
refactor the code of stdvga option support.
Be ready to add and describe new vga interface
Signed-off-by: Zhou Peng <ailvpeng25@gmail.com>
diff -r 592d15bd4d5e tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c Fri May 18 16:19:21 2012 +0100
+++ b/tools/libxl/libxl_create.c Mon May 28 16:10:02 2012 +0800
@@ -189,7 +189,6 @@ int libxl__domain_build_info_setdefault(
if (!b_info->u.hvm.boot) return ERROR_NOMEM;
}
- libxl_defbool_setdefault(&b_info->u.hvm.stdvga, false);
libxl_defbool_setdefault(&b_info->u.hvm.vnc.enable, true);
if (libxl_defbool_val(b_info->u.hvm.vnc.enable)) {
libxl_defbool_setdefault(&b_info->u.hvm.vnc.findunused,
true);
diff -r 592d15bd4d5e tools/libxl/libxl_dm.c
--- a/tools/libxl/libxl_dm.c Fri May 18 16:19:21 2012 +0100
+++ b/tools/libxl/libxl_dm.c Mon May 28 16:10:02 2012 +0800
@@ -175,8 +175,13 @@ static char ** libxl__build_device_model
libxl__sizekb_to_mb(b_info->video_memkb)),
NULL);
}
- if (libxl_defbool_val(b_info->u.hvm.stdvga)) {
+
+ switch (b_info->u.hvm.vga.type) {
+ case LIBXL_VGA_INTERFACE_TYPE_STD:
flexarray_append(dm_args, "-std-vga");
+ break;
+ case LIBXL_VGA_INTERFACE_TYPE_DEFAULT:
+ break;
}
if (b_info->u.hvm.boot) {
@@ -418,8 +423,12 @@ static char ** libxl__build_device_model
flexarray_append(dm_args, spiceoptions);
}
- if (libxl_defbool_val(b_info->u.hvm.stdvga)) {
- flexarray_vappend(dm_args, "-vga", "std",
NULL);
+ switch (b_info->u.hvm.vga.type) {
+ case LIBXL_VGA_INTERFACE_TYPE_STD:
+ flexarray_vappend(dm_args, "-vga", "std",
NULL);
+ break;
+ case LIBXL_VGA_INTERFACE_TYPE_DEFAULT:
+ break;
}
if (b_info->u.hvm.boot) {
diff -r 592d15bd4d5e tools/libxl/libxl_types.idl
--- a/tools/libxl/libxl_types.idl Fri May 18 16:19:21 2012 +0100
+++ b/tools/libxl/libxl_types.idl Mon May 28 16:10:02 2012 +0800
@@ -125,9 +125,20 @@ libxl_shutdown_reason = Enumeration("shu
(4, "watchdog"),
])
+libxl_vga_interface_type = Enumeration("vga_interface_type", [
+ (0, "DEFAULT"),
+ (1, "STD"),
+ ])
+
#
# Complex libxl types
#
+
+libxl_vga_interface_info = Struct("vga_interface_info", [
+ ("type", libxl_vga_interface_type),
+ ("vramkb", MemKB),
+ ])
+
libxl_vnc_info = Struct("vnc_info", [
("enable", libxl_defbool),
# "address:port" that should be listened on
@@ -286,7 +297,7 @@ libxl_domain_build_info = Struct("domain
("nested_hvm",
libxl_defbool),
("incr_generationid",libxl_defbool),
("nographic",
libxl_defbool),
- ("stdvga",
libxl_defbool),
+ ("vga",
libxl_vga_interface_info),
("vnc",
libxl_vnc_info),
# keyboard layout, default is
en-us keyboard
("keymap", string),
diff -r 592d15bd4d5e tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Fri May 18 16:19:21 2012 +0100
+++ b/tools/libxl/xl_cmdimpl.c Mon May 28 16:10:02 2012 +0800
@@ -1256,7 +1256,12 @@ skip_vfb:
#undef parse_extra_args
if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) {
- xlu_cfg_get_defbool(config, "stdvga",
&b_info->u.hvm.stdvga, 0);
+ libxl_defbool vga;
+ b_info->u.hvm.vga.type = LIBXL_VGA_INTERFACE_TYPE_DEFAULT;
+ if (!xlu_cfg_get_defbool(config, "stdvga", &vga, 0))
+ if (libxl_defbool_val(vga))
+ b_info->u.hvm.vga.type = LIBXL_VGA_INTERFACE_TYPE_STD;
+
xlu_cfg_get_defbool(config, "vnc",
&b_info->u.hvm.vnc.enable, 0);
xlu_cfg_replace_string (config, "vnclisten",
&b_info->u.hvm.vnc.listen, 0);
diff -r 592d15bd4d5e tools/libxl/xl_sxp.c
--- a/tools/libxl/xl_sxp.c Fri May 18 16:19:21 2012 +0100
+++ b/tools/libxl/xl_sxp.c Mon May 28 16:10:02 2012 +0800
@@ -110,8 +110,10 @@ void printf_info_sexp(int domid, libxl_d
libxl_defbool_to_string(b_info->u.hvm.nested_hvm));
printf("\t\t\t(no_incr_generationid %s)\n",
libxl_defbool_to_string(b_info->u.hvm.incr_generationid));
- printf("\t\t\t(stdvga %s)\n",
- libxl_defbool_to_string(b_info->u.hvm.stdvga));
+ libxl_defbool stdvga;
+ libxl_defbool_set(&stdvga,
+ b_info->u.hvm.vga.type == LIBXL_VGA_INTERFACE_TYPE_STD);
+ printf("\t\t\t(stdvga %s)\n",
libxl_defbool_to_string(stdvga));
printf("\t\t\t(vnc %s)\n",
libxl_defbool_to_string(b_info->u.hvm.vnc.enable));
printf("\t\t\t(vnclisten %s)\n",
b_info->u.hvm.vnc.listen);
--
Zhou Peng
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel