From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 13 Mar 2018 12:01:11 +0000 (+0100)
Subject: qemuAssignDeviceInputAlias: Be tolerant to pre-existent alias
X-Git-Tag: v4.2.0-rc1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a02a52751f72a1abac7d1024ecc3fcdb8b61a050;p=thirdparty%2Flibvirt.git

qemuAssignDeviceInputAlias: Be tolerant to pre-existent alias

https://bugzilla.redhat.com/show_bug.cgi?id=1554876

This is missing in 6bc4a371cf and therefore we are effectively
overwriting user provided aliases for <input/> devices.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index ae30f7df82..d0ca15bae2 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -513,6 +513,9 @@ qemuAssignDeviceInputAlias(virDomainDefPtr def,
                            virDomainInputDefPtr input,
                            int idx)
 {
+    if (input->info.alias)
+        return 0;
+
     if (idx == -1) {
         int thisidx;
         size_t i;