On 07/27/2010 06:09 AM, Daniel P. Berrange wrote:
On Mon, Jul 26, 2010 at 04:31:21PM -0400, Cole Robinson wrote:
> Throw an explicit error if multiple graphics devices are specified, or
> an unsupported type is specified (rdp).
>
> Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
> ---
> src/qemu/qemu_conf.c | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
> index 0dbab48..05ad67d 100644
> --- a/src/qemu/qemu_conf.c
> +++ b/src/qemu/qemu_conf.c
> @@ -4542,6 +4542,12 @@ int qemudBuildCommandLine(virConnectPtr conn,
> }
> }
>
> + if (def->ngraphics > 1) {
> + qemuReportError(VIR_ERR_INTERNAL_ERROR,
> + "%s", _("only 1 graphics device is
supported"));
> + goto error;
> + }
> +
> if ((def->ngraphics == 1) &&
> def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
> virBuffer opt = VIR_BUFFER_INITIALIZER;
> @@ -4641,6 +4647,12 @@ int qemudBuildCommandLine(virConnectPtr conn,
> * default, since the default changes :-( */
> if (qemuCmdFlags & QEMUD_CMD_FLAG_SDL)
> ADD_ARG_LIT("-sdl");
> +
> + } else if ((def->ngraphics == 1)) {
> + qemuReportError(VIR_ERR_INTERNAL_ERROR,
> + _("unsupported graphics type '%s'"),
> + virDomainGraphicsTypeToString(def->graphics[0]->type));
> + goto error;
> }
>
> if (def->nvideos) {
ACK
Daniel
Thanks, pushed.
- Cole