Google Git
Sign in
fuchsia / third_party / qemu / 64a3b4d53d344bd494bcf969ee89467b560c7ce0
commit64a3b4d53d344bd494bcf969ee89467b560c7ce0[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Fri Apr 03 12:59:29 2020 +0100
committerPeter Maydell <peter.maydell@linaro.org>Fri Apr 03 12:59:29 2020 +0100
tree6fc8f4031e84fe8e9014cd5df8849a21e6127d5d
parentf2a8261110c32c4dccd84e774d8dd7a0524e00fb [diff]
parent5c30ef937f522a65df78dd9f496483fe4fc44d5e [diff]
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200403' into staging

- fix cpu number reporting in the stsi 3.2.2 block for kvm
- fix migration for old machines with odd ram sizes

# gpg: Signature made Fri 03 Apr 2020 10:11:06 BST
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [marginal]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20200403:
  vl/s390x: fixup ram sizes for compat machines
  s390x: kvm: Fix number of cpu reports for stsi 3.2.2

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