diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2019-01-23 12:00:14 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2019-01-24 14:16:56 +0000 |
| commit | 77606363094332415995db7e09ed532b8903fdb3 (patch) | |
| tree | 1ee98bf335007278090a1cc8562d90496bd7a045 | |
| parent | 00f426974367a660d5228418b9b5843d969f4ac6 (diff) | |
| download | qemu-77606363094332415995db7e09ed532b8903fdb3.zip qemu-77606363094332415995db7e09ed532b8903fdb3.tar.gz qemu-77606363094332415995db7e09ed532b8903fdb3.tar.bz2 | |
trace: enforce that every trace-events file has a final newline
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 <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20190123120016.4538-3-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/gpio/trace-events | 2 | ||||
| -rw-r--r-- | scripts/tracetool/__init__.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/gpio/trace-events b/hw/gpio/trace-events index cb41a89..5d4dd20 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 0e3c9e1..3478ac9 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('#'): |