From 28bb7266a05d5e07e532e66c17eac77130d369d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Thu, 18 Nov 2021 16:21:27 +0100 Subject: [PATCH] conf: match by network alias only if aliases are assigned MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 114e3b423210d316b3326816fd2c33335b1167fe added matching by aliases for interfaces with same MAC address. ( https://bugzilla.redhat.com/show_bug.cgi?id=1926190 ) However, unless the domain is using user aliases (prefixed ua-), there are no aliases in the persistent definition. Only match by MAC/PCI/other addresses in that case, to fix update-device with --persistent flag (AFFECT_LIVE | AFFECT_CONFIG). https://bugzilla.redhat.com/show_bug.cgi?id=2024098 Fixes: 114e3b423210d316b3326816fd2c33335b1167fe Signed-off-by: Ján Tomko Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7231d8fc3f..deb32b3f6b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15770,8 +15770,8 @@ virDomainNetFindIdx(virDomainDef *def, virDomainNetDef *net) &net->info.addr.ccw)) continue; - if (net->info.alias && - STRNEQ_NULLABLE(def->nets[i]->info.alias, net->info.alias)) { + if (net->info.alias && def->nets[i]->info.alias && + STRNEQ(def->nets[i]->info.alias, net->info.alias)) { continue; } -- 2.47.2