]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
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)
* 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>

Trivial merge