]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 109820d 95b1ad7)
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 17 Sep 2012 15:23:20 +0000 (10:23 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 17 Sep 2012 15:23:20 +0000 (10:23 -0500)
* kiszka/queues/slirp:
  slirp: Implement TFTP Blocksize option
  slirp: Remove unused return value of tftp_send_next_block
  slirp: Handle more than 65535 blocks in TFTP transfers
  slirp: improve TFTP performance
  slirp: Fix error reported by static code analysis
  slirp: Remove wrong type casts ins debug statements


Trivial merge
Qemu copy for testing