summary refs log tree commit diff stats
path: root/python/qemu/machine.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-11-20 22:30:51 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-11-20 22:30:51 +0000
commite3a232cccd2445e5d9e607a65a78cdbc33ff8a0f (patch)
treed2c04be34ccb139c439f5dbe6e56a84565126bd6 /python/qemu/machine.py
parent7761e07c3ffd8daad6fd933ad0bb03493080e193 (diff)
parent5983021eb6cd0fb8dfbac5211892f5231758d60b (diff)
downloadfocaccia-qemu-e3a232cccd2445e5d9e607a65a78cdbc33ff8a0f.tar.gz
focaccia-qemu-e3a232cccd2445e5d9e607a65a78cdbc33ff8a0f.zip
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
Bug fixes

# gpg: Signature made Fri 20 Nov 2020 15:49:13 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini-gitlab/tags/for-upstream:
  qboot: update to latest upstream
  usb: fix kconfig for usb-xhci-sysbus

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'python/qemu/machine.py')
0 files changed, 0 insertions, 0 deletions