From patchwork Mon Dec 5 09:51:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 631044 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2422304pvb; Mon, 5 Dec 2022 01:54:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf4STrDYifkch9+QikFov/wB8KT5tnJDu8JiA2g2+FNU7xAJUk84bxMDdlfaUWeg77dy7aBU X-Received: by 2002:ac8:4792:0:b0:3a7:e606:2783 with SMTP id k18-20020ac84792000000b003a7e6062783mr1578587qtq.511.1670234074456; Mon, 05 Dec 2022 01:54:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670234074; cv=none; d=google.com; s=arc-20160816; b=T+YAYhhgKayelkAe/T3lZ5BdXDAa+YhewNKUg+tjdyITchDMtosgM1R7yz15ge86zb xz2S9lYxnXV9DUwatkKAJICVj3wmAqZbDRBaf3PC84/euSjH6BVUDaxvJSL/5x7zgVq8 iTCQ1r/apx/2PIE+s9mvsGZ93c54LOuVVj5paSLZf3q7N6T8gn8sew62ozM+6y2EOUjq 3iD09a3HzTOVv6xB+9w86cG1HrGHMUqyF5dF19IjEsChU+6bmXmx2/9Gn+DqlEwPYUCZ 339oPdckfo1XTh5XF9x3ub1m5+MOFUcwjVNWyVUyEln50/GxWBTAcro31qgXJ6AlwsUl b1BQ== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gM1FzBim53KQXgBVytxLzbWYxEf9vN7NkiErlAjlFr4=; b=SiW1Cdw8Ror8Ggl63DZERSK6Dq6KvuVAxic9eTOAOvDRyohYY7ozeebBevmIsr1geA pfwXHq9E96kw0K25zTgv7ugxvyGL1c6M3KYE3+x8SjiigSoHS5arH8MOC1t9nSRcH4H7 v06P6i+C0BPXA6PJXQnesU1KuFY5CW525vVRi+PDrTMkP6xDmvikCc98HqdVomFwuz04 PT1AWZfQC5sDU73uSdkbpkqaSQSgS7TdH6w/aQUENToVK3jVhzH3RT11W8+07nvGpa/F QTCS6yZGrAubpRUwqHyp+ia1rtMOigbjKRl4ZW9IBrkb2je61KcNM3kz/+Saa9E12NuU mS9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="KzQkt/tc"; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r16-20020ac87ef0000000b003a622111f5csi7163081qtc.787.2022.12.05.01.54.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Dec 2022 01:54:34 -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=@redhat.com header.s=mimecast20190719 header.b="KzQkt/tc"; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p28AH-0000gB-PN; Mon, 05 Dec 2022 04:53:36 -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 1p28A2-0000b9-U5 for qemu-devel@nongnu.org; Mon, 05 Dec 2022 04:53:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p289w-0006Pi-U5 for qemu-devel@nongnu.org; Mon, 05 Dec 2022 04:53:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670233991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gM1FzBim53KQXgBVytxLzbWYxEf9vN7NkiErlAjlFr4=; b=KzQkt/tc7jHKpS/ZW/kiObBg8cz+d0BNM3vy1o6kib/YzBTLRhhl7unUK8G7FCXbsrRKmD ZlKiP717BqVgQT9rUcawdMj8y+FA2bMeEN79Wf05pBEx/1lm2axYSjo7SS7/j6nJPQc/uh zYv/9e2Q8jv09D5Rh40e6lNoKSMmgYI= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-232-y6LLJ39VMn-SjpfmQaPpNg-1; Mon, 05 Dec 2022 04:53:06 -0500 X-MC-Unique: y6LLJ39VMn-SjpfmQaPpNg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F4AA1C09B82; Mon, 5 Dec 2022 09:53:05 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BFA32166B29; Mon, 5 Dec 2022 09:52:57 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: Fam Zheng , Thomas Huth , Viresh Kumar , Kevin Wolf , Mathieu Poirier , Laurent Vivier , Eric Blake , Richard Henderson , Raphael Norwitz , Stefan Hajnoczi , Juan Quintela , virtio-fs@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Christian Borntraeger , "Gonglei (Arei)" , qemu-block@nongnu.org, Xiaojuan Yang , Thomas Huth , Ilya Leoshkevich , Eduardo Habkost , Gerd Hoffmann , "Dr. David Alan Gilbert" , Alex Williamson , Eric Farman , Halil Pasic , Peter Maydell , Vladimir Sementsov-Ogievskiy , Jason Wang , Laurent Vivier , Song Gao , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Klaus Jensen , John Snow , Michael Tokarev , qemu-arm@nongnu.org, Paolo Bonzini , "Michael S. Tsirkin" , Keith Busch , David Hildenbrand , qemu-trivial@nongnu.org, Hanna Reitz , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wilfred Mallawa , Pavel Dovgalyuk Subject: [PATCH v2 03/51] replay: Fix declaration of replay_read_next_clock Date: Mon, 5 Dec 2022 10:51:40 +0100 Message-Id: <20221205095228.1314-4-quintela@redhat.com> In-Reply-To: <20221205095228.1314-1-quintela@redhat.com> References: <20221205095228.1314-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 From: Richard Henderson 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: Philippe Mathieu-Daudé Reviewed-by: Wilfred Mallawa Reviewed-by: Pavel Dovgalyuk Signed-off-by: Stefan Hajnoczi Message-Id: <20221129010547.284051-1-richard.henderson@linaro.org> --- 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 */