summaryrefslogtreecommitdiffstats
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPeter Maydell2018-03-08 12:26:13 +0100
committerPeter Maydell2018-03-08 12:26:14 +0100
commit3ef91576b96de7051dacc2132cddfb486b46e863 (patch)
tree8ae5b6109272dfc7ae177cb086b2afaaac7bd12b /Makefile.objs
parentMerge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff)
parentqio: non-default context for TLS handshake (diff)
downloadqemu-3ef91576b96de7051dacc2132cddfb486b46e863.tar.gz
qemu-3ef91576b96de7051dacc2132cddfb486b46e863.tar.xz
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 'Makefile.objs')
0 files changed, 0 insertions, 0 deletions