Change in vdsm[master]: xen: libvirtconnection: connect to xen, if it is available

danken at redhat.com danken at redhat.com
Wed Jun 4 11:43:11 UTC 2014


Dan Kenigsberg has uploaded a new change for review.

Change subject: xen: libvirtconnection: connect to xen, if it is available
......................................................................

xen: libvirtconnection: connect to xen, if it is available

Change-Id: I6cc6474b012d900fe3c5e1dab7a1e3e815ae01c3
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M lib/vdsm/libvirtconnection.py
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/28350/1

diff --git a/lib/vdsm/libvirtconnection.py b/lib/vdsm/libvirtconnection.py
index b1332db..983287f 100644
--- a/lib/vdsm/libvirtconnection.py
+++ b/lib/vdsm/libvirtconnection.py
@@ -29,6 +29,7 @@
 from . import constants, utils
 
 log = logging.getLogger()
+XEN = os.path.exists('/proc/xen')
 
 
 class _EventLoop:
@@ -124,7 +125,7 @@
                           libvirt.VIR_ERR_INTERNAL_ERROR,
                           libvirt.VIR_ERR_NO_CONNECT,
                           libvirt.VIR_ERR_INVALID_CONN)
-                if edom in EDOMAINS and ecode in ECODES:
+                if not XEN and edom in EDOMAINS and ecode in ECODES:
                     try:
                         __connections.get(id(target)).pingLibvirt()
                     except libvirt.libvirtError as e:
@@ -148,7 +149,10 @@
         conn = __connections.get(id(target))
         if not conn:
             log.debug('trying to connect libvirt')
-            conn = _open_qemu_connection()
+            if XEN:
+                conn = libvirt.open('xen:///')
+            else:
+                conn = _open_qemu_connection()
             __connections[id(target)] = conn
 
             setattr(conn, 'pingLibvirt', getattr(conn, 'getLibVersion'))


-- 
To view, visit http://gerrit.ovirt.org/28350
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cc6474b012d900fe3c5e1dab7a1e3e815ae01c3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list