shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-04 17:47:19 +03:00
Code Issues Projects Releases Wiki Activity

inspection: simplify mount points sort/mount

Browse Source 
Rely on the Python 3 sorting facilities to sort the mount points using
a key based on the length of the mount point, doing the same effect as
the old compare function.

As side change required by this, enable python_return_dict on the
GuestFS handle, so we get proper hashes instead of lists.  This requires
libguestfs 1.22, which is 6 years old by now (and other virt-manager
requires are way more recent than that).

Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Pino Toscano 2019-04-17 18:49:49 +02:00 committed by Cole Robinson
parent cf9f4a73f4
commit ac2949bab3
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
virtManager/inspection.py
View File

@ -3,7 +3,6 @@
# This work is licensed under the GNU GPLv2 or later.
# See the COPYING file in the top-level directory.
import functools
import logging
import queue
import threading
@ -198,7 +197,7 @@ class vmmInspection(vmmGObject):
import guestfs # pylint: disable=import-error
g = guestfs.GuestFS(close_on_exit=False)
g = guestfs.GuestFS(close_on_exit=False, python_return_dict=True)
prettyvm = conn.get_uri() + ":" + vm.get_name()
try:
g.add_libvirt_dom(vm.get_backend(), readonly=1)
@ -239,23 +238,16 @@ class vmmInspection(vmmGObject):
# Sort keys by length, shortest first, so that we end up
# mounting the filesystems in the correct order.
mps = list(g.inspect_get_mountpoints(root))
def compare(a, b):
if len(a[0]) > len(b[0]):
return 1
elif len(a[0]) == len(b[0]):
return 0
else:
return -1
mps = g.inspect_get_mountpoints(root)
mps.sort(key=functools.cmp_to_key(compare))
for mp_dev in mps:
mps = sorted(mps.items(), key=lambda k: len(k[0]))
for mp, dev in mps:
try:
g.mount_ro(mp_dev[1], mp_dev[0])
g.mount_ro(dev, mp)
except Exception:
logging.exception("%s: exception mounting %s on %s "
"(ignored)",
prettyvm, mp_dev[1], mp_dev[0])
prettyvm, dev, mp)
filesystems_mounted = True