Merge "Revert "libvirt: Wrap un-proxied listDevices() and listAllDevices()""

nova/virt/libvirt/host.py

@@ -1634,9 +1634,7 @@ class Host(object):
         :returns: a list of virNodeDevice instance
         """
         try:
-            devs = [self._wrap_libvirt_proxy(dev)
-                    for dev in self.get_connection().listDevices(cap, flags)]
-            return devs
+            return self.get_connection().listDevices(cap, flags)
         except libvirt.libvirtError as ex:
             error_code = ex.get_error_code()
             if error_code == libvirt.VIR_ERR_NO_SUPPORT:
@@ -1656,10 +1654,7 @@ class Host(object):
         :returns: a list of virNodeDevice instances.
         """
         try:
-            alldevs = [
-                self._wrap_libvirt_proxy(dev)
-                for dev in self.get_connection().listAllDevices(flags)] or []
-            return alldevs
+            return self.get_connection().listAllDevices(flags) or []
         except libvirt.libvirtError as ex:
             LOG.warning(ex)
             return []