From nobody Tue Nov 26 08:34:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1708538920; cv=none; d=zohomail.com; s=zohoarc; b=LCIPCIr2oecq5znu/OtiOOrzAa+9VvXQo5WXiUWVooJEidaOUt2elL3fq3kIJwxQdC7pu+xBvu+y4hKim5axshn3sYSz8oYJPCqvo7fnMr5IeER4w4md9mljcNpkZkr6csv3FsWIcf/LNGq1VlrMBO3w7XnvQi4sOjyUxuuclD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708538920; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5N9kQmsXi811xBmhKN5vWVkLXcdGsB/xJVwLIj9WQEE=; b=ijfSIegkZF3yhQ6G9erGRY/oxLr8nhnx6livYYv2nw+SCrfwvwVKyTblnPZZHyihgg07gLyrO/c+y6RzrPw8U+4/NEEf9IX2ZfGXa6FtSx037wSutc7qGM6KAsqKLfe5L1HP1Q+gY1eJFY2lQCjDqy1a0p8h5nS08BNRhZy4GP8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1708538920018307.43988840931286; Wed, 21 Feb 2024 10:08:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcr0m-000552-Mi; Wed, 21 Feb 2024 13:08:04 -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 1rcr0l-0004wF-Au for qemu-devel@nongnu.org; Wed, 21 Feb 2024 13:08:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcr0i-0000hW-Jm for qemu-devel@nongnu.org; Wed, 21 Feb 2024 13:08:02 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-393-XSKf2OcqMxCBTUQbG2h32g-1; Wed, 21 Feb 2024 13:07:54 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7DAA0887E41; Wed, 21 Feb 2024 18:07:54 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D23D2166B32; Wed, 21 Feb 2024 18:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708538878; 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; bh=5N9kQmsXi811xBmhKN5vWVkLXcdGsB/xJVwLIj9WQEE=; b=htBoiaX7P+50qbS9vv2Go80CduXPKer8Y+bRRgKWyXPxgIHO5gcyTZMcge9bYMunCF1ty+ EsiitXjZdteLcAk5bpZs/tagcfAsqjZbI8gVTOqdV+tInu5MH4r6c3LGJBTmc7XTMjDcqK QeBMrsoybApqPRlsKZtznUmTVWqJcyg= X-MC-Unique: XSKf2OcqMxCBTUQbG2h32g-1 From: Thomas Huth To: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= , Frederic Konrad , qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Artyom Tarasenko , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH] hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro Date: Wed, 21 Feb 2024 19:07:51 +0100 Message-ID: <20240221180751.190489-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.05, 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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1708538920664100001 leon3.c currently fails to compile with some compilers when the -Wvla option has been enabled: ../hw/sparc/leon3.c: In function =E2=80=98leon3_cpu_reset=E2=80=99: ../hw/sparc/leon3.c:153:5: error: ISO C90 forbids variable length array =E2=80=98offset_must_be_zero=E2=80=99 [-Werror=3Dvla] 153 | ResetData *s =3D (ResetData *)DO_UPCAST(ResetData, info[id], i= nfo); | ^~~~~~~~~ cc1: all warnings being treated as errors Looking at this code, the DO_UPCAST macro is indeed used in a wrong way here: DO_UPCAST is supposed to check that the second parameter is the first entry of the struct that the first parameter indicates, but since we use and index into the info[] array, this of course cannot work. The intention here was likely rather to use the container_of() macro instead, so switch the code accordingly. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/leon3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 4873b59b6c..6aaa04cb19 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -150,7 +150,7 @@ static void leon3_cpu_reset(void *opaque) { struct CPUResetData *info =3D (struct CPUResetData *) opaque; int id =3D info->id; - ResetData *s =3D (ResetData *)DO_UPCAST(ResetData, info[id], info); + ResetData *s =3D container_of(info, ResetData, info[id]); CPUState *cpu =3D CPU(s->info[id].cpu); CPUSPARCState *env =3D cpu_env(cpu); =20 --=20 2.43.2