| Message ID | 1399937716-6086-2-git-send-email-kroosec@gmail.com |
|---|---|
| State | New |
| Headers | show |
Il 13/05/2014 01:35, Hani Benhabiles ha scritto: > Signed-off-by: Hani Benhabiles <hani@linux.com> > --- > nbd.c | 2 +- > qemu-nbd.c | 2 +- > qemu-nbd.texi | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/nbd.c b/nbd.c > index e5084b6..e0d032c 100644 > --- a/nbd.c > +++ b/nbd.c > @@ -306,7 +306,7 @@ static int nbd_send_negotiate(NBDClient *client) > [ 8 .. 15] magic (NBD_CLIENT_MAGIC) > [16 .. 23] size > [24 .. 25] server flags (0) > - [24 .. 27] export flags > + [26 .. 27] export flags > [28 .. 151] reserved (0) > > Negotiation header with options, part 1: > diff --git a/qemu-nbd.c b/qemu-nbd.c > index f70e4b0..cd6bd50 100644 > --- a/qemu-nbd.c > +++ b/qemu-nbd.c > @@ -294,7 +294,7 @@ static void *nbd_client_thread(void *arg) > fd = open(device, O_RDWR); > if (fd < 0) { > /* Linux-only, we can use %m in printf. */ > - fprintf(stderr, "Failed to open %s: %m", device); > + fprintf(stderr, "Failed to open %s: %m\n", device); > goto out_socket; > } > > diff --git a/qemu-nbd.texi b/qemu-nbd.texi > index 0a7e013..46fd483 100644 > --- a/qemu-nbd.texi > +++ b/qemu-nbd.texi > @@ -15,7 +15,7 @@ Export QEMU disk image using NBD protocol. > @item @var{filename} > is a disk image filename > @item -p, --port=@var{port} > - port to listen on (default @samp{1024}) > + port to listen on (default @samp{10809}) > @item -o, --offset=@var{offset} > offset into the image > @item -b, --bind=@var{iface} > Acked-by: Paolo Bonzini <pbonzini@redhat.com>
On Tue, May 13, 2014 at 12:35:16AM +0100, Hani Benhabiles wrote: > Signed-off-by: Hani Benhabiles <hani@linux.com> > --- > nbd.c | 2 +- > qemu-nbd.c | 2 +- > qemu-nbd.texi | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Applied to -trivial, thanks! /mjt
diff --git a/nbd.c b/nbd.c index e5084b6..e0d032c 100644 --- a/nbd.c +++ b/nbd.c @@ -306,7 +306,7 @@ static int nbd_send_negotiate(NBDClient *client) [ 8 .. 15] magic (NBD_CLIENT_MAGIC) [16 .. 23] size [24 .. 25] server flags (0) - [24 .. 27] export flags + [26 .. 27] export flags [28 .. 151] reserved (0) Negotiation header with options, part 1: diff --git a/qemu-nbd.c b/qemu-nbd.c index f70e4b0..cd6bd50 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -294,7 +294,7 @@ static void *nbd_client_thread(void *arg) fd = open(device, O_RDWR); if (fd < 0) { /* Linux-only, we can use %m in printf. */ - fprintf(stderr, "Failed to open %s: %m", device); + fprintf(stderr, "Failed to open %s: %m\n", device); goto out_socket; } diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 0a7e013..46fd483 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -15,7 +15,7 @@ Export QEMU disk image using NBD protocol. @item @var{filename} is a disk image filename @item -p, --port=@var{port} - port to listen on (default @samp{1024}) + port to listen on (default @samp{10809}) @item -o, --offset=@var{offset} offset into the image @item -b, --bind=@var{iface}
Signed-off-by: Hani Benhabiles <hani@linux.com> --- nbd.c | 2 +- qemu-nbd.c | 2 +- qemu-nbd.texi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)