Google Git
Sign in
qemu / qemu / e59dbbac0364344a3ad84c3497a98c56003d3fb8
commite59dbbac0364344a3ad84c3497a98c56003d3fb8[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Fri Jan 04 18:23:13 2019 +0000
committerPeter Maydell <peter.maydell@linaro.org>Fri Jan 04 18:23:13 2019 +0000
tree6fe351bfb78c2c94e3f53e42a1272db78d23c4c6
parent6395fe0c2c7d9f336d87960a7c9924b630c57c91 [diff]
parent19bcc4bc3213e78c303ad480a7a578f62258252d [diff]
Merge remote-tracking branch 'remotes/philmd/tags/fw_cfg-20190104-pull-request' into staging

fw_cfg patches for 2019-01-04

Two fixes from Li Qiang:
- Improve error message when can't load splash file
- Fix boot bootsplash and reboot-timeout error checking

# gpg: Signature made Fri 04 Jan 2019 16:22:24 GMT
# gpg:                using RSA key E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>"
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd/tags/fw_cfg-20190104-pull-request:
  fw_cfg: Make qemu_extra_params_fw locally
  fw_cfg: Fix -boot reboot-timeout error checking
  fw_cfg: Fix -boot bootsplash error checking
  fw_cfg: Improve error message when can't load splash file

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
tree: 6fe351bfb78c2c94e3f53e42a1272db78d23c4c6
  1. accel/
  2. audio/
  3. backends/
  4. block/
  5. bsd-user/
  6. chardev/
  7. contrib/
  8. crypto/
  9. default-configs/
  10. disas/
  11. docs/
  12. fpu/
  13. fsdev/
  14. gdb-xml/
  15. hw/
  16. include/
  17. io/
  18. libdecnumber/
  19. linux-headers/
  20. linux-user/
  21. migration/
  22. nbd/
  23. net/
  24. pc-bios/
  25. po/
  26. qapi/
  27. qga/
  28. qobject/
  29. qom/
  30. replay/
  31. roms/
  32. scripts/
  33. scsi/
  34. slirp/
  35. stubs/
  36. target/
  37. tcg/
  38. tests/
  39. trace/
  40. ui/
  41. util/
  42. capstone
  43. dtc
  44. .dir-locals.el
  45. .editorconfig
  46. .exrc
  47. .gdbinit
  48. .gitignore
  49. .gitmodules
  50. .gitpublish
  51. .mailmap
  52. .shippable.yml
  53. .travis.yml
  54. arch_init.c
  55. balloon.c
  56. block.c
  57. blockdev-nbd.c
  58. blockdev.c
  59. blockjob.c
  60. bootdevice.c
  61. bt-host.c
  62. bt-vhci.c
  63. Changelog
  64. CODING_STYLE
  65. configure
  66. COPYING
  67. COPYING.LIB
  68. cpus-common.c
  69. cpus.c
  70. device-hotplug.c
  71. device_tree.c
  72. disas.c
  73. dma-helpers.c
  74. dump.c
  75. exec.c
  76. gdbstub.c
  77. gitdm.config
  78. HACKING
  79. hmp-commands-info.hx
  80. hmp-commands.hx
  81. hmp.c
  82. hmp.h
  83. ioport.c
  84. iothread.c
  85. job-qmp.c
  86. job.c
  87. LICENSE
  88. MAINTAINERS
  89. Makefile
  90. Makefile.objs
  91. Makefile.target
  92. memory.c
  93. memory_ldst.inc.c
  94. memory_mapping.c
  95. module-common.c
  96. monitor.c
  97. numa.c
  98. os-posix.c
  99. os-win32.c
  100. qdev-monitor.c
  101. qdict-test-data.txt
  102. qemu-bridge-helper.c
  103. qemu-deprecated.texi
  104. qemu-doc.texi
  105. qemu-edid.c
  106. qemu-ga.texi
  107. qemu-img-cmds.hx
  108. qemu-img.c
  109. qemu-img.texi
  110. qemu-io-cmds.c
  111. qemu-io.c
  112. qemu-keymap.c
  113. qemu-nbd.c
  114. qemu-nbd.texi
  115. qemu-option-trace.texi
  116. qemu-options-wrapper.h
  117. qemu-options.h
  118. qemu-options.hx
  119. qemu-seccomp.c
  120. qemu-tech.texi
  121. qemu.nsi
  122. qemu.sasl
  123. qmp.c
  124. qtest.c
  125. README
  126. replication.c
  127. replication.h
  128. rules.mak
  129. thunk.c
  130. tpm.c
  131. trace-events
  132. VERSION
  133. version.rc
  134. vl.c
  135. win_dump.c
  136. win_dump.h