espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(tools/idf-qemu): Add qemu_extra_args after monitor stdio -serial

Browse Source
This commit is contained in:
Rohan Fletcher
2025-05-17 17:00:53 +12:00
parent f9765d0316
commit 15e8d43468
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/idf_py_actions/qemu_ext.py
View File

@@ -5,6 +5,7 @@ import binascii
import fnmatch import fnmatch
import json import json
import os import os
import shlex
import shutil import shutil
import socket import socket
import subprocess import subprocess
@@ -279,9 +280,6 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
if options.wait_for_gdb or gdb: if options.wait_for_gdb or gdb:
qemu_args += ['-gdb', f'tcp::{QEMU_PORT_GDB}', '-S'] qemu_args += ['-gdb', f'tcp::{QEMU_PORT_GDB}', '-S']
if qemu_extra_args:
qemu_args += qemu_extra_args.split(' ')
if graphics: if graphics:
qemu_args += ['-display', 'sdl'] qemu_args += ['-display', 'sdl']
else: else:
@@ -293,6 +291,12 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
# Launch QEMU! # Launch QEMU!
if not options.bg_mode: if not options.bg_mode:
qemu_args += ['-serial', 'mon:stdio'] qemu_args += ['-serial', 'mon:stdio']
# Adding qemu_extra_args at the end ensures the monitor is the
# primary serial port if another -serial argument is present.
if qemu_extra_args:
qemu_args += shlex.split(qemu_extra_args)
yellow_print('Running qemu (fg): ' + ' '.join(qemu_args)) yellow_print('Running qemu (fg): ' + ' '.join(qemu_args))
subprocess.run(qemu_args) subprocess.run(qemu_args)
else: else:
@@ -301,6 +305,11 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
else: else:
qemu_args += ['-serial', f'tcp::{QEMU_PORT_SERIAL},server,nowait'] qemu_args += ['-serial', f'tcp::{QEMU_PORT_SERIAL},server,nowait']
# Adding qemu_extra_args at the end ensures the monitor is the
# primary serial port if another -serial argument is present.
if qemu_extra_args:
qemu_args += shlex.split(qemu_extra_args)
yellow_print('Running qemu (bg): ' + ' '.join(qemu_args)) yellow_print('Running qemu (bg): ' + ' '.join(qemu_args))
qemu_proc = subprocess.Popen(qemu_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) qemu_proc = subprocess.Popen(qemu_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
wait_for_socket(QEMU_PORT_SERIAL) wait_for_socket(QEMU_PORT_SERIAL)