[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] trace: improve error reporting when parsing si
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 08/10] trace: improve error reporting when parsing simpletrace header |
Date: |
Wed, 1 Feb 2017 13:44:51 +0000 |
From: "Daniel P. Berrange" <address@hidden>
When loading a simpletrace binary file we just report
"Not a valid trace file!" which is not very helpful. Report
exactly which field we found to be invalid.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
scripts/simpletrace.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index 4ca903d..4c99004 100755
--- a/scripts/simpletrace.py
+++ b/scripts/simpletrace.py
@@ -73,10 +73,14 @@ def read_record(edict, idtoname, fobj):
def read_trace_header(fobj):
"""Read and verify trace file header"""
header = read_header(fobj, log_header_fmt)
- if header is None or \
- header[0] != header_event_id or \
- header[1] != header_magic:
+ if header is None:
raise ValueError('Not a valid trace file!')
+ if header[0] != header_event_id:
+ raise ValueError('Not a valid trace file, header id %d != %d' %
+ (header[0], header_event_id))
+ if header[1] != header_magic:
+ raise ValueError('Not a valid trace file, header magic %d != %d' %
+ (header[1], header_magic))
log_version = header[2]
if log_version not in [0, 2, 3, 4]:
--
2.9.3
- [Qemu-devel] [PULL 00/10] Tracing patches, Stefan Hajnoczi, 2017/02/01
- [Qemu-devel] [PULL 01/10] make: move top level dir to end of include search path, Stefan Hajnoczi, 2017/02/01
- [Qemu-devel] [PULL 02/10] trace: move hw/block/dataplane events to correct subdir, Stefan Hajnoczi, 2017/02/01
- [Qemu-devel] [PULL 03/10] trace: move hw/xen events to correct subdir, Stefan Hajnoczi, 2017/02/01
- [Qemu-devel] [PULL 04/10] trace: move hw/i386/xen events to correct subdir, Stefan Hajnoczi, 2017/02/01
- [Qemu-devel] [PULL 05/10] trace: move setting of group name into Makefiles, Stefan Hajnoczi, 2017/02/01
- [Qemu-devel] [PULL 07/10] trace: update docs to reflect new code generation approach, Stefan Hajnoczi, 2017/02/01
- [Qemu-devel] [PULL 08/10] trace: improve error reporting when parsing simpletrace header,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 06/10] trace: switch to modular code generation for sub-directories, Stefan Hajnoczi, 2017/02/01
- [Qemu-devel] [PULL 09/10] qapi: add missing trace_visit_type_enum() call, Stefan Hajnoczi, 2017/02/01
- [Qemu-devel] [PULL 10/10] trace: clean up trace-events files, Stefan Hajnoczi, 2017/02/01
- Re: [Qemu-devel] [PULL 00/10] Tracing patches, Peter Maydell, 2017/02/02