diff options
| author | Gonglei <arei.gonglei@huawei.com> | 2015-02-25 12:22:27 +0800 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2015-03-10 08:15:33 +0300 |
| commit | eec5eb42f597e652ad3b32d7bf13252966c4e85e (patch) | |
| tree | 96c52d02b5e2cea419248987c5e46014d47e5137 | |
| parent | 3599d46ba23062df580a23a50f8c103070d7365d (diff) | |
block: remove superfluous '\n' around error_report/error_setg
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | block/archipelago.c | 6 | ||||
| -rw-r--r-- | hw/block/nand.c | 2 | ||||
| -rw-r--r-- | qemu-img.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/block/archipelago.c b/block/archipelago.c index a8114b528b..855655c6bd 100644 --- a/block/archipelago.c +++ b/block/archipelago.c @@ -291,7 +291,7 @@ static int qemu_archipelago_init(BDRVArchipelagoState *s) ret = qemu_archipelago_xseg_init(s); if (ret < 0) { - error_report("Cannot initialize XSEG. Aborting...\n"); + error_report("Cannot initialize XSEG. Aborting..."); goto err_exit; } @@ -645,7 +645,7 @@ static int qemu_archipelago_create_volume(Error **errp, const char *volname, target = xseg_get_target(xseg, req); if (!target) { - error_setg(errp, "Cannot get XSEG target.\n"); + error_setg(errp, "Cannot get XSEG target."); goto err_exit; } memcpy(target, volname, targetlen); @@ -889,7 +889,7 @@ static BlockAIOCB *qemu_archipelago_aio_rw(BlockDriverState *bs, return &aio_cb->common; err_exit: - error_report("qemu_archipelago_aio_rw(): I/O Error\n"); + error_report("qemu_archipelago_aio_rw(): I/O Error"); qemu_aio_unref(aio_cb); return NULL; } diff --git a/hw/block/nand.c b/hw/block/nand.c index 1882a0cbeb..61d2cec032 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -393,7 +393,7 @@ static void nand_realize(DeviceState *dev, Error **errp) nand_init_2048(s); break; default: - error_setg(errp, "Unsupported NAND block size %#x\n", + error_setg(errp, "Unsupported NAND block size %#x", 1 << s->page_shift); return; } diff --git a/qemu-img.c b/qemu-img.c index 7ac7f56c5d..6d17755f49 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1645,7 +1645,7 @@ static int img_convert(int argc, char **argv) if (skip_create) { int64_t output_sectors = blk_nb_sectors(out_blk); if (output_sectors < 0) { - error_report("unable to get output image length: %s\n", + error_report("unable to get output image length: %s", strerror(-output_sectors)); ret = -1; goto out; |