diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-19 09:27:24 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-19 09:27:24 -0600 |
| commit | a36e9561283e91a17cbc451835b99db35424c34b (patch) | |
| tree | f46f867344113793565efca2b3dd8b1572fec8e5 /json-streamer.c | |
| parent | 2954525b3b8474fa1d637dd3822ab35c95596856 (diff) | |
| parent | 63d2960bc46f63137d7fbd5ff56b81e54710d195 (diff) | |
| download | qemu-a36e9561283e91a17cbc451835b99db35424c34b.tar.gz | |
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
* kiszka/queues/slirp:
slirp: Add domain-search option to slirp's DHCP server
slirp: Don't crash on packets from 0.0.0.0/8.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'json-streamer.c')
0 files changed, 0 insertions, 0 deletions