diff options
author | Peter Maydell | 2018-03-08 11:02:46 +0100 |
---|---|---|
committer | Peter Maydell | 2018-03-08 11:02:46 +0100 |
commit | 854a4436dd313eaeb51c275d00526d60437915d2 (patch) | |
tree | 779c655c07e273f245843088bfaf05c7fa7129ae /migration/socket.c | |
parent | misc: don't use hwaddr as a type in trace events (diff) | |
parent | multiboot: fprintf(stderr...) -> error_report() (diff) | |
download | qemu-854a4436dd313eaeb51c275d00526d60437915d2.tar.gz qemu-854a4436dd313eaeb51c275d00526d60437915d2.tar.xz qemu-854a4436dd313eaeb51c275d00526d60437915d2.zip |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Multiboot patches
# gpg: Signature made Wed 07 Mar 2018 11:15:17 GMT
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
multiboot: fprintf(stderr...) -> error_report()
multiboot: Use header names when displaying fields
multiboot: Remove unused variables from multiboot.c
multiboot: bss_end_addr can be zero
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/socket.c')
0 files changed, 0 insertions, 0 deletions