[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 12/47] block: remove superfluous '\n' around error_
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 12/47] block: remove superfluous '\n' around error_report/error_setg |
Date: |
Wed, 4 Mar 2015 20:06:29 +0300 |
From: Gonglei <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
block/archipelago.c | 6 +++---
hw/block/nand.c | 2 +-
qemu-img.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/archipelago.c b/block/archipelago.c
index a8114b5..855655c 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 1882a0c..61d2cec 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 7ac7f56..6d17755 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;
--
2.1.4
- [Qemu-trivial] [PULL 00/47] Trivial patches for 2015-03-04, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 12/47] block: remove superfluous '\n' around error_report/error_setg,
Michael Tokarev <=
- [Qemu-trivial] [PULL 02/47] xen-pt: fix Out-of-bounds read, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 04/47] memsave: Improve and disambiguate error message, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 19/47] xtensa: Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 05/47] smbios: document cmdline options for smbios type 2-4, 17 structures, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 40/47] disas/cris: Fix warning caused by missing 'static' attribute, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 17/47] vhost-scsi: Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 39/47] disas/arm: Fix warnings caused by missing 'static' attribute, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 10/47] qerror.h: Swap definitions that were not in alphabetical order, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 15/47] numa: remove superfluous '\n' around error_setg, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 36/47] gitignore: Ignore new tests, Michael Tokarev, 2015/03/04