3 files changed, 10 insertions, 9 deletions
diff --git a/src/vnet/devices/virtio/device.c b/src/vnet/devices/virtio/device.c
index 56c0a98491e..1f1abfded77 100644
--- a/src/vnet/devices/virtio/device.c
+++ b/src/vnet/devices/virtio/device.c
@@ -86,14 +86,16 @@ format_virtio_tx_trace (u8 * s, va_list * va)
   virtio_tx_trace_t *t = va_arg (*va, virtio_tx_trace_t *);
   u32 indent = format_get_indent (s);
 
-  s = format (s, "%U ", format_generic_header_offset, &t->gho);
-  s = format (s, "%Ubuffer 0x%x: %U",
+  s = format (s, "%Ubuffer 0x%x: %U\n",
 	      format_white_space, indent,
 	      t->buffer_index, format_vnet_buffer, &t->buffer);
-
-  s = format (s, "\n%U%U", format_white_space, indent,
-	      format_ethernet_header_with_length, t->buffer.pre_data,
-	      sizeof (t->buffer.pre_data));
+  s =
+    format (s, "%U%U\n", format_white_space, indent,
+	    format_generic_header_offset, &t->gho);
+  s =
+    format (s, "%U%U", format_white_space, indent,
+	    format_ethernet_header_with_length, t->buffer.pre_data,
+	    sizeof (t->buffer.pre_data));
   return s;
 }
 
diff --git a/src/vnet/gso/hdr_offset_parser.h b/src/vnet/gso/hdr_offset_parser.h
index 8fa5cad56d1..bfe04217fa2 100644
--- a/src/vnet/gso/hdr_offset_parser.h
+++ b/src/vnet/gso/hdr_offset_parser.h
@@ -82,7 +82,6 @@ format_generic_header_offset (u8 * s, va_list * args)
 {
   generic_header_offset_t *gho = va_arg (*args, generic_header_offset_t *);
 
-  s = format (s, "\n\t");
   if (gho->gho_flags & GHO_F_TUNNEL)
     {
       if (gho->gho_flags & GHO_F_VXLAN_TUNNEL)
diff --git a/src/vnet/gso/node.c b/src/vnet/gso/node.c
index ddbcb996b5f..23213a76b0f 100644
--- a/src/vnet/gso/node.c
+++ b/src/vnet/gso/node.c
@@ -42,14 +42,14 @@ format_gso_trace (u8 * s, va_list * args)
 
   if (t->flags & VNET_BUFFER_F_GSO)
     {
-      s = format (s, "gso_sz %d gso_l4_hdr_sz %d %U",
+      s = format (s, "gso_sz %d gso_l4_hdr_sz %d\n%U",
 		  t->gso_size, t->gso_l4_hdr_sz, format_generic_header_offset,
 		  &t->gho);
     }
   else
     {
       s =
-	format (s, "non-gso buffer %U", format_generic_header_offset,
+	format (s, "non-gso buffer\n%U", format_generic_header_offset,
 		&t->gho);
     }