[Qemu-devel] [PULL v2 00/11] NBD patches

[Qemu-devel] [PULL v2 00/11] NBD patches

[Eric Blake]

The following changes since commit 94c56652b9079cfb9d560a6dde7ecb15eb9ef9c7:

  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2017-07-10 14:06:49 +0100)

are available in the git repository at:

  git://repo.or.cz/qemu/ericb.git tags/pull-nbd-2017-07-10-v2

for you to fetch changes up to 9588463e747706ffbaf6f4600b5efea2779bc26f:

  nbd: use generic trace subsystem instead of TRACE macro (2017-07-10 09:57:24 -0500)

----------------------------------------------------------------
nbd patches for 2017-07-10

- Eric Blake: MAINTAINERS: Promote NBD to supported, with new maintainer
- Vladimir Sementsov-Ogievskiy: [00/10] nbd refactoring part 2

----------------------------------------------------------------

v2: fixed cover letter, drop Paolo's unused T: in MAINTAINERS
[only sending the modified patch]

Eric Blake (1):
      MAINTAINERS: Promote NBD to supported, with new maintainer

Vladimir Sementsov-Ogievskiy (10):
      nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT
      nbd/server: refactor nbd_negotiate
      nbd/server: use errp instead of LOG
      nbd/server: add errp to nbd_send_reply()
      nbd/common: nbd_tls_handshake: remove extra TRACE
      nbd/client: refactor TRACE of NBD_MAGIC
      nbd/server: fix TRACE in nbd_negotiate_send_rep_len
      nbd/server: rename clientflags var in nbd_negotiate_options
      nbd: refactor tracing
      nbd: use generic trace subsystem instead of TRACE macro

 nbd/nbd-internal.h |  19 ---
 nbd/client.c       |  81 +++++------
 nbd/common.c       |   4 +-
 nbd/server.c       | 401 +++++++++++++++++++++++++++++------------------------
 MAINTAINERS        |  21 +--
 Makefile.objs      |   1 +
 nbd/trace-events   |  56 ++++++++
 7 files changed, 323 insertions(+), 260 deletions(-)
 create mode 100644 nbd/trace-events

Eric Blake (1):
  MAINTAINERS: Promote NBD to supported, with new maintainer

Vladimir Sementsov-Ogievskiy (10):
  nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT
  nbd/server: refactor nbd_negotiate
  nbd/server: use errp instead of LOG
  nbd/server: add errp to nbd_send_reply()
  nbd/common: nbd_tls_handshake: remove extra TRACE
  nbd/client: refactor TRACE of NBD_MAGIC
  nbd/server: fix TRACE in nbd_negotiate_send_rep_len
  nbd/server: rename clientflags var in nbd_negotiate_options
  nbd: refactor tracing
  nbd: use generic trace subsystem instead of TRACE macro

 nbd/nbd-internal.h |  19 ---
 nbd/client.c       |  81 +++++------
 nbd/common.c       |   4 +-
 nbd/server.c       | 401 +++++++++++++++++++++++++++++------------------------
 MAINTAINERS        |  21 +--
 Makefile.objs      |   1 +
 nbd/trace-events   |  56 ++++++++
 7 files changed, 323 insertions(+), 260 deletions(-)
 create mode 100644 nbd/trace-events

-- 
2.9.4

[Qemu-devel] [PULL v2 01/11] MAINTAINERS: Promote NBD to supported, with new maintainer

[Eric Blake]

We are promising more than just odd fixes, and Paolo is hoping
to offload the pull requests to me.  Also, enough of NBD is related
to the block layer that it is worth including qemu-block on patches.

While at it, include blockdev-nbd.c and qemu-nbd.texi in the set
of maintained files.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707182151.29872-1-eblake@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
---
 MAINTAINERS | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4e17216..9529c94 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1348,15 +1348,6 @@ W: http://info.iet.unipi.it/~luigi/netmap/
 S: Maintained
 F: net/netmap.c

-Network Block Device (NBD)
-M: Paolo Bonzini <pbonzini@redhat.com>
-S: Odd Fixes
-F: block/nbd*
-F: nbd/
-F: include/block/nbd*
-F: qemu-nbd.c
-T: git git://github.com/bonzini/qemu.git nbd-next
-
 NUMA
 M: Eduardo Habkost <ehabkost@redhat.com>
 S: Maintained
@@ -1710,6 +1701,18 @@ S: Supported
 F: block/iscsi.c
 F: block/iscsi-opts.c

+Network Block Device (NBD)
+M: Eric Blake <eblake@redhat.com>
+M: Paolo Bonzini <pbonzini@redhat.com>
+L: qemu-block@nongnu.org
+S: Maintained
+F: block/nbd*
+F: nbd/
+F: include/block/nbd*
+F: qemu-nbd.*
+F: blockdev-nbd.c
+T: git git://repo.or.cz/qemu/ericb.git nbd
+
 NFS
 M: Jeff Cody <jcody@redhat.com>
 M: Peter Lieven <pl@kamp.de>
-- 
2.9.4

Re: [Qemu-devel] [PULL v2 00/11] NBD patches

[Peter Maydell]

On 10 July 2017 at 16:04, Eric Blake <eblake@redhat.com> wrote:
> The following changes since commit 94c56652b9079cfb9d560a6dde7ecb15eb9ef9c7:
>
>   Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2017-07-10 14:06:49 +0100)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/ericb.git tags/pull-nbd-2017-07-10-v2
>
> for you to fetch changes up to 9588463e747706ffbaf6f4600b5efea2779bc26f:
>
>   nbd: use generic trace subsystem instead of TRACE macro (2017-07-10 09:57:24 -0500)
>
> ----------------------------------------------------------------
> nbd patches for 2017-07-10
>
> - Eric Blake: MAINTAINERS: Promote NBD to supported, with new maintainer
> - Vladimir Sementsov-Ogievskiy: [00/10] nbd refactoring part 2
>
> ----------------------------------------------------------------
>

Applied, thanks.

-- PMM