Google Git
Sign in
qemu / qemu / 225adf16d2a128841d76e63248192797e05b712d
commit225adf16d2a128841d76e63248192797e05b712d[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Thu Dec 22 12:06:59 2016 +0000
committerPeter Maydell <peter.maydell@linaro.org>Thu Dec 22 12:06:59 2016 +0000
tree8187e47e3e982370db0538a2a23666739bdb2d9f
parentd1e8e8ecc3d2a1a72504912d671f1cbbac1b06e5 [diff]
parent9443598d7e2f2c0a6493d97b3f11dd04837b08e8 [diff]
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging

slirp updates

# gpg: Signature made Tue 20 Dec 2016 23:05:13 GMT
# gpg:                using RSA key 0xA003196827414880
# gpg: Good signature from "Samuel Thibault <samuel.thibault@gnu.org>"
# gpg:                 aka "Samuel Thibault <sthibault@debian.org>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: 6B0F AC21 8566 46E9 4AA2  D200 A003 1968 2741 4880

* remotes/thibault/tags/samuel-thibault:
  slirp: support dynamic block size for TFTP transfers
  slirp, disas: Replace min/max with MIN/MAX macros

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