External/libvirt
1
0
Fork 0
Code

Default console target type with no <target> element

Browse Source 
When no <target> element was set at all, the default console
target type was not being honoured

* src/conf/domain_conf.c: Set default target type for consoles
  with no <target>
This commit is contained in:
Daniel P. Berrange 2011-10-20 14:56:30 +01:00
parent 0f31f7b794
commit 876c8b3bd3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -3997,6 +3997,7 @@ virDomainChrDefParseXML(virCapsPtr caps,
const char *nodeName;
virDomainChrDefPtr def;
int remaining;
bool seenTarget = false;
if (!(def = virDomainChrDefNew()))
return NULL;
@ -4026,6 +4027,7 @@ virDomainChrDefParseXML(virCapsPtr caps,
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (xmlStrEqual(cur->name, BAD_CAST "target")) {
seenTarget = true;
if (virDomainChrDefParseTargetXML(caps, def, cur) < 0) {
goto error;
}
@ -4035,6 +4037,10 @@ virDomainChrDefParseXML(virCapsPtr caps,
}
}
if (!seenTarget &&
((def->targetType = virDomainChrDefaultTargetType(caps, def->deviceType)) < 0))
goto cleanup;
if (def->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) {
if (def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) {
virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",