From patchwork Mon Mar 20 13:42:15 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: 665194 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp1130325wrv; Mon, 20 Mar 2023 06:43:00 -0700 (PDT) X-Google-Smtp-Source: AK7set9nram83D2hQUFoufelMWBR/7fnkpMRa88msL2GmnowzBm48He1Z2Z+sjNYz7l5eseJs0Bb X-Received: by 2002:a05:6214:48d:b0:5a2:d726:b84c with SMTP id pt13-20020a056214048d00b005a2d726b84cmr50866038qvb.19.1679319779993; Mon, 20 Mar 2023 06:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679319779; cv=none; d=google.com; s=arc-20160816; b=IqwAZSDhOs/ybUbPv5LLHS2lo1lyuJWDjIM+1G8GiFFxGp5bPxzmeW2CBaMJQv2gCw HX1fm9Z4cVqDiUCQBVOfpcD1JiJFp6DLXs441X+NTC/eguo5NP2h7UDCbebAKju8cC0p d5FFBpSOXYpllzt+pHySoAMDKNWAoaq5M+UjidoNKmVb9a6FiLRcwnFiISHlTEhfMhQ4 rZYR+aZSsDtumao/a8EhhFrUxNp4asEfQgIvewsdHhqFCswPsaQfCueNTKhhfW8JC351 N6/jdeYDeEh/l4MmOenhPo9iUrGLKn9LmP1Aur31PG7zOzIr1axkV06jBooN3jkZW7uO vccg== 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=pdlASMT4jISCzMP7osi2/4IX99eROCkVPgjLB1OApxg=; b=HCKSJdilU8VTvyc8tTv8Jp3BJGxyXCsWoXdzMyWrgpJsMj3ll4yCvu12MB38rqJ26J NtbZK6GA3tn8dMIdcuh1JittsELVj0u5e2DLHn7e1L69GWsHjSd0wg7WvSdllg4qgxw3 vTV01ETntBaM62dwyxEIEXD4En8G3EO0yDAQyng8efVKLIf7Alnc90KexxuADg8UYxQP RQk/Y5fWK2fQVbNf8SlgqVFVh1aihAskubxIc8nSGeE2NyQ5pPSpfhGPAecr6OdEKGYr 85CPrYEhUHjA0ApjFaZTU1jC7DFdzyp+lj2MOeN/+sUs8apVZFy41zFCPOnbRmQjHWnZ mCpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=avX1Qg+h; 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 y195-20020a3764cc000000b007464c429026si5697121qkb.32.2023.03.20.06.42.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Mar 2023 06:42: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=avX1Qg+h; 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 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) 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-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) 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) 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?= , =?utf-8?q?Simon_W=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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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: standard 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örner Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1541 Signed-off-by: Philippe Mathieu-Daudé --- 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__) From patchwork Mon Mar 20 13:42:16 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: 665195 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp1130539wrv; Mon, 20 Mar 2023 06:43:24 -0700 (PDT) X-Google-Smtp-Source: AK7set+fjoGJhVN6sikkX0VXCJGx4ilyM1lfr08r44wnzgOo8y5W/nfHecGfz9a+30mlaDNR4i18 X-Received: by 2002:a05:6214:19ce:b0:5a5:b269:bfd7 with SMTP id j14-20020a05621419ce00b005a5b269bfd7mr42664410qvc.8.1679319804494; Mon, 20 Mar 2023 06:43:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679319804; cv=none; d=google.com; s=arc-20160816; b=hHoyfKQiZiRl6rJFdaz/Yv6/7ULT/W1T1abMHByK+hbh0iJMz1kn3/u0p/sLjvjeWB KXdZeVxw2t6lYk/qMrUjy/83jwTAJFZoix3j+APUc9x29MOSk1rcF1zbsQ4NJIIreeoE 8GEtN4x7VT7dS04tIsQlEP4IqQIyWyQRXwAAPjccSJWfxbqeYDk0P7PoKp8naiO9zk1+ 7vD68vZbJJQfbF88gGdkMeLBdsgjPPDg4Wt89pS8BwCKBQJZS49E0Sm3QXSWRUsm3ZSc PK1kegdNbSWBZN2KKua4ftO8iqU0IPBwQOjDOjMr3BY7oJLWw6Ix0uigE19WlDR2HSEg ZV0g== 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=0NISlk1vZdvB+f1eUp7+3HHuzYbWQKCVdKec7G0ejZQ=; b=MmVRT4jX/9HmINw2aOfj8VRq2SefRWbH7S1GYOOffNx21AhFYKA3DprU30Kc9JQSSY kyrIF+ESF0NoKK7slW8kDMUdSEkTCxb+V/akX6BSOebYYJOjkhLCCh5Oa+NQz1jg7QiM vKG4mDzZ1ObZWqHlBIwZ7x8OKf2bw9EXW90ec75LGGToLm9Jc+m707PTdL2s0jQiozCC +c3bP2t1MWY3DSOCLi8bdFfst5trctHd5cKf+Huz5Mx/829NaHieCMArkM2qVJlMWIf8 gvH1jtkPRHEYSF8mQueeqlN+nWpKx8MG8aVFw5UJMRnABv7WFc4Tel/ZKeX4Ujv7PY8M 6NFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HRSBo9QO; 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 k17-20020ad44511000000b0056eb136aa91si5693038qvu.63.2023.03.20.06.43.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Mar 2023 06:43:24 -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=HRSBo9QO; 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 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) 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-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) 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) 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 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Both dmg_uncompress_bz2 / dmg_uncompress_lzfse are declared in "dmg.h", included 1 line before. Signed-off-by: Philippe Mathieu-Daudé --- 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" -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 used * or truncating when converting to 32-bit types From patchwork Mon Mar 20 13:42:17 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: 665193 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp1130324wrv; Mon, 20 Mar 2023 06:43:00 -0700 (PDT) X-Google-Smtp-Source: AK7set9v+o4Y/jiFsOEBw+uQGyEIMncwtV7vbU7AKUOle505XwQumuOPc5DCYPtvmTOzGebXy6d8 X-Received: by 2002:a05:622a:210:b0:3bd:1a8a:800b with SMTP id b16-20020a05622a021000b003bd1a8a800bmr27041401qtx.62.1679319779995; Mon, 20 Mar 2023 06:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679319779; cv=none; d=google.com; s=arc-20160816; b=McpIT0cJdDlsUqd7MPJ66VIK/zTH7NzzrM0auAgj/NMj3eh/GMweqqd1euwduXQOLE Mk/gajQ86vALwKUcVvPyZycNr6lwm4u3QlSJNXtim5Lk4uDKRDyEkIWDy9AmD3PXeuuG txkSzADZ3NpBbxCY7Ywv8vjELvwCzvyKTyas9qIQL01F9uAiaJAWri5aJBW4SSczLg3B FT5397kk+moQBuwG1Wg8ia3nAGBVT7hjE9m1aUpimzYFhoMKveHvSVRSUmEaBCZT06MI jZ8lVXGmFce2/QQkT860q5K6/jRl8WTgOui2gLfWBfHXr3aG8Hcud4ghBAHXOkuVWvTT 2spw== 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=m8uaccxHJ+UC9X9MhGYwy+hp8RackIzB3cnPRGAUhR4=; b=KXULETEiAO032e3/dvd8p0Qt668pBhrkbn+VmAVMIPnWs2QfScZhvl5pC5B7llmbxF ZVNCWCuRiqYnfrCKthGCL8sE8Q6FMjHoG2HMHU0VeTYRLifC94MbYhstzOTXGbliDbdM MY3Fch+/POh7X+sTEW9OXKhZuxcHSKSodxBuNiM0EeRW7VQ4pxAmI46XW/hkJ4Cgxab8 CSR5tK6GJ6bZ9KSFDWTvmk9QwcLfvJP+WEQB0tN3J+8Da68HbKoUMfJP+aWE8cgtwTDZ qKZ724hqqSV3ei0Q6CySUvsJNnN+3nFhABDpgQSYo9NqmFsU9xmgl/umVhnEMpKAdq85 9hQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="pXD5f/oM"; 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 d3-20020a05620a240300b007467d67bd94si2383889qkn.745.2023.03.20.06.42.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Mar 2023 06:42: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="pXD5f/oM"; 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 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) 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-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) 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) 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?= 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Follow QEMU CODING_STYLE, use the type definition. Signed-off-by: Philippe Mathieu-Daudé --- 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; -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); 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();