[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 47/47] trace: improve error reporting when parsin
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v2 47/47] trace: improve error reporting when parsing simpletrace header |
Date: |
Fri, 6 Jan 2017 15:55:43 +0000 |
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.
Signed-off-by: Daniel P. Berrange <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] [PATCH v2 39/47] trace: switch target/sparc/ directory to modular trace.h file, (continued)
- [Qemu-devel] [PATCH v2 44/47] trace: switch qapi/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 46/47] trace: update docs to reflect new code generation approach, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 47/47] trace: improve error reporting when parsing simpletrace header,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v2 45/47] trace: remove the global include/trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 43/47] trace: switch linux-user/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- Re: [Qemu-devel] [PATCH v2 00/47] Switch all subdirs over to modular trace.h file, Daniel P. Berrange, 2017/01/06
- Re: [Qemu-devel] [PATCH v2 00/47] Switch all subdirs over to modular trace.h file, no-reply, 2017/01/06