Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
---
client/virt/kvm_monitor.py | 6 ++---
client/virt/passfd_setup.py | 51 ++++++++++++++++++++++++++++++++++++++++
client/virt/virt_passfd_setup.py | 51 ----------------------------------------
3 files changed, 54 insertions(+), 54 deletions(-)
create mode 100644 client/virt/passfd_setup.py
delete mode 100644 client/virt/virt_passfd_setup.py
diff --git a/client/virt/kvm_monitor.py b/client/virt/kvm_monitor.py
index 2a80e6f..537a88b 100644
--- a/client/virt/kvm_monitor.py
+++ b/client/virt/kvm_monitor.py
@@ -5,7 +5,7 @@ Interfaces to the QEMU monitor.
"""
import socket, time, threading, logging, select, re, os
-import virt_utils, virt_passfd_setup
+import virt_utils, passfd_setup
from autotest.client.shared import utils
try:
import json
@@ -341,7 +341,7 @@ class HumanMonitor(Monitor):
self._recvall()
if fd is not None:
if self._passfd is None:
- self._passfd = virt_passfd_setup.import_passfd()
+ self._passfd = passfd_setup.import_passfd()
# If command includes a file descriptor, use passfd module
self._passfd.sendfd(self._socket, fd, "%s\n" % cmd)
else:
@@ -831,7 +831,7 @@ class QMPMonitor(Monitor):
cmdobj = self._build_cmd(cmd, args, id)
if fd is not None:
if self._passfd is None:
- self._passfd = virt_passfd_setup.import_passfd()
+ self._passfd = passfd_setup.import_passfd()
# If command includes a file descriptor, use passfd module
self._passfd.sendfd(self._socket, fd, json.dumps(cmdobj) +
"\n")
else:
diff --git a/client/virt/passfd_setup.py b/client/virt/passfd_setup.py
new file mode 100644
index 0000000..f103254
--- /dev/null
+++ b/client/virt/passfd_setup.py
@@ -0,0 +1,51 @@
+import os
+import distutils.ccompiler
+import distutils.sysconfig
+
+PYTHON_HEADERS = distutils.sysconfig.get_python_inc()
+PYTHON_VERSION = distutils.sysconfig.get_python_version()
+PYTHON_LIB = "python%s" % PYTHON_VERSION
+
+ABSPATH = os.path.abspath(__file__)
+OUTPUT_DIR = os.path.dirname(ABSPATH)
+
+SOURCES = [os.path.join(OUTPUT_DIR, f) for f in ['passfd.c']]
+SHARED_OBJECT = os.path.join(OUTPUT_DIR, '_passfd.so')
+
+def passfd_setup(output_dir=OUTPUT_DIR):
+ '''
+ Compiles the passfd python extension
+
+ @param output_dir: where the _passfd.so module will be saved
+ @return: None
+ '''
+ if output_dir is not None:
+ output_file = os.path.join(output_dir, SHARED_OBJECT)
+ else:
+ output_file = SHARED_OBJECT
+
+ c = distutils.ccompiler.new_compiler()
+ objects = c.compile(SOURCES, include_dirs=[PYTHON_HEADERS],
extra_postargs=['-fPIC'])
+ c.link_shared_object(objects, SHARED_OBJECT, libraries=[PYTHON_LIB])
+
+
+def import_passfd():
+ '''
+ Imports and lazily sets up the passfd module
+
+ @return: passfd module
+ '''
+ try:
+ import passfd
+ except ImportError:
+ passfd_setup()
+ import passfd
+ return passfd
+
+
+if __name__ == '__main__':
+ import sys
+ if len(sys.argv) > 1:
+ passfd_setup(sys.argv[1])
+ else:
+ passfd_setup()
diff --git a/client/virt/virt_passfd_setup.py b/client/virt/virt_passfd_setup.py
deleted file mode 100644
index f103254..0000000
--- a/client/virt/virt_passfd_setup.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import os
-import distutils.ccompiler
-import distutils.sysconfig
-
-PYTHON_HEADERS = distutils.sysconfig.get_python_inc()
-PYTHON_VERSION = distutils.sysconfig.get_python_version()
-PYTHON_LIB = "python%s" % PYTHON_VERSION
-
-ABSPATH = os.path.abspath(__file__)
-OUTPUT_DIR = os.path.dirname(ABSPATH)
-
-SOURCES = [os.path.join(OUTPUT_DIR, f) for f in ['passfd.c']]
-SHARED_OBJECT = os.path.join(OUTPUT_DIR, '_passfd.so')
-
-def passfd_setup(output_dir=OUTPUT_DIR):
- '''
- Compiles the passfd python extension
-
- @param output_dir: where the _passfd.so module will be saved
- @return: None
- '''
- if output_dir is not None:
- output_file = os.path.join(output_dir, SHARED_OBJECT)
- else:
- output_file = SHARED_OBJECT
-
- c = distutils.ccompiler.new_compiler()
- objects = c.compile(SOURCES, include_dirs=[PYTHON_HEADERS],
extra_postargs=['-fPIC'])
- c.link_shared_object(objects, SHARED_OBJECT, libraries=[PYTHON_LIB])
-
-
-def import_passfd():
- '''
- Imports and lazily sets up the passfd module
-
- @return: passfd module
- '''
- try:
- import passfd
- except ImportError:
- passfd_setup()
- import passfd
- return passfd
-
-
-if __name__ == '__main__':
- import sys
- if len(sys.argv) > 1:
- passfd_setup(sys.argv[1])
- else:
- passfd_setup()
--
1.7.11.2
_______________________________________________
Autotest-kernel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/autotest-kernel
