From: Jiri Denemark Date: Fri, 17 Aug 2012 12:06:13 +0000 (+0200) Subject: conf: Fix ABI stability check for spicevmc channel X-Git-Tag: v0.10.0-rc1~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4134642295210b00fe79adacbe10e86961e88a7;p=thirdparty%2Flibvirt.git conf: Fix ABI stability check for spicevmc channel Change device type of a virtio channel from/to spicevmc is not a user visible change. However, spicevmc channels use different default target name than other virtio channels. To maintain ABI stability during this change target name must be explicitly specified (and equal) in both configurations. --- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a2e73c69a8..a330b0e3a3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10075,6 +10075,15 @@ static bool virDomainChannelDefCheckABIStability(virDomainChrDefPtr src, NULLSTR(dst->target.name), NULLSTR(src->target.name)); goto cleanup; } + if (src->source.type != dst->source.type && + (src->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC || + dst->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) && + !src->target.name) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Changing device type to/from spicevmc would" + " change default target channel name")); + goto cleanup; + } break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: if (memcmp(src->target.addr, dst->target.addr,