diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-02 09:46:45 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-02 09:46:45 -0500 |
| commit | cefc898806e0346eef87d15ddaac9475b57b7d84 (patch) | |
| tree | ce4a6312d22ba96fe33fd4c5f1f2306807a07422 /qom/object.c | |
| parent | aba8e41e8666e4c0287cef1f6298985d4e03211d (diff) | |
| parent | 86073017e384b65a4b568da25e5873fd2e5e4db5 (diff) | |
| download | qemu-cefc898806e0346eef87d15ddaac9475b57b7d84.tar.gz | |
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 'qom/object.c')
0 files changed, 0 insertions, 0 deletions