[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 08/16] python/machine.py: reorder __init__
From: |
John Snow |
Subject: |
[PATCH v5 08/16] python/machine.py: reorder __init__ |
Date: |
Fri, 10 Jul 2020 01:22:12 -0400 |
Put the init arg handling all at the top, and mostly in order (deviating
when one is dependent on another), and put what is effectively runtime
state declaration at the bottom.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
python/qemu/machine.py | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index bab1b1921f..0f7ec095cb 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -87,38 +87,43 @@ def __init__(self, binary, args=None, wrapper=None,
name=None,
@param socket_scm_helper: helper program, required for send_fd_scm()
@note: Qemu process is not started until launch() is used.
'''
+ # Direct user configuration
+
+ self._binary = binary
+
if args is None:
args = []
+ # Copy mutable input: we will be modifying our copy
+ self._args = list(args)
+
if wrapper is None:
wrapper = []
- if name is None:
- name = "qemu-%d" % os.getpid()
- if sock_dir is None:
- sock_dir = test_dir
- self._name = name
+ self._wrapper = wrapper
+
+ self._name = name or "qemu-%d" % os.getpid()
+ self._test_dir = test_dir
+ self._sock_dir = sock_dir or self._test_dir
+ self._socket_scm_helper = socket_scm_helper
+
if monitor_address is not None:
self._monitor_address = monitor_address
self._remove_monitor_sockfile = False
else:
self._monitor_address = os.path.join(
- sock_dir, f"{name}-monitor.sock"
+ self._sock_dir, f"{self._name}-monitor.sock"
)
self._remove_monitor_sockfile = True
+
+ # Runstate
self._qemu_log_path = None
self._qemu_log_file = None
self._popen = None
- self._binary = binary
- self._args = list(args) # Force copy args in case we modify them
- self._wrapper = wrapper
self._events = []
self._iolog = None
- self._socket_scm_helper = socket_scm_helper
self._qmp_set = True # Enable QMP monitor by default.
self._qmp = None
self._qemu_full_args = None
- self._test_dir = test_dir
self._temp_dir = None
- self._sock_dir = sock_dir
self._launched = False
self._machine = None
self._console_index = 0
--
2.21.3
- [PATCH v5 00/16] python: add mypy support to python/qemu, John Snow, 2020/07/10
- [PATCH v5 01/16] python/qmp.py: Define common types, John Snow, 2020/07/10
- [PATCH v5 02/16] iotests.py: use qemu.qmp type aliases, John Snow, 2020/07/10
- [PATCH v5 03/16] python/qmp.py: re-absorb MonitorResponseError, John Snow, 2020/07/10
- [PATCH v5 04/16] python/qmp.py: Do not return None from cmd_obj, John Snow, 2020/07/10
- [PATCH v5 05/16] python/qmp.py: add casts to JSON deserialization, John Snow, 2020/07/10
- [PATCH v5 06/16] python/qmp.py: add QMPProtocolError, John Snow, 2020/07/10
- [PATCH v5 09/16] python/machine.py: Don't modify state in _base_args(), John Snow, 2020/07/10
- [PATCH v5 07/16] python/machine.py: Fix monitor address typing, John Snow, 2020/07/10
- [PATCH v5 08/16] python/machine.py: reorder __init__,
John Snow <=
- [PATCH v5 10/16] python/machine.py: Handle None events in events_wait, John Snow, 2020/07/10
- [PATCH v5 12/16] python/machine.py: Add _qmp access shim, John Snow, 2020/07/10
- [PATCH v5 13/16] python/machine.py: fix _popen access, John Snow, 2020/07/10
- [PATCH v5 11/16] python/machine.py: use qmp.command, John Snow, 2020/07/10
- [PATCH v5 15/16] iotests.py: Adjust HMP kwargs typing, John Snow, 2020/07/10
- [PATCH v5 14/16] python/qemu: make 'args' style arguments immutable, John Snow, 2020/07/10
- [PATCH v5 16/16] python/qemu: Add mypy type annotations, John Snow, 2020/07/10