From patchwork Tue Nov 29 01:05:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 629174 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3387287pvb; Mon, 28 Nov 2022 17:06:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf5K6uKtI16RxMfYxOsmJcBGpay02mV8LH7Kpmhg78I+H726YB0an6OpdDIdBYbTAyiDLxE3 X-Received: by 2002:a05:6214:3688:b0:4bb:9180:638f with SMTP id nl8-20020a056214368800b004bb9180638fmr32535221qvb.98.1669683992787; Mon, 28 Nov 2022 17:06:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669683992; cv=none; d=google.com; s=arc-20160816; b=wjba434gftQkYxfeZZpvY4r43Nl9lkHmASr2PwFMIcGacSTjUrJFJB/RqCQQhEjRSR nPgFt8q2XfPd64lNHq+4TrhNFyVkntMixrJbns7X0P3+0ajhoJhOXIbC4JAYk5jxo8cR SfmTvGiUuwXzgh9V2HVw7LeDl+VGt7fIiJXk99NAe32BGkm8R7AICpYpkgqIXID0w0wM vnJwURp3i0gVSZ+rQf5cHf997XlkznxGEiA9om7rkUtuCL+tWBmrzxTQOyOTOrLdOOSO n41h4GT7U8lS3am7mv7AEaWGWgTJJVh/Fsa2Rd/kMJ1SQK18k2lPjpOnQ7k141FMiAwZ hVKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=2yEcXUJZGlDLcZPWH8PxDhax/Of1uT+DjIIBApf6vik=; b=HQ6timEQR2HoNwN5hV4bnS3MjPiQ/6pXhDeMlqLDNXKEWP+Yll+G+ytTsySc7OIWmd JRlnr3sWy4TeolB/MmUoO3olW+o05MKOsHjFdgNNW6AbK8J8vML/OlWr0xEwMWI8WirN 6mbJOvkftjz+L7X01svOAfJ3Er0ExviYgoAJBdVmFIAs0FiYIYKKY4we8gf3YSchBUlY FJq6xSYhHzkqMJ7fdVffGWRJ8IyGREDzosWKBK2fybFlV25sYMI8Lx1SVbBFDMi6v+Bg 0pPifLUwdwX9wMerGF0JAsI4B2JbpBVQbC15Vqin2lTH9lyvHl/fE8zJaoa6s2koWyk5 i2XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="PRC/2e/Y"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e6-20020ac80646000000b00397107724f3si7590549qth.205.2022.11.28.17.06.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Nov 2022 17:06:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="PRC/2e/Y"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozp4N-00023k-Bm; Mon, 28 Nov 2022 20:05:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ozp4M-00023b-AJ for qemu-devel@nongnu.org; Mon, 28 Nov 2022 20:05:54 -0500 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ozp4K-0005QW-NK for qemu-devel@nongnu.org; Mon, 28 Nov 2022 20:05:54 -0500 Received: by mail-pj1-x102a.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so10683904pjo.3 for ; Mon, 28 Nov 2022 17:05:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2yEcXUJZGlDLcZPWH8PxDhax/Of1uT+DjIIBApf6vik=; b=PRC/2e/YAiDgpP+7KNGRRO3Q4uDhMVjDkgTnz19+A5KT6QmUg32mxOGYwerHtrax6U 1KskZXE/qQzt6m6G8QKh3gudWq9/PaOJgFlVNsLacdooA1UHBIEdJlJ4KBBVbGxvf9/q 1xAI1w4iTdKspYR5jJiYhEvetYpIUeRav/Eg4G/EqJKBrQz1epMpSBpsGrpYt/FKwRxY 21c+B+DUKVUY5+u9U/UENwSDxBwd7f8rpPvUmeLPy8wW8dFnyfHQSte+jlI4XN9AFU74 G8NbqoQWP91OYoSwHJm44NTK82CWNIVL3wY9zub0df35yN8vLFMC5HH5Gws4hGyz5CkE EwZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2yEcXUJZGlDLcZPWH8PxDhax/Of1uT+DjIIBApf6vik=; b=yASdFmRAtH+j6+/MkF1SeZRoY+l3RBsZT4+wVCHwO3UndJ8P0avKydtEni9JwTH13e 2RaQq2+GnDFpb8mMrmBeoT5yYP7sHV9koxtVc9RO62zozvaadFPxDIrT6epsGuWKoJx6 DiHz5VRc/LjlEdP5T46oGoXRfAwh2KUurlHlbsXbsgun/tpzD/hQzRNVmsj24jzniQnm YCsKZSGN0TTclUlmzjXynoUDdpx/E0h/O9QNWOsFbss3U2jgR5zDf2HJlmjtvgOc4yMO E/yli+dzgtv7hB5SAx8sf5QA2mYoTx6CKpMTouOi7Uq0ZeUGkv/eLf9i5C1ybRUQB6WX +fLA== X-Gm-Message-State: ANoB5pkAYFDu8ziCz4LJLmlJJexwnVdaunKgM/XQaFlOScSHUEIes9eH dry3Fqor0jVOn+d78IH4Ys+gHiprY7KGlg== X-Received: by 2002:a17:902:7885:b0:17e:c0f0:96a4 with SMTP id q5-20020a170902788500b0017ec0f096a4mr35921743pll.80.1669683949278; Mon, 28 Nov 2022 17:05:49 -0800 (PST) Received: from stoup.. ([2602:47:d48a:1201:77be:da03:8c5a:e406]) by smtp.gmail.com with ESMTPSA id b7-20020a170902650700b001896af10ca7sm7052163plk.134.2022.11.28.17.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 17:05:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pavel.dovgaluk@ispras.ru, stefanha@gmail.com Subject: [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock Date: Mon, 28 Nov 2022 17:05:47 -0800 Message-Id: <20221129010547.284051-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Fixes the build with gcc 13: replay/replay-time.c:34:6: error: conflicting types for \ 'replay_read_next_clock' due to enum/integer mismatch; \ have 'void(ReplayClockKind)' [-Werror=enum-int-mismatch] 34 | void replay_read_next_clock(ReplayClockKind kind) | ^~~~~~~~~~~~~~~~~~~~~~ In file included from ../qemu/replay/replay-time.c:14: replay/replay-internal.h:139:6: note: previous declaration of \ 'replay_read_next_clock' with type 'void(unsigned int)' 139 | void replay_read_next_clock(unsigned int kind); | ^~~~~~~~~~~~~~~~~~~~~~ Fixes: 8eda206e090 ("replay: recording and replaying clock ticks") Signed-off-by: Richard Henderson Reviewed-by: Pavel Dovgalyuk Reviewed-by: Wilfred Mallawa Reviewed-by: Philippe Mathieu-Daudé --- replay/replay-internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 89e377be90..b6836354ac 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -136,7 +136,7 @@ bool replay_next_event_is(int event); /*! Reads next clock value from the file. If clock kind read from the file is different from the parameter, the value is not used. */ -void replay_read_next_clock(unsigned int kind); +void replay_read_next_clock(ReplayClockKind kind); /* Asynchronous events queue */