projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ec9fe95 32d7d2e)
Merge remote-tracking branch 'remotes/bonzini/nbd-next' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 30 Jun 2014 15:13:32 +0000 (16:13 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 30 Jun 2014 15:13:32 +0000 (16:13 +0100)
commit8954000b9ef88db809d23ce58a3221eacdf3b773
tree63fe2d91cec70d8d4baca8279915a206a0577a36tree | snapshot
parentec9fe956d5c728da770db5ec9bc429080ccb5043commit | diff
parent32d7d2e068756874518f97d5a114e43d8977980bcommit | diff
Merge remote-tracking branch 'remotes/bonzini/nbd-next' into staging

* remotes/bonzini/nbd-next:
  nbd: Handle NBD_OPT_LIST option.
  nbd: Handle fixed new-style clients.
  nbd: Shutdown socket before closing.
  nbd: Don't validate from and len in NBD_CMD_DISC.
  nbd: Don't export a block device with no medium.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Domain: SDK / Emulator;