summaryrefslogtreecommitdiff
path: root/qapi/machine.json
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-10-15 12:00:33 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-10-15 12:00:33 +0100
commit9020e9526cd08c4dc99d54dba48730de2908c970 (patch)
tree51b75033f3fc76774a9bd8d72082af551786d9e1 /qapi/machine.json
parent3779d1801166cc27b91f88366dd5bbae6b1c6dde (diff)
parent403e11edbfad5da2e6d5842adc9222f60e76ee43 (diff)
downloadqemu-9020e9526cd08c4dc99d54dba48730de2908c970.zip
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Pull request v2: * Replaced "Launchpad:" tag with "Buglink:" as documented on the SubmitAPatch wiki page [Philippe] # gpg: Signature made Tue 15 Oct 2019 09:49:05 BST # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/tracing-pull-request: trace: avoid "is" with a literal Python 3.8 warnings trace: add --group=all to tracing.txt Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi/machine.json')
0 files changed, 0 insertions, 0 deletions