aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2010-07-26 10:30:01 -0400
committerCole Robinson <crobinso@redhat.com>2010-07-27 15:41:36 -0400
commit6fe9025eb5bb144f29be2dc25705b749bdd4a084 (patch)
tree1f502ceb8404d9e2603ca9eb2daa71019138f74a
parentlibvirt-guests: Don't throw errors if libvirtd is not installed (diff)
downloadlibvirt-6fe9025eb5bb144f29be2dc25705b749bdd4a084.tar.gz
libvirt-6fe9025eb5bb144f29be2dc25705b749bdd4a084.tar.bz2
libvirt-6fe9025eb5bb144f29be2dc25705b749bdd4a084.zip
qemu: Error on unsupported graphics config
Throw an explicit error if multiple graphics devices are specified, or an unsupported type is specified (rdp).
-rw-r--r--src/qemu/qemu_conf.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 0dbab4835..05ad67de6 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) {