diff options
| -rw-r--r-- | src/focaccia/qemu/__init__.py | 0 | ||||
| -rw-r--r-- | src/focaccia/qemu/_qemu_tool.py (renamed from src/focaccia/tools/_qemu_tool.py) | 2 | ||||
| -rwxr-xr-x | src/focaccia/qemu/validation_server.py (renamed from src/focaccia/tools/validation_server.py) | 0 | ||||
| -rwxr-xr-x | src/focaccia/tools/validate_qemu.py | 5 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/focaccia/qemu/__init__.py b/src/focaccia/qemu/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/focaccia/qemu/__init__.py diff --git a/src/focaccia/tools/_qemu_tool.py b/src/focaccia/qemu/_qemu_tool.py index 02d150b..93849bd 100644 --- a/src/focaccia/tools/_qemu_tool.py +++ b/src/focaccia/qemu/_qemu_tool.py @@ -20,7 +20,7 @@ from focaccia.symbolic import SymbolicTransform, eval_symbol, ExprMem from focaccia.trace import Trace, TraceEnvironment from focaccia.utils import print_result -from validate_qemu import make_argparser, verbosity +from focaccia.tools.validate_qemu import make_argparser, verbosity logger = logging.getLogger('focaccia-qemu-validator') debug = logger.debug diff --git a/src/focaccia/tools/validation_server.py b/src/focaccia/qemu/validation_server.py index db33ff3..db33ff3 100755 --- a/src/focaccia/tools/validation_server.py +++ b/src/focaccia/qemu/validation_server.py diff --git a/src/focaccia/tools/validate_qemu.py b/src/focaccia/tools/validate_qemu.py index e834a6d..48b3f1c 100755 --- a/src/focaccia/tools/validate_qemu.py +++ b/src/focaccia/tools/validate_qemu.py @@ -23,9 +23,10 @@ import argparse import sysconfig import subprocess +import focaccia.qemu from focaccia.compare import ErrorTypes from focaccia.arch import supported_architectures -from focaccia.tools.validation_server import start_validation_server +from focaccia.qemu.validation_server import start_validation_server verbosity = { 'info': ErrorTypes.INFO, @@ -118,7 +119,7 @@ def main(): args.quiet) else: # QEMU GDB interface - script_dirname = os.path.dirname(__file__) + script_dirname = os.path.dirname(focaccia.qemu.__file__) qemu_tool_path = os.path.join(script_dirname, '_qemu_tool.py') # We have to remove all arguments we don't want to pass to the qemu tool |