vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge I/O 2017/07/18 v1 

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJZbeOZAAoJEL6G67QVEE/fDsMP/2rJAGmR2dKeEOrHy9I4McAN
 o1JXfauzQEL/FYdDCx5E40UPVTaXZ7L9HRAG+hap6DFSG4qw4nrjAqim9VAuRbeA
 yL6KAPPGirKf+1qqlkKnZnqd5B4JCs+kH4HXP8fTtLFZ0KmHcUBpUjUQGYEcLQtv
 HEoHd3pZwKzDNyDa7XZu1TbyF6HbWofgNoN+kErila4pomJJkwpuaO14sB8G3ns2
 SYxoGE3BcCxRDq7SqeYgteNnEvCDJ5s2Gjol0tLVhpzZK8xyvSfJ79Fe5yFJw+gJ
 gX0i8t5/09En1dl/mkjG+L7B+g689JihKAooq1+Jv+lKcKUzanaGP+jfzin+QTJY
 La06K3XZ1nWqrz24MdQrcy/qUdzlxq7fTgVbYZec5nygalb+0cODUc9pMO1WzGaO
 Q8bdbpiHhKF0kEe1cwr16QU1gAkvs0ymyF3dtRmWsXgwCMR8+feKHDu2eqqU1oll
 K5/6KP/+ns+ydeCehf2gsqyCwTkXQeL8BPvhlohadUagQni6eeHaTVJIKqh4yR8j
 f1VeYzSl0GuRc2ZThZO9I9CLO8RCL8P6eF8ESQ9WtrRAJ6j++SiKzsPaANs9GS6X
 +qGRlQXoNt384kOjbYBCDXc9GtDqSMrHxBaYep+bd7eMhd7JXr5o1mDahjZBFO18
 oflfOKDJ0vj7CaejLOie
 =H6mX
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-07-18-1' into staging

Merge I/O 2017/07/18 v1

# gpg: Signature made Tue 18 Jul 2017 11:31:53 BST
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qio-2017-07-18-1:
  io: simplify qio_channel_attach_aio_context

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
Peter Maydell 2017-07-19 09:11:38 +01:00
parent 6887dc6700 8f7168b343
commit 63cb55783c
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
io/channel.c
View File

@ -279,15 +279,9 @@ static void qio_channel_set_aio_fd_handlers(QIOChannel *ioc)
void qio_channel_attach_aio_context(QIOChannel *ioc,
AioContext *ctx)
{
AioContext *old_ctx;
if (ioc->ctx == ctx) {
return;
}
old_ctx = ioc->ctx ? ioc->ctx : iohandler_get_aio_context();
qio_channel_set_aio_fd_handler(ioc, old_ctx, NULL, NULL, NULL);
assert(!ioc->read_coroutine);
assert(!ioc->write_coroutine);
ioc->ctx = ctx;
qio_channel_set_aio_fd_handlers(ioc);
}
void qio_channel_detach_aio_context(QIOChannel *ioc)