[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] trace: enforce that every trace-events file has
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 2/6] trace: enforce that every trace-events file has a final newline |
Date: |
Wed, 30 Jan 2019 11:18:13 +0800 |
From: Daniel P. Berrangé <address@hidden>
When generating the trace-events-all file, the build system simply
concatenates all the individual trace-events files. If any one of those
files does not have a final newline, the printf format string will have
the contents of the first line of the next file appended to it, which is
usually a '#' comment.
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/gpio/trace-events | 2 +-
scripts/tracetool/__init__.py | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/gpio/trace-events b/hw/gpio/trace-events
index cb41a89756..5d4dd200c2 100644
--- a/hw/gpio/trace-events
+++ b/hw/gpio/trace-events
@@ -4,4 +4,4 @@
nrf51_gpio_read(uint64_t offset, uint64_t r) "offset 0x%" PRIx64 " value 0x%"
PRIx64
nrf51_gpio_write(uint64_t offset, uint64_t value) "offset 0x%" PRIx64 " value
0x%" PRIx64
nrf51_gpio_set(int64_t line, int64_t value) "line %" PRIi64 " value %" PRIi64
-nrf51_gpio_update_output_irq(int64_t line, int64_t value) "line %" PRIi64 "
value %" PRIi64
\ No newline at end of file
+nrf51_gpio_update_output_irq(int64_t line, int64_t value) "line %" PRIi64 "
value %" PRIi64
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 0e3c9e146c..3478ac93ab 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -350,6 +350,8 @@ def read_events(fobj, fname):
events = []
for lineno, line in enumerate(fobj, 1):
+ if line[-1] != '\n':
+ raise ValueError("%s does not end with a new line" % fname)
if not line.strip():
continue
if line.lstrip().startswith('#'):
--
2.20.1
- [Qemu-devel] [PULL 0/6] Tracing patches, Stefan Hajnoczi, 2019/01/29
- [Qemu-devel] [PULL 1/6] display: ensure qxl log_buf is a nul terminated string, Stefan Hajnoczi, 2019/01/29
- [Qemu-devel] [PULL 2/6] trace: enforce that every trace-events file has a final newline,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 3/6] trace: forbid use of %m in trace event format strings, Stefan Hajnoczi, 2019/01/29
- [Qemu-devel] [PULL 4/6] trace: add ability to do simple printf logging via systemtap, Stefan Hajnoczi, 2019/01/29
- [Qemu-devel] [PULL 5/6] trace: improve runstate tracing, Stefan Hajnoczi, 2019/01/29
- [Qemu-devel] [PULL 6/6] trace: rerun tracetool after ./configure changes, Stefan Hajnoczi, 2019/01/29
- Re: [Qemu-devel] [PULL 0/6] Tracing patches, Peter Maydell, 2019/01/31