summary refs log tree commit diff stats
path: root/include/exec/memory-internal.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-08 11:26:13 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-08 11:26:14 +0000
commit3ef91576b96de7051dacc2132cddfb486b46e863 (patch)
tree8ae5b6109272dfc7ae177cb086b2afaaac7bd12b /include/exec/memory-internal.h
parent854a4436dd313eaeb51c275d00526d60437915d2 (diff)
parent1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58 (diff)
downloadfocaccia-qemu-3ef91576b96de7051dacc2132cddfb486b46e863.tar.gz
focaccia-qemu-3ef91576b96de7051dacc2132cddfb486b46e863.zip
Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging
# gpg: Signature made Wed 07 Mar 2018 11:24:41 GMT
# gpg:                using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/qio-next-pull-request:
  qio: non-default context for TLS handshake
  qio: non-default context for async conn
  qio: non-default context for threaded qtask
  qio: store gsources for net listeners
  qio: introduce qio_channel_add_watch_{full|source}
  qio: rename qio_task_thread_result

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/memory-internal.h')
0 files changed, 0 insertions, 0 deletions