From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wtztj-00071O-6b for qemu-devel@nongnu.org; Mon, 09 Jun 2014 09:46:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wtztd-000496-J2 for qemu-devel@nongnu.org; Mon, 09 Jun 2014 09:46:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57962) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wtztd-00048i-9t for qemu-devel@nongnu.org; Mon, 09 Jun 2014 09:45:57 -0400 From: Stefan Hajnoczi Date: Mon, 9 Jun 2014 15:45:20 +0200 Message-Id: <1402321522-18408-13-git-send-email-stefanha@redhat.com> In-Reply-To: <1402321522-18408-1-git-send-email-stefanha@redhat.com> References: <1402321522-18408-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 7/9] trace: [simple] Bump up log version number List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi From: Llu=C3=ADs Vilanova The following tracetool cleanup changes the event numbering policy. Signed-off-by: Llu=C3=ADs Vilanova Signed-off-by: Stefan Hajnoczi --- scripts/simpletrace.py | 10 +++++----- trace/simple.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py index 8bbcb42..b9aeb56 100755 --- a/scripts/simpletrace.py +++ b/scripts/simpletrace.py @@ -65,13 +65,13 @@ def read_trace_file(edict, fobj): header[0] !=3D header_event_id or \ header[1] !=3D header_magic: raise ValueError('Not a valid trace file!') - if header[2] !=3D 0 and \ - header[2] !=3D 2: - raise ValueError('Unknown version of tracelog format!') =20 log_version =3D header[2] - if log_version =3D=3D 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 !=3D 3: + raise ValueError('Log format %d not supported with this QEMU rel= ease!' + % log_version) =20 while True: rec =3D read_record(edict, fobj) diff --git a/trace/simple.c b/trace/simple.c index aaa010e..bb0b52c 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -28,7 +28,7 @@ #define HEADER_MAGIC 0xf2b177cb0aa429b4ULL =20 /** Trace file version number, bump if format changes */ -#define HEADER_VERSION 2 +#define HEADER_VERSION 3 =20 /** Records were dropped event ID */ #define DROPPED_EVENT_ID (~(uint64_t)0 - 1) --=20 1.9.0