From 705e756e45508488d094d2f07bd85c5cc3d46f26 Mon Sep 17 00:00:00 2001 From: Zhou Peng Date: Fri, 29 Jun 2012 17:32:20 +0100 Subject: [PATCH] libxl: refactor stdvga opinon support. Be ready to add and describe new vga interface Signed-off-by: Zhou Peng Acked-by: Ian Campbell Committed-by: Ian Jackson --- tools/libxl/libxl_create.c | 3 ++- tools/libxl/libxl_dm.c | 16 +++++++++++++--- tools/libxl/libxl_types.idl | 12 +++++++++++- tools/libxl/xl_cmdimpl.c | 5 ++++- tools/libxl/xl_sxp.c | 5 +++-- 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a633227706..2ddf5fba48 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -253,7 +253,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (!b_info->u.hvm.boot) return ERROR_NOMEM; } - libxl_defbool_setdefault(&b_info->u.hvm.stdvga, false); + if (!b_info->u.hvm.vga.kind) + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS; 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 --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 3fca1670ba..acba613dff 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -177,8 +177,13 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, libxl__sizekb_to_mb(b_info->video_memkb)), NULL); } - if (libxl_defbool_val(b_info->u.hvm.stdvga)) { + + switch (b_info->u.hvm.vga.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: flexarray_append(dm_args, "-std-vga"); + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + break; } if (b_info->u.hvm.boot) { @@ -424,8 +429,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, 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.kind) { + case LIBXL_VGA_INTERFACE_TYPE_STD: + flexarray_vappend(dm_args, "-vga", "std", NULL); + break; + case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: + flexarray_vappend(dm_args, "-vga", "cirrus", NULL); + break; } if (b_info->u.hvm.boot) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index a4a8e258f4..00947e1875 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -126,9 +126,19 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ (4, "watchdog"), ]) +libxl_vga_interface_type = Enumeration("vga_interface_type", [ + (1, "CIRRUS"), + (2, "STD"), + ], init_val = 0) + # # Complex libxl types # + +libxl_vga_interface_info = Struct("vga_interface_info", [ + ("kind", libxl_vga_interface_type), + ]) + libxl_vnc_info = Struct("vnc_info", [ ("enable", libxl_defbool), # "address:port" that should be listened on @@ -282,7 +292,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("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 --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index cc6048ca5d..d1531e6a25 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1264,7 +1264,10 @@ 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); + 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; + 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 --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c index caee1a92c5..6e0a38940b 100644 --- a/tools/libxl/xl_sxp.c +++ b/tools/libxl/xl_sxp.c @@ -110,8 +110,9 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) 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)); + printf("\t\t\t(stdvga %s)\n", b_info->u.hvm.vga.kind == + LIBXL_VGA_INTERFACE_TYPE_STD ? + "True" : "False"); 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); -- 2.30.2