On Thu Nov 16, 2023 at 3:22 AM AEST, Daniel P. Berrangé wrote:
On Wed, Nov 15, 2023 at 01:14:53PM +0000, Daniel P. Berrangé wrote:
The Machine class doesn't know if anything will ever use the console,
so as is the change is unsafe.
The original goal of John's change was to guarantee we capture early
boot messages as some test need that.
I think we need to be able to have a flag to say whether the caller needs
an "early console" facility, and only use the pre-opened FD passing for
that case. Tests we need early console will have to ask for that guarantee
explicitly.
The below patch makes this test work. Maybe as a quick fix it is
better than disabling the test.
I guess we still have a problem if a test invokes vm.launch()
directly without subsequently waiting for a console pattern or
doing something with the console as you say. Your suggesstion is
add something like vm.launch(console=True) ?
Thanks,
Nick
---
diff --git a/tests/avocado/reverse_debugging.py
b/tests/avocado/reverse_debugging.py
index fc47874eda..128d85bc0e 100644
--- a/tests/avocado/reverse_debugging.py
+++ b/tests/avocado/reverse_debugging.py
@@ -12,6 +12,7 @@
from avocado import skipIf
from avocado_qemu import BUILD_DIR
+from avocado.utils import datadrainer
from avocado.utils import gdb
from avocado.utils import process
from avocado.utils.network.ports import find_free_port
@@ -52,6 +53,10 @@ def run_vm(self, record, shift, args, replay_path,
image_path, port):
if args:
vm.add_args(*args)
vm.launch()
+ console_drainer = datadrainer.LineLogger(vm.console_socket.fileno(),
+ logger=self.log.getChild('console'),
+ stop_check=(lambda : not vm.is_running()))
+ console_drainer.start()
return vm
@staticmethod