diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 12:29:53 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 12:29:53 +0000 |
| commit | a6d3c238034c8a90a0a2cee7814741ff1384e66f (patch) | |
| tree | fd0e5eba3420d626bf293af6a00d64701ad12987 /vl.c | |
| parent | eda1df0345f5a1e337e30367124dcb0e802bdfde (diff) | |
| parent | 3b777a79c1cfa40f39f96220bc733eccd7392c9c (diff) | |
| download | qemu-a6d3c238034c8a90a0a2cee7814741ff1384e66f.zip qemu-a6d3c238034c8a90a0a2cee7814741ff1384e66f.tar.gz qemu-a6d3c238034c8a90a0a2cee7814741ff1384e66f.tar.bz2 | |
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>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -185,7 +185,6 @@ const char *prom_envs[MAX_PROM_ENVS]; int boot_menu; bool boot_strict; uint8_t *boot_splash_filedata; -size_t boot_splash_filedata_size; bool wakeup_suspend_enabled; int icount_align_option; |