diff options
| -rw-r--r-- | docs/man/xl.cfg.pod.5 | 10 | ||||
| -rw-r--r-- | tools/libxl/libxl_create.c | 16 | ||||
| -rw-r--r-- | tools/libxl/libxl_dm.c | 13 | ||||
| -rw-r--r-- | tools/libxl/libxl_types.idl | 1 | ||||
| -rw-r--r-- | tools/libxl/xl_cmdimpl.c | 2 |
5 files changed, 1 insertions, 41 deletions
diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 4c92721953..b7d64a6d7d 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1005,9 +1005,6 @@ the amount of video ram is fixed at 4MB which is sufficient for 1024x768 at 32 bpp and videoram option is currently working only when using the upstream qemu-xen device-model. -For B<qxl> vga, the default is both default and minimal 128MB. -If B<videoram> is set less than 128MB, an error will be triggered. - =item B<stdvga=BOOLEAN> Select a standard VGA card with VBE (VESA BIOS Extensions) as the @@ -1019,14 +1016,9 @@ This option is deprecated, use vga="stdvga" instead. =item B<vga="STRING"> -Selects the emulated video card (stdvga|cirrus|qxl). +Selects the emulated video card (stdvga|cirrus). The default is cirrus. -In general, QXL should work with the Spice remote display protocol -for acceleration, and QXL driver is necessary in guest in this case. -QXL can also work with the VNC protocol, but it will be like a standard -VGA without acceleration. - =item B<vnc=BOOLEAN> Allow access to the display via the VNC protocol. This enables the diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index cb9c822785..0c32d0b143 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -213,22 +213,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT) b_info->shadow_memkb = 0; - if (b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_QXL) { - if (b_info->device_model_version == - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { - if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) { - b_info->video_memkb = (128 * 1024); - } else if (b_info->video_memkb < (128 * 1024)) { - LOG(ERROR, - "128 Mib videoram is the minimum for qxl default"); - return ERROR_INVAL; - } - } else { - LOG(ERROR,"qemu upstream required for qxl vga"); - return ERROR_INVAL; - } - } - if (b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_STD && b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 1e3a9f4db8..ac1f90e531 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -191,8 +191,6 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, break; case LIBXL_VGA_INTERFACE_TYPE_CIRRUS: break; - case LIBXL_VGA_INTERFACE_TYPE_QXL: - break; } if (b_info->u.hvm.boot) { @@ -479,17 +477,6 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, libxl__sizekb_to_mb(b_info->video_memkb)), NULL); } break; - case LIBXL_VGA_INTERFACE_TYPE_QXL: - /* QXL have 2 ram regions, ram and vram */ - flexarray_vappend(dm_args, "-vga", "qxl", NULL); - if (b_info->video_memkb) { - flexarray_vappend(dm_args, "-global", - GCSPRINTF("qxl-vga.vram_size_mb=%"PRIu64, - (b_info->video_memkb/2/1024)), "-global", - GCSPRINTF("qxl-vga.ram_size_mb=%"PRIu64, - (b_info->video_memkb/2/1024)), NULL); - } - break; } if (b_info->u.hvm.boot) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 8262cba623..d218a2d3d1 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -130,7 +130,6 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ libxl_vga_interface_type = Enumeration("vga_interface_type", [ (1, "CIRRUS"), (2, "STD"), - (3, "QXL"), ], init_val = 0) # diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index c5292f40f7..8a478ba610 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1456,8 +1456,6 @@ skip_vfb: 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 if (!strcmp(buf, "qxl")) { - b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_QXL; } else { fprintf(stderr, "Unknown vga \"%s\" specified\n", buf); exit(1); |