]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2954525 63d2960)
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Nov 2012 15:27:24 +0000 (09:27 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Nov 2012 15:27:24 +0000 (09:27 -0600)
* 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>
1  2 
qemu-options.hx patch | diff1 | diff2 | blob | history

diff --cc qemu-options.hx
Simple merge
QEMU mirror