diff options
| author | Anthony Liguori | 2012-04-02 16:46:45 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-04-02 16:46:45 +0200 |
| commit | cefc898806e0346eef87d15ddaac9475b57b7d84 (patch) | |
| tree | ce4a6312d22ba96fe33fd4c5f1f2306807a07422 /include/qemu/object.h | |
| parent | Merge remote-tracking branch 'stefanha/tracing' into staging (diff) | |
| parent | slirp: Signal free input buffer space to io-thread (diff) | |
| download | qemu-cefc898806e0346eef87d15ddaac9475b57b7d84.tar.gz qemu-cefc898806e0346eef87d15ddaac9475b57b7d84.tar.xz qemu-cefc898806e0346eef87d15ddaac9475b57b7d84.zip | |
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
Diffstat (limited to 'include/qemu/object.h')
0 files changed, 0 insertions, 0 deletions