[Qemu-devel] [PATCH v2] trivial: remove trailing newline from error_report

[Qemu-devel] [PATCH v2] trivial: remove trailing newline from error_report

[John Snow]

Minor cleanup.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 hw/ide/ahci.c      | 2 +-
 hw/vfio/platform.c | 2 +-
 net/tap-linux.c    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index b4b65c1..8478d25 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -885,7 +885,7 @@ static int ahci_populate_sglist(AHCIDevice *ad, QEMUSGList *sglist,
                             prdt_tbl_entry_size(&tbl[i]));
             if (sglist->size > INT32_MAX) {
                 error_report("AHCI Physical Region Descriptor Table describes "
-                             "more than 2 GiB.\n");
+                             "more than 2 GiB.");
                 qemu_sglist_destroy(sglist);
                 r = -1;
                 goto out;
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 5c678b9..932d631 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -225,7 +225,7 @@ static void vfio_intp_interrupt(VFIOINTp *intp)
 
     ret = event_notifier_test_and_clear(&intp->interrupt);
     if (!ret) {
-        error_report("Error when clearing fd=%d (ret = %d)\n",
+        error_report("Error when clearing fd=%d (ret = %d)",
                      event_notifier_get_fd(&intp->interrupt), ret);
     }
 
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 394f2a6..5bd9d21 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -211,7 +211,7 @@ int tap_fd_set_vnet_le(int fd, int is_le)
         return -errno;
     }
 
-    error_report("TUNSETVNETLE ioctl() failed: %s.\n", strerror(errno));
+    error_report("TUNSETVNETLE ioctl() failed: %s.", strerror(errno));
     abort();
 }
 
@@ -228,7 +228,7 @@ int tap_fd_set_vnet_be(int fd, int is_be)
         return -errno;
     }
 
-    error_report("TUNSETVNETBE ioctl() failed: %s.\n", strerror(errno));
+    error_report("TUNSETVNETBE ioctl() failed: %s.", strerror(errno));
     abort();
 }
 
-- 
2.1.0

Re: [Qemu-devel] [PATCH v2] trivial: remove trailing newline from error_report

[Gonglei]

On 2015/6/30 4:56, John Snow wrote:
> Minor cleanup.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  hw/ide/ahci.c      | 2 +-
>  hw/vfio/platform.c | 2 +-
>  net/tap-linux.c    | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)

Reviewed-by: Gonglei <arei.gonglei@huawei.com>

Re: [Qemu-devel] [PATCH v2] trivial: remove trailing newline from error_report

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 610 bytes --]

On Mon, Jun 29, 2015 at 04:56:26PM -0400, John Snow wrote:
> Minor cleanup.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  hw/ide/ahci.c      | 2 +-
>  hw/vfio/platform.c | 2 +-
>  net/tap-linux.c    | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Laszlo Ersek suggested a compile-time check (e.g. BUILD_BUG_ON()).  Have
you looked into this?

Perhaps something along the lines of:

BUILD_BUG_ON(__builtin_constant_p(fmt) &&
             __builtin_strlen(fmt) > 0 &&
	     fmt[__builtin_strlen(fmt) - 1] == '\n')

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

Re: [Qemu-devel] [PATCH v2] trivial: remove trailing newline from error_report

[John Snow]

On 07/09/2015 06:26 AM, Stefan Hajnoczi wrote:
> On Mon, Jun 29, 2015 at 04:56:26PM -0400, John Snow wrote:
>> Minor cleanup.
>> 
>> Signed-off-by: John Snow <jsnow@redhat.com> --- hw/ide/ahci.c
>> | 2 +- hw/vfio/platform.c | 2 +- net/tap-linux.c    | 4 ++-- 3
>> files changed, 4 insertions(+), 4 deletions(-)
> 
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> 
> Laszlo Ersek suggested a compile-time check (e.g. BUILD_BUG_ON()).
> Have you looked into this?
> 
> Perhaps something along the lines of:
> 
> BUILD_BUG_ON(__builtin_constant_p(fmt) && __builtin_strlen(fmt) > 0
> && fmt[__builtin_strlen(fmt) - 1] == '\n')
> 

ping for 2.5; I don't think this ever made it in.

Re: [Qemu-devel] [PATCH v2] trivial: remove trailing newline from error_report

[Stefan Hajnoczi]

On Mon, Aug 24, 2015 at 08:19:34PM -0400, John Snow wrote:
> 
> 
> On 07/09/2015 06:26 AM, Stefan Hajnoczi wrote:
> > On Mon, Jun 29, 2015 at 04:56:26PM -0400, John Snow wrote:
> >> Minor cleanup.
> >> 
> >> Signed-off-by: John Snow <jsnow@redhat.com> --- hw/ide/ahci.c
> >> | 2 +- hw/vfio/platform.c | 2 +- net/tap-linux.c    | 4 ++-- 3
> >> files changed, 4 insertions(+), 4 deletions(-)
> > 
> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> > 
> > Laszlo Ersek suggested a compile-time check (e.g. BUILD_BUG_ON()).
> > Have you looked into this?
> > 
> > Perhaps something along the lines of:
> > 
> > BUILD_BUG_ON(__builtin_constant_p(fmt) && __builtin_strlen(fmt) > 0
> > && fmt[__builtin_strlen(fmt) - 1] == '\n')
> > 
> 
> ping for 2.5; I don't think this ever made it in.

CCing Michael explicitly since this is for the trivial tree

Re: [Qemu-devel] [PATCH v2] trivial: remove trailing newline from error_report

[Michael Tokarev]

29.06.2015 23:56, John Snow wrote:
> Minor cleanup.

Finally applied to -trivial.  Thank you!

/mjt