From patchwork Mon Mar 20 13:42:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 665196 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp1130821wrv; Mon, 20 Mar 2023 06:43:59 -0700 (PDT) X-Google-Smtp-Source: AK7set8hNVEiBjZwN5N6MbPY3A3FpGuEIttObd8Ok/ETQzADHlsE3gG/fItqcL9NLeAatae4T6rL X-Received: by 2002:a05:6214:c4b:b0:572:6e81:ae9c with SMTP id r11-20020a0562140c4b00b005726e81ae9cmr18255552qvj.1.1679319839082; Mon, 20 Mar 2023 06:43:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679319839; cv=none; d=google.com; s=arc-20160816; b=L2IG9HjZVnM7hV/4sN9cOa5diEfE4Y0YCjuWU4kr/wmQSDPUlkV2249cE4Ne/WIfVF 3rfwNKuahzKYPpZ+GBi6dZ0N6MhBTIQ3FlFE2RWiT/h3H54OKonOwvfiuIPTHY33+Zmx Xl2tXT1aPHm1zNfFv0I/VV0wFkGnvF5baM+J5qIvatfHWHy0Y4u6zQAkPs/AfOE1KDX7 DiEqEnYFZGxxkAXwAQYpBMsXPauZWCm0D0Ooh1dbYROCH4U2W8mRHYgruEXIsHEdqTQd wK7rKBAqwOauXs0FC8md/3mgAfNgVjxrEnEkGyD9FtXqQUCsQIa4BbUZMQ4CYqrAFZd+ fpwg== 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=z4R55UzzwJbIFt/nZZoBFKmO5Aye9nghmbpLFsyQ7dw=; b=yADlMCcN77qsLXqaKOnnIyHtH8UdA2ehbd/hKR4zjG4dcFOUwH44TsGH3uxl47B0XO m91wswiTOXxi3rWIMoOscLdKIuvu55JHtybLJSEDhLzPO03uNUm47y/CAaYVavcXaXkX 0y56WUd+y09xuM8XuNtr/IhTk4KMT1VtA4B7I1AYNvAoShNdmzN6LjUbL7lNjb8quXnX Mv6QpoVLYe2ok+C6srCFas6GEhEwGB0BvZyZAFcTj45A/3+Pm7zLT6tSrj5RXzG5nAIv wlzTWSNsmzwIIiks/dSty0f/UdqFra2ts+hGLSpnwggtMjYxad+d5/3E8vB3BTauXpYC 01cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MkAEBo7X; 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 u4-20020a0cec84000000b0056b64b4fd87si6206972qvo.44.2023.03.20.06.43.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Mar 2023 06:43:59 -0700 (PDT) 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=MkAEBo7X; 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 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) 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-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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é 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 -static __attribute__((noreturn)) void exit_failure(void) +static G_NORETURN void exit_failure(void) { if (getpid() == 1) { sync();