commit | cefc898806e0346eef87d15ddaac9475b57b7d84 | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Mon Apr 02 09:46:45 2012 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Mon Apr 02 09:46:45 2012 -0500 |
tree | ce4a6312d22ba96fe33fd4c5f1f2306807a07422 | |
parent | aba8e41e8666e4c0287cef1f6298985d4e03211d [diff] | |
parent | 86073017e384b65a4b568da25e5873fd2e5e4db5 [diff] |
Merge remote-tracking branch 'kiszka/queues/slirp' into staging * kiszka/queues/slirp: slirp: Signal free input buffer space to io-thread w32/slirp: Undefine error constants before their redefinition slirp: use socket_set_nonblock slirp: clean up conflicts with system headers