Google Git
Sign in
qemu / qemu / 741a90038bef13d64e051fb35c4e894ab16d1554
commit741a90038bef13d64e051fb35c4e894ab16d1554[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Thu Oct 31 10:07:54 2019 +0000
committerPeter Maydell <peter.maydell@linaro.org>Thu Oct 31 10:07:54 2019 +0000
tree476985bd02a0c516777d2791a178f9dabf500df5
parentbb335afa610cd87701253cb403979dc07384eae3 [diff]
parent2ecde8b2fb046516a0f2f53fb56b86db92d6fc13 [diff]
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-311019-1' into staging

Fixes to get CI green again

  - fix m68k acceptance tests (Cleber)
  - stop build breakage (Daniel)

# gpg: Signature made Thu 31 Oct 2019 10:00:53 GMT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-next-311019-1:
  Acceptance test: update kernel for m68k/q800 test
  Acceptance test: cancel test if m68k kernel packages goes missing
  tests: fix conditional for disabling XTS test

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