From patchwork Wed May 7 17:16:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 346977 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id ABB04140088 for ; Thu, 8 May 2014 20:22:57 +1000 (EST) Received: from localhost ([::1]:45913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiLTb-0008Sh-K9 for incoming@patchwork.ozlabs.org; Thu, 08 May 2014 06:22:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiLOD-0007Yk-3k for qemu-devel@nongnu.org; Thu, 08 May 2014 06:17:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiLO8-0003gE-Gb for qemu-devel@nongnu.org; Thu, 08 May 2014 06:17:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiLO8-0003eE-8x for qemu-devel@nongnu.org; Thu, 08 May 2014 06:17:16 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s48AHDBT007567 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 May 2014 06:17:13 -0400 Received: from localhost (ovpn-112-43.ams2.redhat.com [10.36.112.43]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s48AHCQo006674; Thu, 8 May 2014 06:17:12 -0400 From: Stefan Hajnoczi To: Date: Wed, 7 May 2014 19:16:44 +0200 Message-Id: <1399483006-17781-8-git-send-email-stefanha@redhat.com> In-Reply-To: <1399483006-17781-1-git-send-email-stefanha@redhat.com> References: <1399483006-17781-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id s48AHDBT007567 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi Subject: [Qemu-devel] [PULL 7/9] trace: [simple] Bump up log version number X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Lluís Vilanova The following tracetool cleanup changes the event numbering policy. Signed-off-by: Lluís 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] != 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 aaa010e..bb0b52c 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)