]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 12 Mar 2019 12:29:53 +0000 (12:29 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 12 Mar 2019 12:29:53 +0000 (12:29 +0000)
commita6d3c238034c8a90a0a2cee7814741ff1384e66f
treefd0e5eba3420d626bf293af6a00d64701ad12987
parenteda1df0345f5a1e337e30367124dcb0e802bdfde
parent3b777a79c1cfa40f39f96220bc733eccd7392c9c
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging

fw_cfg and thunk code clean up

# gpg: Signature made Mon 11 Mar 2019 19:11:03 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  hw/nvram/fw_cfg: Use the ldst API
  hw/arm/virt: Remove null-check in virt_build_smbios()
  hw/i386: Remove unused include
  hw/nvram/fw_cfg: Remove the unnecessary boot_splash_filedata_size
  thunk: improve readability of allocation loop

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/arm/virt.c
vl.c