From patchwork Tue Mar 13 22:47:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 131537 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp167339ljb; Tue, 13 Mar 2018 16:23:56 -0700 (PDT) X-Google-Smtp-Source: AG47ELvlVDaNeBkKrP0VCZA/NztpyWVCeHOKAXJrhKVilMda+jNtlt2CEJn0ib9GIptA56dL1zyu X-Received: by 10.200.42.177 with SMTP id b46mr3973671qta.321.1520983436501; Tue, 13 Mar 2018 16:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520983436; cv=none; d=google.com; s=arc-20160816; b=IOXF+14dIMNNK2I+sQM1sxegc/vTaXbe6V2sbTHJNk1WOc8Y0dkuLBL2tBFuAkkEk1 TMXcSnpqqKdfGjEJQJ8preCaPvVwekP3zUaqlJYvLAL1cAllApiwuWvaST+0Ch25B9M0 leQeGkZ/Zos6U0S/keioSHbdGWW8cLcF/ngrXKIvN5iTx+N6w7hxifiY1IWICLMbNyfe pBP0n4vPswIUdGluxsV01mY3cCquVuK5Vq2f8BoeUTw1JINoSQ681Lxut1s/tM9d0Eji vIML8gANNcuPGh45BZItiNr03manZClcg8tQjZNqmGTDXauiJJXj1OQd5JemIT61kR+7 eQZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=0gWafmiRSPTaWEmXlFXCR87hdsMuZo8RIGdEgNRtP3Y=; b=VPctpI5FaTvwmiFUKetUcQdc8ODfT19gEeYucXoaRy29+jH+ckfbW3ARNwcXBBtZMW n7NnU4mM9RngG5S0OCk/BNDLANRyQfDtWb0P265gpSdMnA/es5sHR51f4AP3F0whXPyY m29I2Psld4gehuJlmsG8eS6uwg4nQVFC2kN5pd2NWiytZZxyqoNUW0NAw2ZCe5PurSyU OoaXuxykLPfEvrYhnPzlZ6Eo/SXsVYGjP7hs4qK+dONyDFE5+/QFOE18rudHLyVezAFA AbZrTl1faMU58x35K5YVM4+p4gP2iCQgh68XAfUozVO8HkFm1vrpwkPz6sinzYjd2t7N fU+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ZK8PYYJv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a132si852513qkg.299.2018.03.13.16.23.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 13 Mar 2018 16:23:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ZK8PYYJv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:43478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtGt-0002ui-Qt for patch@linaro.org; Tue, 13 Mar 2018 19:23:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsig-0006L6-VE for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsif-00047g-SS for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:35 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:40562) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsif-00047K-M6 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:33 -0400 Received: by mail-wr0-x244.google.com with SMTP id s12so14430wre.7 for ; Tue, 13 Mar 2018 15:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0gWafmiRSPTaWEmXlFXCR87hdsMuZo8RIGdEgNRtP3Y=; b=ZK8PYYJvE3UfQ73hoUpZ5SpK6Fes8HSrtfND2+i49aLtHxO6yt4FAgpxU7PDpKFYkO PQE3YbMM8ROup8/UzAKL56mKz/OXH+b+8hrEPLxsAGBY4HZYYhgWLuqgDbeZnl+fDlph EgB5vggkW/E1N102lKElSZeQMrSA/47EP5jbeSq5NtDN4iPB8iv8gvNx4MHSzZw5pE3M mG41d8zpcLLrUeeRbo8qj1AsJEK4F9LrgPkkl20acKoh6ebrWBkDd2jFxPHeKhH4PN34 oDfhl8N13Z7fN/ZoXSq5VmqFghRVTF8mmnsCojzw2xWCGVtEHDwnsdaisyWk0fAvvGXn WHXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0gWafmiRSPTaWEmXlFXCR87hdsMuZo8RIGdEgNRtP3Y=; b=qQHUqpDHaX7c8wmjiL9LhyEt1iHwKddkqfG6/UMo2HIq/hH3u8KAm4RGIJKAR7TyUZ o7gIW4H5BFQUpwL9z4CWJbCOOQloiAZ2KW/MleKptnyIIPJ9rwEFxts/J3aVkVnToXqY g+2RY45kWd4QmWF5Iaw91ECifLc6Ms7U5ouYO8vSS8HhOu71qBLz65vTOAnakiGX+w58 e9yy9pYrILfMz6TAHD3ky6Yzv4a8VR7WbhoMk8I/CzldFcdrPb/GrJDc5QpNv1A5xcM0 HXPKIEAl+NLpE5P6UO00CkR2RAY8j3eLjsWLBVGwmCb7wE6DfQtC/0Om6J3rpthz2ZEs 6u0Q== X-Gm-Message-State: AElRT7Fm3dZ6p0Q4j0N8dH6yVm66C1SQtw7T+4la0bI2mu2WaAfPC1ts nn1sRxJ1vJfRpvBDX3m2ZbpUAbKT X-Received: by 10.223.195.206 with SMTP id d14mr2026117wrg.0.1520981312246; Tue, 13 Mar 2018 15:48:32 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:47:08 +0100 Message-Id: <20180313224719.4954-59-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 58/69] replay/replay.c: bump REPLAY_VERSION again X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée This time commit 802f045a5f61b781df55e4492d896b4d20503ba7 broke the replay file format. Also add a comment about this to replay-internal.h. Signed-off-by: Alex Bennée Reviewed-off-by: Pavel Dovgalyuk Acked-by: Paolo Bonzini Message-Id: <20180227095231.1060.91180.stgit@pasha-VirtualBox> Signed-off-by: Paolo Bonzini --- replay/replay-internal.h | 2 +- replay/replay.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.14.3 diff --git a/replay/replay-internal.h b/replay/replay-internal.h index be96d7e879..8e4c701751 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -12,7 +12,7 @@ * */ - +/* Any changes to order/number of events will need to bump REPLAY_VERSION */ enum ReplayEvents { /* for instruction event */ EVENT_INSTRUCTION, diff --git a/replay/replay.c b/replay/replay.c index 7a23c62d61..9cddb6bfc9 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -22,7 +22,7 @@ /* Current version of the replay mechanism. Increase it when file format changes. */ -#define REPLAY_VERSION 0xe02006 +#define REPLAY_VERSION 0xe02007 /* Size of replay log header */ #define HEADER_SIZE (sizeof(uint32_t) + sizeof(uint64_t))