From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 8 Nov 2017 14:20:10 +0000 (+0100)
Subject: qemu-ns: Detect /dev/* mount point duplicates even better
X-Git-Tag: v3.10.0-rc1~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d899b99653bfa8f0fa275e689d0f5716142f5a5;p=thirdparty%2Flibvirt.git

qemu-ns: Detect /dev/* mount point duplicates even better

In 4f1570720218302 I've tried to make duplicates detection for
nested /dev mount better. However, I've missed the obvious case
when there are two same mount points. For instance if:

  # mount --bind /dev/blah /dev/blah
  # mount --bind /dev/blah /dev/blah

Yeah, very unlikely (in qemu driver world) but possible.

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

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 7024635470..61d28337b8 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8352,7 +8352,7 @@ qemuDomainGetPreservedMounts(virQEMUDriverConfigPtr cfg,
         while (j < nmounts) {
             char *c = STRSKIP(mounts[j], mounts[i]);
 
-            if (c && *c == '/') {
+            if (c && (*c == '/' || *c == '\0')) {
                 VIR_DEBUG("Dropping path %s because of %s", mounts[j], mounts[i]);
                 VIR_DELETE_ELEMENT(mounts, j, nmounts);
             } else {