From 35b06cebd45afc2ce939690c759e73a167740323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 10 Nov 2014 16:40:49 +0100 Subject: [PATCH] Fix virDomainChrEquals for spicevmc virDomainChrSourceDefIsEqual should return 'true' for identical SPICEVMC chardevs, and those that have no source specification. After this change, a failed hotplug no longer leaves a stale pointer in the domain definition. https://bugzilla.redhat.com/show_bug.cgi?id=1162097 (cherry picked from commit b987684ff63a20ab1301c48ca4842930be044f6d) --- src/conf/domain_conf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6ea25df401..c23a1f5219 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1590,16 +1590,17 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src, tgt->data.spiceport.channel); break; + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + return src->data.spicevmc == tgt->data.spicevmc; + case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_STDIO: - case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_LAST: - /* nada */ break; } - return false; + return true; } void virDomainChrDefFree(virDomainChrDefPtr def) -- GitLab