xend: Remove XendLogging dependency from a couple of generally useful

support modules.

Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>

diff --git a/tools/python/xen/util/blkif.py b/tools/python/xen/util/blkif.py
index 0fdd52f4184850a014f9021d7ac11a9beb7a3380..beac3dc634de2e6d297c51d30f576055eb36e683 100644 (file)
--- a/tools/python/xen/util/blkif.py
+++ b/tools/python/xen/util/blkif.py
@@ -2,8 +2,6 @@ import os
 import re
 import string
 
-from xen.xend.XendLogging import log
-
 def expand_dev_name(name):
     if not name:
         return name

diff --git a/tools/python/xen/xend/xenstore/xswatch.py b/tools/python/xen/xend/xenstore/xswatch.py
index a1ea740a94c557edca976519c1cd70a8fdef7d31..04651686fd69eca3f310acb12b6070c8da3a11f0 100644 (file)
--- a/tools/python/xen/xend/xenstore/xswatch.py
+++ b/tools/python/xen/xend/xenstore/xswatch.py
@@ -9,8 +9,6 @@ import errno
 import threading
 from xen.xend.xenstore.xsutil import xshandle
 
-from xen.xend.XendLogging import log
-
 
 class xswatch:
 
@@ -76,7 +74,7 @@ def watchMain():
                     else:
                         raise
         except:
-            log.exception("read_watch failed")
+            pass
             # Ignore this exception -- there's no point throwing it
             # further on because that will just kill the watcher thread,
             # which achieves nothing.