Merge remote-tracking branch 'bonzini/nbd-next' into staging
commitde148eb79c7894178a1c2da6f2320b9ce6b0daee
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Nov 2012 14:51:06 +0000 (14 08:51 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Nov 2012 14:51:06 +0000 (14 08:51 -0600)
tree6bca41970bb4b8f83aaee4e02559086838a5cbb6
parent5f580e9411a24b7decc07013edeb8abf8d5ae25c
parentc8969eded252058e90e91f12f75f32aceae46ec9
Merge remote-tracking branch 'bonzini/nbd-next' into staging

* bonzini/nbd-next:
  nbd: fixes to read-only handling
  hmp: add NBD server commands
  nbd: disallow nbd-server-add before nbd-server-start
  nbd: force read-only export for read-only devices
  nbd: fix nbd_server_stop crash when no server was running
  nbd: accept URIs
  nbd: accept relative path to Unix socket
  qemu-nbd: initialize main loop before block layer

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>