diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-23 09:41:09 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-23 09:41:09 +0100 |
| commit | 3c2a46d5286b475ce9fc81cbf0ed47af5adeff6b (patch) | |
| tree | 689ac26ec57d170680f735c7b5573796f62170a3 /scripts | |
| parent | 6d9c9603ad2ffdbf2aae3f01955c17591287cb4c (diff) | |
| parent | a57cb3e23d5ac918a69d0aab918470ff0b429ff9 (diff) | |
| download | qemu-3c2a46d5286b475ce9fc81cbf0ed47af5adeff6b.zip qemu-3c2a46d5286b475ce9fc81cbf0ed47af5adeff6b.tar.gz qemu-3c2a46d5286b475ce9fc81cbf0ed47af5adeff6b.tar.bz2 | |
Merge tag 'python-pull-request' of https://gitlab.com/jsnow/qemu into staging
Python testing fixes for 6.2
A few more fixes to help eliminate race conditions from
device-crash-test, along with a fix that allows the SCM_RIGHTS
functionality to work on hosts that only have Python 3.6.
If this is too much this late in the RC process, I'd advocate for at
least patch 7/7 by itself.
# gpg: Signature made Tue 23 Nov 2021 03:37:17 AM CET
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
* tag 'python-pull-request' of https://gitlab.com/jsnow/qemu:
python/aqmp: fix send_fd_scm for python 3.6.x
scripts/device-crash-test: Use a QMP timeout
python/machine: handle "fast" QEMU terminations
python/machine: move more variable initializations to _pre_launch
python/machine: add instance disambiguator to default nickname
python/machine: remove _remove_monitor_sockfile property
python/machine: add @sock_dir property
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/device-crash-test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 1c73dac..7fbd991 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -353,7 +353,7 @@ def checkOneCase(args, testcase): '-device', qemuOptsEscape(device)] cmdline = ' '.join([binary] + args) dbg("will launch QEMU: %s", cmdline) - vm = QEMUMachine(binary=binary, args=args) + vm = QEMUMachine(binary=binary, args=args, qmp_timer=15) exc = None exc_traceback = None |