Google Git
Sign in
qemu / qemu / 673652a785efb5f7da342b49c80a1abf033c82a7
commit673652a785efb5f7da342b49c80a1abf033c82a7[log] [tgz]
authorPaolo Bonzini <pbonzini@redhat.com>Sat Oct 26 15:36:22 2019 +0200
committerPaolo Bonzini <pbonzini@redhat.com>Sat Oct 26 15:38:02 2019 +0200
tree2f277cce43b50e85cca36d7354ba2dd7ffd14d41
parent856bd2c28e108ad0eb909bbbf3774f6f8bd7c2d4 [diff]
parentdf84f17d1beabbb2aca39be18b21afc277cd6754 [diff]
Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
tree: 2f277cce43b50e85cca36d7354ba2dd7ffd14d41
  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. po/
  29. python/
  30. qapi/
  31. qga/
  32. qobject/
  33. qom/
  34. replay/
  35. roms/
  36. scripts/
  37. scsi/
  38. stubs/
  39. target/
  40. tcg/
  41. tests/
  42. trace/
  43. ui/
  44. util/
  45. capstone
  46. dtc
  47. slirp
  48. .cirrus.yml
  49. .dir-locals.el
  50. .editorconfig
  51. .exrc
  52. .gdbinit
  53. .gitignore
  54. .gitlab-ci.yml
  55. .gitmodules
  56. .gitpublish
  57. .mailmap
  58. .patchew.yml
  59. .shippable.yml
  60. .travis.yml
  61. arch_init.c
  62. balloon.c
  63. block.c
  64. blockdev-nbd.c
  65. blockdev.c
  66. blockjob.c
  67. bootdevice.c
  68. bt-host.c
  69. bt-vhci.c
  70. Changelog
  71. CODING_STYLE.rst
  72. configure
  73. COPYING
  74. COPYING.LIB
  75. cpus-common.c
  76. cpus.c
  77. device-hotplug.c
  78. device_tree.c
  79. disas.c
  80. dma-helpers.c
  81. exec.c
  82. gdbstub.c
  83. gitdm.config
  84. hmp-commands-info.hx
  85. hmp-commands.hx
  86. ioport.c
  87. iothread.c
  88. job-qmp.c
  89. job.c
  90. Kconfig.host
  91. LICENSE
  92. MAINTAINERS
  93. Makefile
  94. Makefile.objs
  95. Makefile.target
  96. memory.c
  97. memory_ldst.inc.c
  98. memory_mapping.c
  99. module-common.c
  100. os-posix.c
  101. os-win32.c
  102. qdev-monitor.c
  103. qemu-bridge-helper.c
  104. qemu-deprecated.texi
  105. qemu-doc.texi
  106. qemu-edid.c
  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. qtest.c
  124. README.rst
  125. replication.c
  126. replication.h
  127. rules.mak
  128. thunk.c
  129. tpm.c
  130. trace-events
  131. VERSION
  132. version.rc
  133. vl.c