[libvirt] [PATCH v2] Remove new lines from debug messages
Jiri Denemark
jdenemar at redhat.com
Wed Nov 4 12:15:38 UTC 2015
On Thu, Oct 29, 2015 at 10:11:29 +0100, Andrea Bolognani wrote:
> On Tue, 2015-10-27 at 19:26 +0100, Jiri Denemark wrote:
> > VIR_DEBUG will automatically add a new line to the message, having
> > "\n"
> > at the end or at the beginning of the message results in empty lines.
> >
> > Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> > ---
> > src/nwfilter/nwfilter_dhcpsnoop.c | 2 +-
> > src/nwfilter/nwfilter_gentech_driver.c | 2 +-
> > src/nwfilter/nwfilter_learnipaddr.c | 10 +++++-----
> > src/rpc/virnetsocket.c | 2 +-
> > src/util/virfile.c | 2 +-
> > src/util/virhash.c | 2 +-
> > src/util/virnetdevmacvlan.c | 26 ++++++++++++------------
> > src/util/virprocess.c | 2 +-
> > src/xen/xend_internal.c | 2 +-
> > tests/virhostdevtest.c | 36 +++++++++++++++++-------
> > ----------
> > tests/virnetsockettest.c | 2 +-
> > tests/virtimetest.c | 2 +-
> > 12 files changed, 45 insertions(+), 45 deletions(-)
>
> I believe you missed these:
>
> ---8<---
> diff --git a/src/libvirt.c b/src/libvirt.c
> index 2602dde..25a0040 100644
> --- a/src/libvirt.c
> +++ b/src/libvirt.c
> @@ -1125,7 +1125,7 @@ do_open(const char *name,
> " server %s\n"
> " user %s\n"
> " port %d\n"
> - " path %s\n",
> + " path %s",
> alias ? alias : name,
> NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->server),
> NULLSTR(ret->uri->user), ret->uri->port,
> diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c
> b/src/nwfilter/nwfilter_dhcpsnoop.c
> index bd6d25f..7dbf467 100644
> --- a/src/nwfilter/nwfilter_dhcpsnoop.c
> +++ b/src/nwfilter/nwfilter_dhcpsnoop.c
> @@ -1509,7 +1509,7 @@ virNWFilterDHCPSnoopThread(void *req0)
> if (last_displayed_queue - time(0) > 10) {
> last_displayed_queue = time(0);
> VIR_WARN("Worker thread for interface '%s' has a "
> - "job queue that is too long\n",
> + "job queue that is too long",
> req->ifname);
> }
> continue;
> --->9---
>
> and since you're changing warning messages as well, you
> should probably include that information in the commit
> message.
>
> ACK with that fixed.
Fixed and pushed, thanks.
Jirka
More information about the libvir-list
mailing list