Commit 82d73014 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block/nbd: Drop trailing "." in error messages 



Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent e5b77eec

block/nbd.c

+2 −2
Original line number Diff line number Diff line
@@ -200,9 +200,9 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QemuOpts *opts, Error **errp) 


    if (!s->path == !s->host) {

        if (s->path) {

            error_setg(errp, "path and host may not be used at the same time.");

            error_setg(errp, "path and host may not be used at the same time");

        } else {

            error_setg(errp, "one of path and host must be specified.");

            error_setg(errp, "one of path and host must be specified");

        }

        return NULL;

    }

tests/qemu-iotests/051.out

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ Testing: -drive driver=file 
QEMU_PROG: -drive driver=file: The 'file' block driver requires a file name



Testing: -drive driver=nbd

QEMU_PROG: -drive driver=nbd: one of path and host must be specified.

QEMU_PROG: -drive driver=nbd: one of path and host must be specified



Testing: -drive driver=raw

QEMU_PROG: -drive driver=raw: Can't use 'raw' as a block driver for the protocol level
@@ -231,7 +231,7 @@ Testing: -drive file.driver=file 
QEMU_PROG: -drive file.driver=file: The 'file' block driver requires a file name



Testing: -drive file.driver=nbd

QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified.

QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified



Testing: -drive file.driver=raw

QEMU_PROG: -drive file.driver=raw: Can't use 'raw' as a block driver for the protocol level

tests/qemu-iotests/051.pc.out

+2 −2
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ Testing: -drive driver=file 
QEMU_PROG: -drive driver=file: The 'file' block driver requires a file name



Testing: -drive driver=nbd

QEMU_PROG: -drive driver=nbd: one of path and host must be specified.

QEMU_PROG: -drive driver=nbd: one of path and host must be specified



Testing: -drive driver=raw

QEMU_PROG: -drive driver=raw: Can't use 'raw' as a block driver for the protocol level
@@ -325,7 +325,7 @@ Testing: -drive file.driver=file 
QEMU_PROG: -drive file.driver=file: The 'file' block driver requires a file name



Testing: -drive file.driver=nbd

QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified.

QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified



Testing: -drive file.driver=raw

QEMU_PROG: -drive file.driver=raw: Can't use 'raw' as a block driver for the protocol level