diff options
| author | Lluís Vilanova <vilanova@ac.upc.edu> | 2014-02-23 20:37:35 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-05-07 19:07:18 +0200 |
| commit | ef0bd3bba674769c7d36bf400fc4fe7ea43244c5 (patch) | |
| tree | 3a540ee331d35a7d415f5e2025be87ab08784d09 | |
| parent | 30b572efd5d73d948825765803207fd30e062e8b (diff) | |
trace: [simple] Bump up log version number
The following tracetool cleanup changes the event numbering policy.
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rwxr-xr-x | scripts/simpletrace.py | 10 | ||||
| -rw-r--r-- | trace/simple.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py index 8bbcb42cc4..b9aeb56500 100755 --- a/scripts/simpletrace.py +++ b/scripts/simpletrace.py @@ -65,13 +65,13 @@ def read_trace_file(edict, fobj): header[0] != header_event_id or \ header[1] != header_magic: raise ValueError('Not a valid trace file!') - if header[2] != 0 and \ - header[2] != 2: - raise ValueError('Unknown version of tracelog format!') log_version = header[2] - if log_version == 0: - raise ValueError('Older log format, not supported with this QEMU release!') + if log_version not in [0, 2, 3]: + raise ValueError('Unknown version of tracelog format!') + if log_version != 3: + raise ValueError('Log format %d not supported with this QEMU release!' + % log_version) while True: rec = read_record(edict, fobj) diff --git a/trace/simple.c b/trace/simple.c index aaa010ee2b..bb0b52ce02 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -28,7 +28,7 @@ #define HEADER_MAGIC 0xf2b177cb0aa429b4ULL /** Trace file version number, bump if format changes */ -#define HEADER_VERSION 2 +#define HEADER_VERSION 3 /** Records were dropped event ID */ #define DROPPED_EVENT_ID (~(uint64_t)0 - 1) |