From nobody Tue May 7 11:07:22 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1679319780; cv=none; d=zohomail.com; s=zohoarc; b=fJUBoUGj5PYYU10hjV8bTR50QBk8CMZQcRUEASgfpP/7L0p9q4pGtJR+Z5KMaVWPjuJv1qc6v5JvkhnAIoeeG4YjII+GVIl2MLEU3c9mVP6uieKB9EykYt4sjCD0q3H/9ne8j2itZ9yFynIoD7a5pT/I4vUYVjQU3a2BrVyuzsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679319780; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pdlASMT4jISCzMP7osi2/4IX99eROCkVPgjLB1OApxg=; b=aBiElxUoA1OUm8JcUStBaNdAPJmJHLx9un2B5HT2FPBM30/1SszvqX7dqpQFMpNSwgPtfXhN9++B6lJdt1afXCp1Df/yHG/IUj4uF10WXPbzk05InsQZokL+bKDGLiDNj+llCiZWUpMw3TiToowSGuFkbPqY/0V3dVcofkEY1p0= 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+importer2=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 1679319780384931.155903095678; Mon, 20 Mar 2023 06:43:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peFmS-0006Wo-52; Mon, 20 Mar 2023 09:42:32 -0400 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 1peFmQ-0006W5-Ku for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:30 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peFmO-0001q3-5X for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:30 -0400 Received: by mail-wm1-x333.google.com with SMTP id o32so1146834wms.1 for ; Mon, 20 Mar 2023 06:42:27 -0700 (PDT) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id 16-20020a05600c025000b003ed1ff06faasm10524429wmj.19.2023.03.20.06.42.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Mar 2023 06:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679319746; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pdlASMT4jISCzMP7osi2/4IX99eROCkVPgjLB1OApxg=; b=avX1Qg+h2b0RZAo1ojnrb1iql8RIL2p0UrP8OWRglchnMWQxtbGI6+ENSfRPaCxAn8 fAcxbvUwuq5JPvE7a5T9GwanXT6u+fKnay0vDw8GbaMGJEvm1RqedetRhAtHYkUC1Tuq G79SHwnLtHFux/Z73+Xy4rheTmynHPh6sYSw+HRjkKwBnAkI0E5uL9ZmsRpMAM6OMQtT fs+EtkM316QNnbNpI7R665nVZGk94C7hbPJFHrtDk9wqveDApL97XQruhhTAocNhI/Qu JHPN8XuRu6YBJKbsODCCDpHrjuIMt0vNxbAI0jaz3GmPklnlQXmbncf50SJTHEVuczRP kHDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679319746; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pdlASMT4jISCzMP7osi2/4IX99eROCkVPgjLB1OApxg=; b=iuadR0B5AnISsng0wn0cAuVRHNZc6vK68W/umDuG5+/5fgzOgVJ7cZzMLT/t+4CH7E 505i9ObVaPlb41oXMV4IQ5x+JmRj1CXgR5Y872JbFNB8wPCBh9kJpY8tjSiuffN1YjuN pEd9YDLB+mcNnxGIblFJNb2wesm2R5bfWOP64GqFX88g/oBT+D7qwXvzRuD/yHvHS2Gz FmGwLadvKyKgHoZ7hZHrvDgYPLlnj/6kIXWIb+g+ljKcPOl2YMYtMzDc14JeYcEPBXK3 mF6f3A2Bcg8HyKSh2SmQKUPmvxinLbf9XfiNwdH2bGzPD8uImopJaLmX4Sa0Q+D+RHgo A/fw== X-Gm-Message-State: AO0yUKXKSTeFX4ivH7GgXP+JKcXnoyVoi1vDibymUb2m+51IidpNtOMy PSFHQ9JuZJ+SB7Poei/G/mvFv0rjnjZfZFQxCrDpTA== X-Google-Smtp-Source: AK7set8UAUjaTZ1kXr64zKl+4rgc+rHTXBLJh9PLzP7MjMseWPfRG5A/qpYePD5874/Euj7zPpE+hA== X-Received: by 2002:a7b:c7cf:0:b0:3ed:dfd8:653d with SMTP id z15-20020a7bc7cf000000b003eddfd8653dmr4556198wmk.28.1679319746379; Mon, 20 Mar 2023 06:42:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Simon=20W=C3=B6rner?= Subject: [PATCH-for-8.1 1/5] qemu/osdep.h: Do not declare function prototypes using extern keyword Date: Mon, 20 Mar 2023 14:42:15 +0100 Message-Id: <20230320134219.22489-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230320134219.22489-1-philmd@linaro.org> References: <20230320134219.22489-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1679319782293100003 By default, C function prototypes declared in headers are visible, so there is no need to declare them as 'extern' functions. Remove this redundancy. This also fixes when building under MSYS2: C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: error: standar= d attributes in middle of decl-specifiers 1075 | # define G_NORETURN [[noreturn]] | ^ C:/msys64/code/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of= macro 'G_NORETURN' 240 | extern G_NORETURN | ^~~~~~~~~~ Reported-by: Simon W=C3=B6rner Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1541 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/osdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index f68b5d8708..79c26c748a 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -237,7 +237,7 @@ extern "C" { * supports QEMU_ERROR, this will be reported at compile time; otherwise * this will be reported at link time due to the missing symbol. */ -extern G_NORETURN +G_NORETURN void QEMU_ERROR("code path is reachable") qemu_build_not_reached_always(void); #if defined(__OPTIMIZE__) && !defined(__NO_INLINE__) --=20 2.38.1 From nobody Tue May 7 11:07:22 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1679319804; cv=none; d=zohomail.com; s=zohoarc; b=enFYXerThZKu7EJoGAsnaUdxYUndm0JjfJj02u/r0FUaUUaStXM9MQUIxoTJMNS2GDp1A1q27JNAcsCI4YMkIeM55HAvnsGEY9M33jaQEU2NNWBAAUJivIeCxCY/F669lMc9a9W7GMtwfDou395P3UX11DcqfFk4R5tKocpZBxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679319804; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0NISlk1vZdvB+f1eUp7+3HHuzYbWQKCVdKec7G0ejZQ=; b=BypOZ5UU05fAWX+/AsMmIwOcC3B0ouFSD3mgLPYe0Klu9i5tvhWXN9l6kEXmklfGKazW3LY0BZ2HIAcG+syOxZbAfHihIcUFrDIyio0Hj0NGn5i92Cqrbjw4HURoqaznf89wt0MelRdv807Rt44Yvt1aO3dF7pF1pISBk0ODjmk= 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+importer2=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 1679319804947401.17457645779655; Mon, 20 Mar 2023 06:43:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peFmV-0006Y1-Bn; Mon, 20 Mar 2023 09:42:35 -0400 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 1peFmT-0006X8-Jn for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:33 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peFmS-0001or-2Z for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:33 -0400 Received: by mail-wm1-x32e.google.com with SMTP id i5-20020a05600c354500b003edd24054e0so2436812wmq.4 for ; Mon, 20 Mar 2023 06:42:31 -0700 (PDT) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id a4-20020adffb84000000b002d322b9a7f5sm8942325wrr.88.2023.03.20.06.42.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Mar 2023 06:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679319751; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0NISlk1vZdvB+f1eUp7+3HHuzYbWQKCVdKec7G0ejZQ=; b=HRSBo9QOdLq686/8kQUjmjY3yN+yirMNHdIDFhMOOaglRj+pXTD+KEMl/b71YzK80c JQiKGo4gTeWL6m3/jSY0RJja6/wSkewfTq3Rid8LkVKGu+4xvu7pqSWjghPCmUIq8BEu TDIc1Oj0zuvcXfL5Ve6NAXpaUOcY8fq9LMOf191sS3sI+0gSfGcI11aoimRqXCkRvTFx jn5pJcgrfsUqDkwKvjvLgna1kYv2lMczCLxLsvdC9FEDEA9cB8j4cXBcVZdPIi8yHLgf +gCz8mRtb2Jf7HzuT4UEZJWj3RYyNt36luyhGLDw9LXTd3UE17i3IzQtdLVZCvkd0/9G 4qOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679319751; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0NISlk1vZdvB+f1eUp7+3HHuzYbWQKCVdKec7G0ejZQ=; b=J7n342iLBZ5D2ZToNoIvNANKAqaTxP5Vl/lQ7gu+vl0Ea4DhrNRVthMf4f6VJHToZ1 UVUGLnGDY6jJjkeQtBD3Lm+46MNwwLg7F21kVq6NSNNUgK5Evy2FI3KGl56wqaTdcX8C vKlUsNHMjZLebjv2y0w5pYzbpV7E2Ic1UTlzg6usAkwhJO6g4BjzEVVQnyFxdQa3CMsR 7RcFi+9sP8KkHl1tdXEJrVFaiU707H8xltA0EwryfIKdgzIb3m2RSae92D5/mUZU6zg6 3z6qSCbC4Xo99eezDzBRw2iJFmupN3396bqYRvKvoKNiPaq01ZLzZYaA3asMz5DhzubB zeVA== X-Gm-Message-State: AO0yUKUhYedcOvopIPfRp5fOtjpEKzBYHeCmdxeeC01IoPDv+fj7/E7T XA7247WR07AdjQpStoAUjx6tfTgT6xImXlINOZ6dPw== X-Google-Smtp-Source: AK7set8Yx7ED649qRBhmkib2VCFEaAECLUcNBvfgHWiYMlHTdptXDPDxJebb0XrzRbU8CrzDFqOY3w== X-Received: by 2002:a05:600c:511c:b0:3ed:2b49:eefc with SMTP id o28-20020a05600c511c00b003ed2b49eefcmr21077191wms.3.1679319751155; Mon, 20 Mar 2023 06:42:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Kevin Wolf , Hanna Reitz Subject: [PATCH-for-8.1 2/5] block/dmg: Remove duplicated prototype declarations Date: Mon, 20 Mar 2023 14:42:16 +0100 Message-Id: <20230320134219.22489-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230320134219.22489-1-philmd@linaro.org> References: <20230320134219.22489-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1679319806399100001 Both dmg_uncompress_bz2 / dmg_uncompress_lzfse are declared in "dmg.h", included 1 line before. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/dmg.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/block/dmg.c b/block/dmg.c index e10b9a2ba5..a5d22fb8f9 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -31,12 +31,6 @@ #include "qemu/memalign.h" #include "dmg.h" =20 -int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in, - char *next_out, unsigned int avail_out); - -int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in, - char *next_out, unsigned int avail_out); - enum { /* Limit chunk sizes to prevent unreasonable amounts of memory being u= sed * or truncating when converting to 32-bit types --=20 2.38.1 From nobody Tue May 7 11:07:22 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1679319780; cv=none; d=zohomail.com; s=zohoarc; b=BgES1kBUNfjhWUSKLQdtVWIsDHwDN+ibZyw5l69KVqoP6I60GKbjmHJD0RQEurPU6ott6xJNGtk+NdxRErg0E3nZT4mRh3tTvRPkmkVF4axWiB+cbMVkMgt4mDZ+FZ+7XdPBYkBrbT6ArlBSuPQtit+xg5XI+EKZu9oNYd2Rmbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679319780; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m8uaccxHJ+UC9X9MhGYwy+hp8RackIzB3cnPRGAUhR4=; b=TkDb7gck9cqXScaLB38wmIZ2izPTdWOUUUIVsYWiW0itGMxy2y6Ne2N97kRwwFgbIFsZ1Gsbi7+58/gdq0N4aLZ4a5eMnfhpIKm9JJgO1SjRNDhu0MsEKd8CS5v5Mc3uE8uZ02LjszN/mFaiDsWi8yL3kVTj9J5rGIaKbfkmoig= 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+importer2=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 1679319780526694.8339344712625; Mon, 20 Mar 2023 06:43:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peFma-0006iO-01; Mon, 20 Mar 2023 09:42:40 -0400 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 1peFmY-0006e2-AV for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:38 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peFmW-0001q3-Rl for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:38 -0400 Received: by mail-wm1-x333.google.com with SMTP id o32so1147244wms.1 for ; Mon, 20 Mar 2023 06:42:36 -0700 (PDT) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id k5-20020adfe8c5000000b002d748d46565sm2178996wrn.74.2023.03.20.06.42.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Mar 2023 06:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679319756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m8uaccxHJ+UC9X9MhGYwy+hp8RackIzB3cnPRGAUhR4=; b=pXD5f/oM8PT4H6J+wA6bIu79r1cXBg7ytZ7/rzPzBpHmmIx1n8JKTSe1Fk56v1iHFe 9QtagE9qouxeqweTLJNe1Naz/tanzozWTA4JqbvXqJxYcLARzcd5aRn/Oc99TWEd/hc3 rSJl3KZ7SH/+fA5A5zlH9LbRoL+B4F+02RFRHM8fCvF9jk69FqDIV/ptBilY+1FkajVE RFnV3GMN7UvQtOLGR3yhg+9z1LvKssTuFxt5kjPGW33A260DZCPSPJJ5VpfDuoKEptCc 3Q9i/Y3QMAmBkJ3j1yKn09zlA0Lk2O5dsnUnqocRhTaasIQ2xAxX74q8/b1cA955yu18 uoqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679319756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m8uaccxHJ+UC9X9MhGYwy+hp8RackIzB3cnPRGAUhR4=; b=auqJ/APyCoeLA9uRxAH2v0S1Q3s0uzjRx5TJK5GJE+gUU0yQiqKcHLd6mClNvvmx/G G2v2LoELgvo/hXaWM7uWXcErWeKlrhT7eZF6Y3ickHjRSWXvabcUWwk9avrI8Ut6nvgI 8ouQhPUfBK21qMepr0dYTxSGKDPIkLV/nLtY4GeG6XtPmfMlNEBdL+7ao/p1BqTNSgHJ ajMFdQ97wWg090US3LQbbMJ/zACO4os1f3PK1ul86IHGfD8QjwJkQKH12JaBxzXdh7Gx LYdT1s+3m6Sn/vfk83S64ZP8XsXgl/Js5Z3oe0rlbnowD7lXRZZnapipWLuWyI8e/8zX KIdw== X-Gm-Message-State: AO0yUKX0fRx9hPNom/YfBoSLfhTA2fmvaDByqDZjW3FK4URK7la2Mwu1 hfFQGELtEViRYoVe3Z4uA8qEvN4IcDEa4ybMh/a7CQ== X-Google-Smtp-Source: AK7set9x4sPYSTQh2LE0A56ZstTjWuYBUJc193t6379VJktlKixDQbG6WX25cAfjsvz9f6I9l1sQoA== X-Received: by 2002:a05:600c:3549:b0:3eb:39e7:35fe with SMTP id i9-20020a05600c354900b003eb39e735femr32589880wmq.30.1679319755826; Mon, 20 Mar 2023 06:42:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-8.1 3/5] qemu/uri: Use QueryParams type definition Date: Mon, 20 Mar 2023 14:42:17 +0100 Message-Id: <20230320134219.22489-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230320134219.22489-1-philmd@linaro.org> References: <20230320134219.22489-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1679319782287100002 Follow QEMU CODING_STYLE, use the type definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/uri.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/uri.h b/include/qemu/uri.h index 3ad211d676..10dff8aedd 100644 --- a/include/qemu/uri.h +++ b/include/qemu/uri.h @@ -96,7 +96,7 @@ typedef struct QueryParams { QueryParam *p; /* array of parameters */ } QueryParams; =20 -struct QueryParams *query_params_new (int init_alloc); +QueryParams *query_params_new (int init_alloc); extern QueryParams *query_params_parse (const char *query); extern void query_params_free (QueryParams *ps); =20 --=20 2.38.1 From nobody Tue May 7 11:07:22 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1679319868; cv=none; d=zohomail.com; s=zohoarc; b=JbbyaSD0EwvGZhgI+yvZXBUXVV0RphBiEuWp2Exc/YzCRoZUF9oemrtidRE4yMWVTEkgffXilv7eLUgcmP4QgyEP2ZsI6QqgnSDZraDnYhVvZfuL4E1FVpJ81wh8cORwKHq29ERRgrr+DzMmCn1X2bm0VPR2qiOhsQJQ77MotTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679319868; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MqVaCNEoBxD2OYjKnMVbnNYKwGBdqFgS4EdXITIiD2w=; b=S6WLlkmQYIAne6zAub6xVZNILlhTXLXhVM18y3/Kfm9MxxTnJB6erwAUN86a7hL8eQrUGgwwy/kKXf4OD+7886IhMaEXD4LAirQW+vcxhFkz5dmAggyG7OTty9WmU2efii/hwXaLSM/mJGLINuhbDDTOVQ+Hoa2yqT2B9J+CBtQ= 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+importer2=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 1679319868318355.7528739946589; Mon, 20 Mar 2023 06:44:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peFmi-0006pG-JM; Mon, 20 Mar 2023 09:42:48 -0400 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 1peFmg-0006k5-Pc for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:46 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peFmd-0001tt-U9 for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:46 -0400 Received: by mail-wr1-x430.google.com with SMTP id y14so10398747wrq.4 for ; Mon, 20 Mar 2023 06:42:43 -0700 (PDT) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id w2-20020a5d6802000000b002cfe687fc7asm8906284wru.67.2023.03.20.06.42.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Mar 2023 06:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679319762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MqVaCNEoBxD2OYjKnMVbnNYKwGBdqFgS4EdXITIiD2w=; b=C1WkxWBEZEeQayjV81SHGc2BgnswrewoHK0RJxcI/xMOEwtFYvGrLSuoZGeM64JMuM naWeTc/Odb9cSzA26ctg5zoszvpKy9Fu2LiDf5xolfbSYOLp2RnrGLXe8NsUPLa68hDf qciTfgPSF6u1BPlMhzqh5QhNiLbOKp8a3wdrNn0AzyEMyXOKGRfZcNHOd3vtuktmhJdD IEpMWvn1MvL2916SY1RkfL0bcf24/24CSasDgEXA06r7XvHatS2E/fZYFThvFf2ORHCx 51Y2IgzOJzXuVC3/2FEhFGy57zqQ3P09+QGpEJjMgubReXW/n77sYdg6unoerJFfcU+S 0Wgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679319762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MqVaCNEoBxD2OYjKnMVbnNYKwGBdqFgS4EdXITIiD2w=; b=YVUtRJrxfd1ZX4AsDYtu+IVnmq/Uh2/ptSHveCmmKgKh+Hux45fcgJmidtuURDaSVz JBUzNnyK91U6Pu+D/LU1agi6QmDGtsyRx13TTRgF7tEpbMV9FjxWXupIK+EoBKtiYa36 VBLXYZi3OJ0hAyOu/5nJCLgT3bE1ucei9+qWB2fxjKdf4Kgd+rngxs8ou5JAGcX91Cu0 kKRAGyFZl1RVegky8TOJILgwHkFLSneHsPOhfW8qw7wDUAwbZxqwzy+YGACNUjLny6hF 7UpqvIVbz3v12euLu8SMTjiT02ICpVkWHt6SSK+vJOb75CxMz7islzXTEW+8RHj9jQi8 4v5Q== X-Gm-Message-State: AO0yUKUV7e5f1lMC7smKSUbGfVHqNvUHZU0Kv4L0ToPKKPpiHPpjhNQM 7GUyMhSwLyjeD1Yj/ACzLXQZEJOxHww9WNfhNX0KAA== X-Google-Smtp-Source: AK7set8pH0vifuH+XtZzmIPEjf2UddtLUe1m0rXmh/+O07oIwIqXEF2KLDH75XlqC/Go7C5gfcNPWQ== X-Received: by 2002:a5d:684e:0:b0:2c9:e585:84b0 with SMTP id o14-20020a5d684e000000b002c9e58584b0mr12828833wrw.1.1679319762050; Mon, 20 Mar 2023 06:42:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , Warner Losh , Kyle Evans , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefano Stabellini , Anthony Perard , Paul Durrant , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Andrew Jeffery , Joel Stanley , Tyrone Ting , Hao Wu , Paolo Bonzini , Eduardo Habkost , Richard Henderson , Stefan Weil , Riku Voipio , Marcelo Tosatti , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , xen-devel@lists.xenproject.org, kvm@vger.kernel.org Subject: [PATCH-for-8.1 4/5] bulk: Do not declare function prototypes using extern keyword Date: Mon, 20 Mar 2023 14:42:18 +0100 Message-Id: <20230320134219.22489-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230320134219.22489-1-philmd@linaro.org> References: <20230320134219.22489-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1679319869092100003 By default, C function prototypes declared in headers are visible, so there is no need to declare them as 'extern' functions. Remove this redundancy in a single bulk commit; do not modify: - meson.build (used to check function availability at runtime) - pc-bios - libdecnumber - *.c Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/dmg.h | 8 +++---- bsd-user/bsd-file.h | 6 ++--- crypto/hmacpriv.h | 13 +++++------ hw/xen/xen_pt.h | 8 +++---- include/crypto/secret_common.h | 14 +++++------- include/exec/page-vary.h | 4 ++-- include/hw/misc/aspeed_scu.h | 2 +- include/hw/nvram/npcm7xx_otp.h | 4 ++-- include/hw/qdev-core.h | 4 ++-- include/qemu/crc-ccitt.h | 4 ++-- include/qemu/osdep.h | 2 +- include/qemu/rcu.h | 14 ++++++------ include/qemu/sys_membarrier.h | 4 ++-- include/qemu/uri.h | 6 ++--- include/sysemu/accel-blocker.h | 14 ++++++------ include/sysemu/os-win32.h | 4 ++-- include/user/safe-syscall.h | 4 ++-- target/i386/sev.h | 6 ++--- target/mips/cpu.h | 4 ++-- tcg/tcg-internal.h | 4 ++-- tests/tcg/minilib/minilib.h | 2 +- include/exec/memory_ldst.h.inc | 42 +++++++++++++++++----------------- roms/seabios | 2 +- 23 files changed, 84 insertions(+), 91 deletions(-) diff --git a/block/dmg.h b/block/dmg.h index e488601b62..ed209b5dec 100644 --- a/block/dmg.h +++ b/block/dmg.h @@ -51,10 +51,10 @@ typedef struct BDRVDMGState { z_stream zstream; } BDRVDMGState; =20 -extern int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in, - char *next_out, unsigned int avail_out); +int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in, + char *next_out, unsigned int avail_out); =20 -extern int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in, - char *next_out, unsigned int avail_out); +int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in, + char *next_out, unsigned int avail_out); =20 #endif diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h index 588e0c50d4..3c00dc0056 100644 --- a/bsd-user/bsd-file.h +++ b/bsd-user/bsd-file.h @@ -51,10 +51,8 @@ do { \ unlock_user(p1, arg1, 0); \ } while (0) =20 -extern struct iovec *lock_iovec(int type, abi_ulong target_addr, int count, - int copy); -extern void unlock_iovec(struct iovec *vec, abi_ulong target_addr, int cou= nt, - int copy); +struct iovec *lock_iovec(int type, abi_ulong target_addr, int count, int c= opy); +void unlock_iovec(struct iovec *vec, abi_ulong target_addr, int count, int= copy); =20 int safe_open(const char *path, int flags, mode_t mode); int safe_openat(int fd, const char *path, int flags, mode_t mode); diff --git a/crypto/hmacpriv.h b/crypto/hmacpriv.h index 4387ca2587..62dfe8257a 100644 --- a/crypto/hmacpriv.h +++ b/crypto/hmacpriv.h @@ -28,19 +28,18 @@ struct QCryptoHmacDriver { void (*hmac_free)(QCryptoHmac *hmac); }; =20 -extern void *qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg, - const uint8_t *key, size_t nkey, - Error **errp); +void *qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg, + const uint8_t *key, size_t nkey, + Error **errp); extern QCryptoHmacDriver qcrypto_hmac_lib_driver; =20 #ifdef CONFIG_AF_ALG =20 #include "afalgpriv.h" =20 -extern QCryptoAFAlg * -qcrypto_afalg_hmac_ctx_new(QCryptoHashAlgorithm alg, - const uint8_t *key, size_t nkey, - Error **errp); +QCryptoAFAlg *qcrypto_afalg_hmac_ctx_new(QCryptoHashAlgorithm alg, + const uint8_t *key, size_t nkey, + Error **errp); extern QCryptoHmacDriver qcrypto_hmac_afalg_driver; =20 #endif diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index b20744f7c7..31bcfdf705 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -340,11 +340,9 @@ static inline bool xen_pt_has_msix_mapping(XenPCIPasst= hroughState *s, int bar) return s->msix && s->msix->bar_index =3D=3D bar; } =20 -extern void *pci_assign_dev_load_option_rom(PCIDevice *dev, - int *size, - unsigned int domain, - unsigned int bus, unsigned int= slot, - unsigned int function); +void *pci_assign_dev_load_option_rom(PCIDevice *dev, int *size, + unsigned int domain, unsigned int bus, + unsigned int slot, unsigned int funct= ion); static inline bool is_igd_vga_passthrough(XenHostPCIDevice *dev) { return (xen_igd_gfx_pt_enabled() diff --git a/include/crypto/secret_common.h b/include/crypto/secret_common.h index 42c7ff7af6..a0a22e1abd 100644 --- a/include/crypto/secret_common.h +++ b/include/crypto/secret_common.h @@ -48,13 +48,11 @@ struct QCryptoSecretCommonClass { }; =20 =20 -extern int qcrypto_secret_lookup(const char *secretid, - uint8_t **data, - size_t *datalen, - Error **errp); -extern char *qcrypto_secret_lookup_as_utf8(const char *secretid, - Error **errp); -extern char *qcrypto_secret_lookup_as_base64(const char *secretid, - Error **errp); +int qcrypto_secret_lookup(const char *secretid, + uint8_t **data, + size_t *datalen, + Error **errp); +char *qcrypto_secret_lookup_as_utf8(const char *secretid, Error **errp); +char *qcrypto_secret_lookup_as_base64(const char *secretid, Error **errp); =20 #endif /* QCRYPTO_SECRET_COMMON_H */ diff --git a/include/exec/page-vary.h b/include/exec/page-vary.h index ebbe9b169b..54ddde308a 100644 --- a/include/exec/page-vary.h +++ b/include/exec/page-vary.h @@ -27,8 +27,8 @@ typedef struct { } TargetPageBits; =20 #ifdef IN_PAGE_VARY -extern bool set_preferred_target_page_bits_common(int bits); -extern void finalize_target_page_bits_common(int min); +bool set_preferred_target_page_bits_common(int bits); +void finalize_target_page_bits_common(int min); #endif =20 /** diff --git a/include/hw/misc/aspeed_scu.h b/include/hw/misc/aspeed_scu.h index 5c7c04eedf..7cb6018dbc 100644 --- a/include/hw/misc/aspeed_scu.h +++ b/include/hw/misc/aspeed_scu.h @@ -51,7 +51,7 @@ struct AspeedSCUState { =20 #define ASPEED_IS_AST2500(si_rev) ((((si_rev) >> 24) & 0xff) =3D=3D 0x= 04) =20 -extern bool is_supported_silicon_rev(uint32_t silicon_rev); +bool is_supported_silicon_rev(uint32_t silicon_rev); =20 =20 struct AspeedSCUClass { diff --git a/include/hw/nvram/npcm7xx_otp.h b/include/hw/nvram/npcm7xx_otp.h index 156bbd151a..ea4b5d0731 100644 --- a/include/hw/nvram/npcm7xx_otp.h +++ b/include/hw/nvram/npcm7xx_otp.h @@ -73,7 +73,7 @@ typedef struct NPCM7xxOTPClass NPCM7xxOTPClass; * Each nibble of data is encoded into a byte, so the number of bytes writ= ten * to the array will be @len * 2. */ -extern void npcm7xx_otp_array_write(NPCM7xxOTPState *s, const void *data, - unsigned int offset, unsigned int len); +void npcm7xx_otp_array_write(NPCM7xxOTPState *s, const void *data, + unsigned int offset, unsigned int len); =20 #endif /* NPCM7XX_OTP_H */ diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index bd50ad5ee1..84d971eed9 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -892,7 +892,7 @@ typedef enum MachineInitPhase { PHASE_MACHINE_READY, } MachineInitPhase; =20 -extern bool phase_check(MachineInitPhase phase); -extern void phase_advance(MachineInitPhase phase); +bool phase_check(MachineInitPhase phase); +void phase_advance(MachineInitPhase phase); =20 #endif diff --git a/include/qemu/crc-ccitt.h b/include/qemu/crc-ccitt.h index d6eb49146d..8918dafe07 100644 --- a/include/qemu/crc-ccitt.h +++ b/include/qemu/crc-ccitt.h @@ -17,8 +17,8 @@ extern uint16_t const crc_ccitt_table[256]; extern uint16_t const crc_ccitt_false_table[256]; =20 -extern uint16_t crc_ccitt(uint16_t crc, const uint8_t *buffer, size_t len); -extern uint16_t crc_ccitt_false(uint16_t crc, const uint8_t *buffer, size_= t len); +uint16_t crc_ccitt(uint16_t crc, const uint8_t *buffer, size_t len); +uint16_t crc_ccitt_false(uint16_t crc, const uint8_t *buffer, size_t len); =20 static inline uint16_t crc_ccitt_byte(uint16_t crc, const uint8_t c) { diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 79c26c748a..98ca4d029d 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -496,7 +496,7 @@ void qemu_anon_ram_free(void *ptr, size_t size); * See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=3D7156) for discu= ssion * about Solaris missing the madvise() prototype. */ -extern int madvise(char *, size_t, int); +int madvise(char *, size_t, int); #endif =20 #if defined(CONFIG_LINUX) diff --git a/include/qemu/rcu.h b/include/qemu/rcu.h index 313fc414bc..1e25cf9ebc 100644 --- a/include/qemu/rcu.h +++ b/include/qemu/rcu.h @@ -115,19 +115,19 @@ static inline void rcu_read_unlock(void) } } =20 -extern void synchronize_rcu(void); +void synchronize_rcu(void); =20 /* * Reader thread registration. */ -extern void rcu_register_thread(void); -extern void rcu_unregister_thread(void); +void rcu_register_thread(void); +void rcu_unregister_thread(void); =20 /* * Support for fork(). fork() support is enabled at startup. */ -extern void rcu_enable_atfork(void); -extern void rcu_disable_atfork(void); +void rcu_enable_atfork(void); +void rcu_disable_atfork(void); =20 struct rcu_head; typedef void RCUCBFunc(struct rcu_head *head); @@ -137,8 +137,8 @@ struct rcu_head { RCUCBFunc *func; }; =20 -extern void call_rcu1(struct rcu_head *head, RCUCBFunc *func); -extern void drain_call_rcu(void); +void call_rcu1(struct rcu_head *head, RCUCBFunc *func); +void drain_call_rcu(void); =20 /* The operands of the minus operator must have the same type, * which must be the one that we specify in the cast. diff --git a/include/qemu/sys_membarrier.h b/include/qemu/sys_membarrier.h index b5bfa21d52..e7774891f8 100644 --- a/include/qemu/sys_membarrier.h +++ b/include/qemu/sys_membarrier.h @@ -14,8 +14,8 @@ * side. The slow side forces processor-level ordering on all other cores * through a system call. */ -extern void smp_mb_global_init(void); -extern void smp_mb_global(void); +void smp_mb_global_init(void); +void smp_mb_global(void); #define smp_mb_placeholder() barrier() #else /* Keep it simple, execute a real memory barrier on both sides. */ diff --git a/include/qemu/uri.h b/include/qemu/uri.h index 10dff8aedd..60807b6de4 100644 --- a/include/qemu/uri.h +++ b/include/qemu/uri.h @@ -96,8 +96,8 @@ typedef struct QueryParams { QueryParam *p; /* array of parameters */ } QueryParams; =20 -QueryParams *query_params_new (int init_alloc); -extern QueryParams *query_params_parse (const char *query); -extern void query_params_free (QueryParams *ps); +QueryParams *query_params_new(int init_alloc); +QueryParams *query_params_parse(const char *query); +void query_params_free(QueryParams *ps); =20 #endif /* QEMU_URI_H */ diff --git a/include/sysemu/accel-blocker.h b/include/sysemu/accel-blocker.h index 0733783bcc..f07f368358 100644 --- a/include/sysemu/accel-blocker.h +++ b/include/sysemu/accel-blocker.h @@ -16,7 +16,7 @@ =20 #include "sysemu/cpus.h" =20 -extern void accel_blocker_init(void); +void accel_blocker_init(void); =20 /* * accel_{cpu_}ioctl_begin/end: @@ -26,10 +26,10 @@ extern void accel_blocker_init(void); * called, preventing new ioctls to run. They will continue only after * accel_ioctl_inibith_end(). */ -extern void accel_ioctl_begin(void); -extern void accel_ioctl_end(void); -extern void accel_cpu_ioctl_begin(CPUState *cpu); -extern void accel_cpu_ioctl_end(CPUState *cpu); +void accel_ioctl_begin(void); +void accel_ioctl_end(void); +void accel_cpu_ioctl_begin(CPUState *cpu); +void accel_cpu_ioctl_end(CPUState *cpu); =20 /* * accel_ioctl_inhibit_begin: start critical section @@ -42,7 +42,7 @@ extern void accel_cpu_ioctl_end(CPUState *cpu); * This allows the caller to access shared data or perform operations with= out * worrying of concurrent vcpus accesses. */ -extern void accel_ioctl_inhibit_begin(void); +void accel_ioctl_inhibit_begin(void); =20 /* * accel_ioctl_inhibit_end: end critical section started by @@ -50,6 +50,6 @@ extern void accel_ioctl_inhibit_begin(void); * * This function allows blocked accel_{cpu_}ioctl_begin() to continue. */ -extern void accel_ioctl_inhibit_end(void); +void accel_ioctl_inhibit_end(void); =20 #endif /* ACCEL_BLOCKER_H */ diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index e2849f88ab..0c00890a5e 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -66,8 +66,8 @@ extern "C" { * setjmp to _setjmpex instead. However, they are still defined in libming= wex.a, * which gets linked automatically. */ -extern int __mingw_setjmp(jmp_buf); -extern void __attribute__((noreturn)) __mingw_longjmp(jmp_buf, int); +int __mingw_setjmp(jmp_buf); +void __attribute__((noreturn)) __mingw_longjmp(jmp_buf, int); #define setjmp(env) __mingw_setjmp(env) #define longjmp(env, val) __mingw_longjmp(env, val) #elif defined(_WIN64) diff --git a/include/user/safe-syscall.h b/include/user/safe-syscall.h index ddceef12e2..f06393c09e 100644 --- a/include/user/safe-syscall.h +++ b/include/user/safe-syscall.h @@ -126,8 +126,8 @@ */ =20 /* The core part of this function is implemented in assembly */ -extern long safe_syscall_base(int *pending, long number, ...); -extern long safe_syscall_set_errno_tail(int value); +long safe_syscall_base(int *pending, long number, ...); +long safe_syscall_set_errno_tail(int value); =20 /* These are defined by the safe-syscall.inc.S file */ extern char safe_syscall_start[]; diff --git a/target/i386/sev.h b/target/i386/sev.h index 7b1528248a..e7499c95b1 100644 --- a/target/i386/sev.h +++ b/target/i386/sev.h @@ -46,9 +46,9 @@ bool sev_es_enabled(void); #define sev_es_enabled() 0 #endif =20 -extern uint32_t sev_get_cbit_position(void); -extern uint32_t sev_get_reduced_phys_bits(void); -extern bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Erro= r **errp); +uint32_t sev_get_cbit_position(void); +uint32_t sev_get_reduced_phys_bits(void); +bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **err= p); =20 int sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp); int sev_inject_launch_secret(const char *hdr, const char *secret, diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 142c55af47..2077cb29be 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1187,8 +1187,8 @@ void mips_cpu_list(void); =20 #define cpu_list mips_cpu_list =20 -extern void cpu_wrdsp(uint32_t rs, uint32_t mask_num, CPUMIPSState *env); -extern uint32_t cpu_rddsp(uint32_t mask_num, CPUMIPSState *env); +void cpu_wrdsp(uint32_t rs, uint32_t mask_num, CPUMIPSState *env); +uint32_t cpu_rddsp(uint32_t mask_num, CPUMIPSState *env); =20 /* * MMU modes definitions. We carefully match the indices with our diff --git a/tcg/tcg-internal.h b/tcg/tcg-internal.h index e542a4e9b7..285f9f7267 100644 --- a/tcg/tcg-internal.h +++ b/tcg/tcg-internal.h @@ -113,8 +113,8 @@ static inline TCGv_i32 TCGV_HIGH(TCGv_i64 t) return temp_tcgv_i32(tcgv_i64_temp(t) + !HOST_BIG_ENDIAN); } #else -extern TCGv_i32 TCGV_LOW(TCGv_i64) QEMU_ERROR("32-bit code path is reachab= le"); -extern TCGv_i32 TCGV_HIGH(TCGv_i64) QEMU_ERROR("32-bit code path is reacha= ble"); +TCGv_i32 TCGV_LOW(TCGv_i64) QEMU_ERROR("32-bit code path is reachable"); +TCGv_i32 TCGV_HIGH(TCGv_i64) QEMU_ERROR("32-bit code path is reachable"); #endif =20 static inline TCGv_i64 TCGV128_LOW(TCGv_i128 t) diff --git a/tests/tcg/minilib/minilib.h b/tests/tcg/minilib/minilib.h index 17d0f2f314..1ee47cfb61 100644 --- a/tests/tcg/minilib/minilib.h +++ b/tests/tcg/minilib/minilib.h @@ -15,7 +15,7 @@ /* * Provided by the individual arch */ -extern void __sys_outc(char c); +void __sys_outc(char c); =20 /* * Provided by the common minilib diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 7c3a641f7e..92ad74e956 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -20,48 +20,48 @@ */ =20 #ifdef TARGET_ENDIANNESS -extern uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, +uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, +uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL, +uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL, +void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stw, SUFFIX)(ARG1_DECL, +void glue(address_space_stw, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stl, SUFFIX)(ARG1_DECL, +void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stq, SUFFIX)(ARG1_DECL, +void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); #else -extern uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, +uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, +uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL, +uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint32_t glue(address_space_ldl_le, SUFFIX)(ARG1_DECL, +uint32_t glue(address_space_ldl_le, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint32_t glue(address_space_ldl_be, SUFFIX)(ARG1_DECL, +uint32_t glue(address_space_ldl_be, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1_DECL, +uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL, +uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stb, SUFFIX)(ARG1_DECL, +void glue(address_space_stb, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stw_le, SUFFIX)(ARG1_DECL, +void glue(address_space_stw_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stw_be, SUFFIX)(ARG1_DECL, +void glue(address_space_stw_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stl_le, SUFFIX)(ARG1_DECL, +void glue(address_space_stl_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stl_be, SUFFIX)(ARG1_DECL, +void glue(address_space_stl_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, +void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -extern void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, +void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); #endif =20 diff --git a/roms/seabios b/roms/seabios index ea1b7a0733..3208b098f5 160000 --- a/roms/seabios +++ b/roms/seabios @@ -1 +1 @@ -Subproject commit ea1b7a0733906b8425d948ae94fba63c32b1d425 +Subproject commit 3208b098f51a9ef96d0dfa71d5ec3a3eaec88f0a --=20 2.38.1 From nobody Tue May 7 11:07:22 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1679319839; cv=none; d=zohomail.com; s=zohoarc; b=XRJVFww6VeLkP0HxD/0vuFnZzJkoVqFXJV+fB2VUbbsWBCqa7bK2vW7hKzVCfEMVoMrw9C72Tjr83Ts4VuZNUnd5MKwfDio633KA0SPnRCWm69ivTp9EAMBWDg3/ww4GXsGN7KaCcY3lVKddGlgYDEJXJjFnKTIN8EqJv4isvmg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679319839; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z4R55UzzwJbIFt/nZZoBFKmO5Aye9nghmbpLFsyQ7dw=; b=VavesPdmllQVThAdHsR1BzQgXMFLgI54zBQ4VLNSei7u6BSOgcltg5lE7XOnmCJulXizc2Lidi5pfsKbv4sZQCyoAu+QYgFotxVYtWDgA5E/mP6XVcfsCoDMixlRMDs9OfC31wXcoL5di+CinCp1SnM1tvwhL4etI6rSSZz0QEk= 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+importer2=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 1679319839710642.1656077404011; Mon, 20 Mar 2023 06:43:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peFml-0006vd-E2; Mon, 20 Mar 2023 09:42:51 -0400 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 1peFmk-0006re-F5 for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:50 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peFmi-0001wE-TT for qemu-devel@nongnu.org; Mon, 20 Mar 2023 09:42:50 -0400 Received: by mail-wr1-x430.google.com with SMTP id i9so10403338wrp.3 for ; Mon, 20 Mar 2023 06:42:48 -0700 (PDT) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id i7-20020adffc07000000b002c5706f7c6dsm8935371wrr.94.2023.03.20.06.42.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Mar 2023 06:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679319767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z4R55UzzwJbIFt/nZZoBFKmO5Aye9nghmbpLFsyQ7dw=; b=MkAEBo7XBPIN3WB1Okk11aFvpIMh7HXkYTZ++sbfZTtiBg533ac1IG/SAqTmKCl8Dr jyDF9TO2qHfgszZ9CVXirBHvxXB/84bB8S1LLuGlksk7yOEwHdNCeBPY5OVIE94354hR Xb7VgXtebEtO4W2v4L2CcNZCwv30JViD35HkYTCD94gA42ASl3xRo9LvsfKYgwLMMabo zWCRLRByWAEV62XIiMKeoUP41qrQoqMFMZZ69tn4nsw37AiPK3ILx3VWGWrNFplQgmH3 sr+xQA7akW3WpbCjzjnZrjvvKO6YbjZEVYp0Jc5HAlr5PKVgcn/P0oNdwDiXlPghAyFb f5cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679319767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z4R55UzzwJbIFt/nZZoBFKmO5Aye9nghmbpLFsyQ7dw=; b=TQXvs/aFlqJZYVy6cCZJSRqnrUYYeeU1BYiavT3Q9xQkA5YhmwWfdoFdjhrUA7l5Jk EyeZuLaHCULg65bI4siFJhFhpCEWf/sFOTo8E+8d+L0/xGj4X/X77ft5gQ2yJ6VVPgtz xL2rRj+cPfMLAXEEhxuTw/pQvGlwi/2k/DD1S4Lex/vXasQ/zb0KjaIH2HVHsElZdQtY vnnkm4TRoqfaFHqZtR9TZrm0aqgazt80cbk93tqIQt6hAz4QHJV74vKDSyBC2cN4yedw yrn/tYQjdrtox+YCCVLwsJ05SRHn6iq20s3t0FX/UxdTbSc3/OaIft7BXnZqaBl5LHe1 nCXw== X-Gm-Message-State: AO0yUKUsfbRaRD4gxErwaHQtNA6/jTrXvylzg5Pg2af3JD/WHcvi6OGn DZ1sX4DORtZpUQK9mrJpjx4VMngIeHOzYadc2zjLCw== X-Google-Smtp-Source: AK7set89mm3fnNv9+RbhV8wmmd+chVl7ACcQYzjEIKg1618K4pEdYleJXqRtu2NenRI1kLX8DkUlvw== X-Received: by 2002:adf:e407:0:b0:2d1:f705:a602 with SMTP id g7-20020adfe407000000b002d1f705a602mr9668033wrm.22.1679319767378; Mon, 20 Mar 2023 06:42:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil , Juan Quintela , "Dr. David Alan Gilbert" Subject: [PATCH-for-8.1 5/5] bulk: Replace __attribute__((noreturn)) -> G_NORETURN Date: Mon, 20 Mar 2023 14:42:19 +0100 Message-Id: <20230320134219.22489-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230320134219.22489-1-philmd@linaro.org> References: <20230320134219.22489-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1679319840815100003 Under MSYS2, G_NORETURN is expanded to '[[noreturn]]'. Simpler to use the same definition everywhere, unifying the code style. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Juan Quintela --- include/sysemu/os-win32.h | 2 +- tests/migration/stress.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index 0c00890a5e..0b9cae13e4 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -67,7 +67,7 @@ extern "C" { * which gets linked automatically. */ int __mingw_setjmp(jmp_buf); -void __attribute__((noreturn)) __mingw_longjmp(jmp_buf, int); +G_NORETURN void __mingw_longjmp(jmp_buf, int); #define setjmp(env) __mingw_setjmp(env) #define longjmp(env, val) __mingw_longjmp(env, val) #elif defined(_WIN64) diff --git a/tests/migration/stress.c b/tests/migration/stress.c index 88acf8dc25..54a95c07f1 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -36,7 +36,7 @@ static int gettid(void) } #endif =20 -static __attribute__((noreturn)) void exit_failure(void) +static G_NORETURN void exit_failure(void) { if (getpid() =3D=3D 1) { sync(); --=20 2.38.1