Failed in applying to current master (
apply log)
Maintainers: Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>
include/block/nbd.h | 142 ++++++++++++++++++---------
nbd/nbd-internal.h | 3 +-
block/nbd.c | 44 ++++++---
nbd/client-connection.c | 4 +-
nbd/client.c | 22 +++--
nbd/common.c | 12 ++-
nbd/server.c | 172 ++++++++++++++++++++-------------
qemu-nbd.c | 4 +-
tests/qemu-iotests/common.rc | 9 +-
block/trace-events | 2 +-
nbd/trace-events | 14 +--
tests/qemu-iotests/tests/nbd-multiconn | 2 +-
12 files changed, 280 insertions(+), 150 deletions(-)