diff options
author | 2019-11-06 11:56:40 +0000 | |
---|---|---|
committer | 2019-11-06 11:56:40 +0000 | |
commit | 50d2d550d75b66529f4037d1daa7f4715351bdca (patch) | |
tree | 6dc1c5c867e9446dc453ffca2ca20fcbe2d21efa /util/qemu-timer.c | |
parent | Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-11-04' into staging (diff) | |
parent | qga: Add "guest-get-memory-block-info" to blacklist (diff) | |
download | qemu-50d2d550d75b66529f4037d1daa7f4715351bdca.tar.xz qemu-50d2d550d75b66529f4037d1daa7f4715351bdca.zip |
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2019-11-04-tag' into staging
qemu-ga patch queue for hard-freeze
* fix handling of Chinese network device names in
guest-network-get-interfaces
* add missing blacklist entries for guest-get-memory-block-info for
w32/non-linux builds
# gpg: Signature made Mon 04 Nov 2019 17:25:54 GMT
# gpg: using RSA key CEACC9E15534EBABB82D3FA03353C9CEF108B584
# gpg: issuer "mdroth@linux.vnet.ibm.com"
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>" [full]
# gpg: aka "Michael Roth <mdroth@utexas.edu>" [full]
# gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>" [full]
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D 3FA0 3353 C9CE F108 B584
* remotes/mdroth/tags/qga-pull-2019-11-04-tag:
qga: Add "guest-get-memory-block-info" to blacklist
qga-win: network-get-interfaces command name field bug fix
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-timer.c')
0 files changed, 0 insertions, 0 deletions