From patchwork Fri Sep 20 07:41:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 829846 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp701316wrn; Fri, 20 Sep 2024 00:46:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWVjOICADu03ZHZlIdeLILYStON82QOss8CK2BTshmXBOl9yEmmyunZv1vaKiyhRLhx4R/0rQ==@linaro.org X-Google-Smtp-Source: AGHT+IFboCpzYtzee5t3OdPhbZiJnsNQUB8r46WgIs1NYPdShYLtNBtl7SUDoDiUOgUzJq+z51Bq X-Received: by 2002:a05:620a:2911:b0:7a9:b7c7:ad4f with SMTP id af79cd13be357-7acb8e11572mr320011085a.63.1726818392683; Fri, 20 Sep 2024 00:46:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726818392; cv=none; d=google.com; s=arc-20240605; b=SehRW764i1PjqG+3a1x76oEv5qreoFmaAQM4y7X1HGv+nnwMYd9M13T8H5PFPwXZOt 0+TMA+2+rxOmm5gYu76jiMVk1uMISPuw1xr2E4smibsCGIl9eXJImn6wKr9sl5xzJIgS /WLd/KlX/LDqLbQETX7X5UnUvCg5ITtxD+T+TOV4FB/Gv4Y1GuMBvtgMuZIZRPQQgVeP y+1eactL/5fOiOsjr5cHo1X6GLPUtCLoJNV83rSMqv/fcbot43n887Wc2m4k05GD6X82 ucL8XxN0uzoGPzKgVbvueyD1m64DOT9gwoMMUpWv1HxG60V2o0dqaaCcvrl+zpKTO6/Y K39g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=57B+fEh60qMpNzy3fMc3auXmRAMXohNoD30U0L+7yFs=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=LmmwEfNh6pE/FTsOPIai8GtUdhzOQI/J1ZyVav14bfMfyt4qqN1fNkX1sf36ScWjOm fdrZpvSvY5QRl2dcp8PxgGJ0ZGR5eEO3yOT8yw6yYYmgT5sHoGT0HtmjisTtBnDREcmR bil6qOb9dm+53L88CQRL4kaW8XtdMwJ1ZA0+5vH4qBu+GmcVyOe2fY5dr54zgz0z77TG ovk/TlhGfrE6DKulTiXUYS0jUycELvQx9yazqsbno3FW/jMsInODb9BpvCMPRrQa63SW z1ua6hcA+0fV6OTVwAq0Pi7+v5tfBNv5a5q2OtTH5E8uqcDRcgFq/xPlR8u4TkrKXCno TJjQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7acb090fc88si371856285a.736.2024.09.20.00.46.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Sep 2024 00:46:32 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srYHA-0007J9-2c; Fri, 20 Sep 2024 03:42:00 -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 1srYH8-0007Cz-6A; Fri, 20 Sep 2024 03:41:58 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srYH6-0000FC-Kd; Fri, 20 Sep 2024 03:41:57 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 053D79085D; Fri, 20 Sep 2024 10:41:19 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 94FE81409E0; Fri, 20 Sep 2024 10:41:38 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 07/22] tests/unit: Really build pbkdf test on macOS Date: Fri, 20 Sep 2024 10:41:19 +0300 Message-Id: <20240920074134.664961-8-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240920074134.664961-1-mjt@tls.msk.ru> References: <20240920074134.664961-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 From: Philippe Mathieu-Daudé Fix a typo to run the pbkdf crypto cipher tests on macOS. $ make check-unit ... 87/102 qemu:unit / test-crypto-pbkdf OK 2.35s 17 subtests passed Fixes: ebe0302ac8 ("tests/unit: build pbkdf test on macOS") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- tests/unit/test-crypto-pbkdf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/test-crypto-pbkdf.c b/tests/unit/test-crypto-pbkdf.c index b477cf4e4b..12ee808fbc 100644 --- a/tests/unit/test-crypto-pbkdf.c +++ b/tests/unit/test-crypto-pbkdf.c @@ -25,7 +25,7 @@ #include #endif -#if defined(_WIN32) || defined(RUSAGE_THREAD) || defined(CONFIG_DARWNI) +#if defined(_WIN32) || defined(RUSAGE_THREAD) || defined(CONFIG_DARWIN) #include "crypto/pbkdf.h" typedef struct QCryptoPbkdfTestData QCryptoPbkdfTestData; From patchwork Fri Sep 20 07:41:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 829850 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp701671wrn; Fri, 20 Sep 2024 00:47:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWawX/KqLINHPYGniFWGvUe5lSjwTGJJhsLWdGaMKhXuQaQ9gYblzlClY1l6Kw75SEdkjpA/g==@linaro.org X-Google-Smtp-Source: AGHT+IGzaxVIv8UvNBLm/obHeJy6G2santLR48eLPUds3Ut5yAHyvf5rPqqNf3VA1X7JB/KaLnuf X-Received: by 2002:a05:6102:32c5:b0:49b:e7d7:3e1b with SMTP id ada2fe7eead31-49fc7537dfdmr3010598137.3.1726818475344; Fri, 20 Sep 2024 00:47:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726818475; cv=none; d=google.com; s=arc-20240605; b=dsW40xem90JuDmD130ZAjV2+hyBaLk3EbT2YEPczNBhZWpag0EZ0/QVwCGyzK91MiU SWaQqL+uRSDac7QUCP9VbaTcdajPzZocSx/i9s5qzKgtTfe+i1+WZkFnmKWeK9CuOfmN wKJIy1hvNh+NHUiwew3+OxIeu/3V4GoOIj8C5CI6jrpUGRGUzQgUrNobz+nVQl1G1cOX tCUQQgD1rNN5aJ6V6gW6HTn4kpx26SKtyzOQPL7c6DPJ2KHk3OyzHZ1mLxobW+A5izp+ /+uYF9sGWcDCFTdAqa5y3qjXesjFv7723eUh5hQ8WVadqL+ctdw4EjxumE2scz18UqRc jmHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=CSbA7NtjktmPnZTwK2mo1sqKDgqN0FdJ0mKCCK9AFGo=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=kY8VXgwUkOaghNS1bz+WpVcmFpnT+nGEAe1DnXoFP47x7fUaur3Egrc2l226VPu/4s 8QePyoe1gvidgjhADntyC+sV26JIEc6yjiXXQ6TJ+H+7Jj+ZP+DaOa4wmEqhfvA5gcJq z+tLlSBlvyB5FKbuivLkhccfPfNCCeLdnEhy6taRGQqLpP/oRhwc33BQVSJshu5ALbQr ok51s//Ok15zsLr79VtejtDb+Gb2jtuUJY5VYqT5jSjBQDSek/syfz5IAjhHVlilqm1I l3TiXD/ASuaPVoKr14dg/a4dSOhKX9PrnF/Dw+e7gjtnCxVpuUG4nubtbNAbFSaV2fvA 0GQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45b1792f0e3si35543731cf.578.2024.09.20.00.47.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Sep 2024 00:47:55 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srYI4-0003qc-G1; Fri, 20 Sep 2024 03:42:56 -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 1srYHj-0001rQ-9s; Fri, 20 Sep 2024 03:42:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srYHh-0000JL-GN; Fri, 20 Sep 2024 03:42:35 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 3B3E890866; Fri, 20 Sep 2024 10:41:24 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id D24FC1409E9; Fri, 20 Sep 2024 10:41:43 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 16/22] target/hexagon: Rename macros.inc -> macros.h.inc Date: Fri, 20 Sep 2024 10:41:28 +0300 Message-Id: <20240920074134.664961-17-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240920074134.664961-1-mjt@tls.msk.ru> References: <20240920074134.664961-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 From: Philippe Mathieu-Daudé Since commits 139c1837db ("meson: rename included C source files to .c.inc") and 0979ed017f ("meson: rename .inc.h files to .h.inc"), EMU standard procedure for included header files is to use *.h.inc. Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented in the Coding Style: If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion. Therefore rename "macros.inc" as "macros.h.inc". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Brian Cain Reviewed-by: Anton Johansson Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- target/hexagon/gen_idef_parser_funcs.py | 2 +- target/hexagon/idef-parser/README.rst | 4 ++-- target/hexagon/idef-parser/{macros.inc => macros.h.inc} | 0 target/hexagon/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename target/hexagon/idef-parser/{macros.inc => macros.h.inc} (100%) diff --git a/target/hexagon/gen_idef_parser_funcs.py b/target/hexagon/gen_idef_parser_funcs.py index eb494abba8..72f11c68ca 100644 --- a/target/hexagon/gen_idef_parser_funcs.py +++ b/target/hexagon/gen_idef_parser_funcs.py @@ -50,7 +50,7 @@ def main(): tagimms = hex_common.get_tagimms() with open(sys.argv[-1], "w") as f: - f.write('#include "macros.inc"\n\n') + f.write('#include "macros.h.inc"\n\n') for tag in hex_common.tags: ## Skip the priv instructions diff --git a/target/hexagon/idef-parser/README.rst b/target/hexagon/idef-parser/README.rst index d0aa34309b..7199177ee3 100644 --- a/target/hexagon/idef-parser/README.rst +++ b/target/hexagon/idef-parser/README.rst @@ -138,7 +138,7 @@ we obtain the pseudo code with macros such as ``fJUMPR`` intact. The second step is to expand macros into a form suitable for our parser. -These macros are defined in ``idef-parser/macros.inc`` and the step is +These macros are defined in ``idef-parser/macros.h.inc`` and the step is carried out by the ``prepare`` script which runs the C preprocessor on ``idef_parser_input.h.inc`` to produce ``idef_parser_input.preprocessed.h.inc``. @@ -266,7 +266,7 @@ in plain C is defined as #define fABS(A) (((A) < 0) ? (-(A)) : (A)) and returns the absolute value of the argument ``A``. This macro is not included -in ``idef-parser/macros.inc`` and as such is not expanded and kept as a "call" +in ``idef-parser/macros.h.inc`` and as such is not expanded and kept as a "call" ``fABS(...)``. Reason being, that ``fABS`` is easier to match and map to ``tcg_gen_abs_``, compared to the full ternary expression above. Loads of macros in ``macros.h`` are kept unexpanded to aid in parsing, as seen in the diff --git a/target/hexagon/idef-parser/macros.inc b/target/hexagon/idef-parser/macros.h.inc similarity index 100% rename from target/hexagon/idef-parser/macros.inc rename to target/hexagon/idef-parser/macros.h.inc diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index 9ea1f4fc59..f1723778a6 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -284,7 +284,7 @@ if idef_parser_enabled and 'hexagon-linux-user' in target_dirs 'idef_parser_input.preprocessed.h.inc', output: 'idef_parser_input.preprocessed.h.inc', input: idef_parser_input_generated, - depend_files: [idef_parser_dir / 'macros.inc'], + depend_files: [idef_parser_dir / 'macros.h.inc'], command: [idef_parser_dir / 'prepare', '@INPUT@', '-I' + idef_parser_dir, '-o', '@OUTPUT@'], ) From patchwork Fri Sep 20 07:41:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 829847 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp701401wrn; Fri, 20 Sep 2024 00:46:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUvDnysFm9/OzC2mGFFuRYbhML+McEedYz9B0/au27KRyPt+3U3JnFDz8ME8/0M0HLLbcT/vA==@linaro.org X-Google-Smtp-Source: AGHT+IGBCgGjwG4WkbmZqDypuSTiGkYTOxTm796z7rV95hZsH7OolLgAPSyVKi8bs3azktBoLmUK X-Received: by 2002:a05:6214:428d:b0:6c5:13f0:2415 with SMTP id 6a1803df08f44-6c7bc7bd7ddmr25916226d6.40.1726818413550; Fri, 20 Sep 2024 00:46:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726818413; cv=none; d=google.com; s=arc-20240605; b=fA/5pe+SRUxgyD+IYx/2/iU/xKnEU0ttQCNAC5uM4NjSQa0frHC1KmPm90JoTHR62R 5EPtaRVDHS5qJPl4IfMlXXOrwzV+B3cY0r/CfWWGcl1IwS4tN5x83+Pq0qFFcodxMUgc NEHymqbI8RF1eEywOUKU5C9UIRCzTK0QyFX07KCXF5Zz42+GepVqJ/eVFCxxODun1qCt hgX2exVdxQ43OfQwejSSDAziFSjR52yuK6C9VYjUWbhJUMaXxgxwNTRUSpj08DFfiZnm tQU7FDQK+z29nPRmb/6Jlo1Cw4S0ivfPRrnTtIOG7fxatjWKvmY7jhJ7TLA/fb3EuhSG rBiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=/nzZ35al4Jhti/15qFCcjADyfGFGWewfhTkDUiTPNAk=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=iNbDhWO8Qs9IQLWuwIEMFOUfb3y0fgT10re4Z6poScHc46rhSKc7OFMXWbGIUzeN6j IWcLTWj5mCFrxSv6J42p8FgEn8JpCw/6yJN5mM3ytbybaShCvapQvp+tXMuVjrTUab9I T/QSQ7fPExsTW9mirhpo636tGbaeLs9hj0kR0JgLscegbpHj1ejuXQbt/+Kq7rtAL8LO JY/DlNCgjB4JOM1wyianWGN+AefQ3oIgeInPFb8PRy9qkzWq7nnVBmQ+mpC2aaSC8tsZ PrX2pxsK1iKl4aUAuvWcO0LPO1+7ONEYpwzJ3lfF3cLIYjUGmzexJpSvdxocwFXr9Wvw ddZg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6c75e584e05si36774816d6.405.2024.09.20.00.46.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Sep 2024 00:46:53 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srYI6-00049b-3c; Fri, 20 Sep 2024 03:42:58 -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 1srYI3-0003m4-H9; Fri, 20 Sep 2024 03:42:55 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srYI1-0000JV-MB; Fri, 20 Sep 2024 03:42:55 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B8AF890867; Fri, 20 Sep 2024 10:41:24 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 5FA171409EA; Fri, 20 Sep 2024 10:41:44 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 17/22] tests/bench: Rename test_akcipher_keys.inc -> test_akcipher_keys.c.inc Date: Fri, 20 Sep 2024 10:41:29 +0300 Message-Id: <20240920074134.664961-18-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240920074134.664961-1-mjt@tls.msk.ru> References: <20240920074134.664961-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 From: Philippe Mathieu-Daudé Since commit 139c1837db ("meson: rename included C source files to .c.inc"), QEMU standard procedure for included C files is to use *.c.inc. Besides, since commit 6a0057aa22 ("docs/devel: make a statement about includes") this is documented in the Coding Style: If you do use template header files they should be named with the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are being included for expansion. Rename "test_akcipher_keys.inc" as "test_akcipher_keys.c.inc". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- tests/bench/benchmark-crypto-akcipher.c | 2 +- .../bench/{test_akcipher_keys.inc => test_akcipher_keys.c.inc} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/bench/{test_akcipher_keys.inc => test_akcipher_keys.c.inc} (100%) diff --git a/tests/bench/benchmark-crypto-akcipher.c b/tests/bench/benchmark-crypto-akcipher.c index 750c7e89ee..0a6e5db1d6 100644 --- a/tests/bench/benchmark-crypto-akcipher.c +++ b/tests/bench/benchmark-crypto-akcipher.c @@ -16,7 +16,7 @@ #include "crypto/akcipher.h" #include "standard-headers/linux/virtio_crypto.h" -#include "test_akcipher_keys.inc" +#include "test_akcipher_keys.c.inc" static QCryptoAkCipher *create_rsa_akcipher(const uint8_t *priv_key, size_t keylen, diff --git a/tests/bench/test_akcipher_keys.inc b/tests/bench/test_akcipher_keys.c.inc similarity index 100% rename from tests/bench/test_akcipher_keys.inc rename to tests/bench/test_akcipher_keys.c.inc From patchwork Fri Sep 20 07:41:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 829844 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp700468wrn; Fri, 20 Sep 2024 00:43:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWNZrFPhVyV+no3tfPZQbHrhVJ0aEZG6w14y0a1dn2fKaj4TSB2l3KLYCtZ+OW3RCJSlNfuOw==@linaro.org X-Google-Smtp-Source: AGHT+IEGGgDnUDn/s2F5hKS8Ggu1PccsUCuxCwnfMKvo3o1dX+iZ6LCVGS0Ou67xrH1KhLBxpASD X-Received: by 2002:a05:620a:1720:b0:79f:15ca:b786 with SMTP id af79cd13be357-7acb80ba864mr270889985a.16.1726818196969; Fri, 20 Sep 2024 00:43:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726818196; cv=none; d=google.com; s=arc-20240605; b=AE+0VC19TtThHRF4MetsTLYfeQmrq4RMOvXjAebwMu7GB+A1XtWMxaJRMBjoJETqs7 ydOMG4ey+Oe//y+RzIkZQSVU6FkUfIhGPu9SlTs5VN7Ej5AC+vt4PDijYWitUQxCwBHM TBBlSZW9tSA3r0XAmNhjw6dEQ36LDYUbikresprnVnM9c3WGW7YNPBvT+0+EFc5gN8Zu svULgEAeP4Wmv2eUwoxq2NM/TJ37/oEwH13sIHRgeSfp3pLz3CFC0lQ/4LxSvs/CXPG4 VfzqXhtYm6VioSsj6IGqwf7PLuBpZ8l/HJHUN2MMe+sif7BdqI+5MHePiwl0js9d9mpo yp0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=jeAQ3YdCwvtc3qpq7D8AUVKv681KCVP/1QxSkDzLIkA=; fh=t0N3B6WTBakweBQpwbFSNrQY8Xi436mHEA9dobwxyb4=; b=dAP5ACO4nwxfi8YvqK0ypUq+ne8rSUani9llw4k3/qcDTLOU2PJ+V2/9A8VXM+PREh DHzuHxxu8/4A7Xn5IvUZ/go65GU3A0FHhn/IxFnBde0JsTq0eVYVczZn7xOolh/rMUe7 a+8fXJenX3fLPn/2QmIIzD3Mdw4wL7ZHXSxxvai7LXIjRIJs2gWb1L41sTCAVugsuYCg 7uxIq9zqNlKVRjTdGojEwwRpstFi6Zbp6UurKhzpPXo4brIMGe9oPwytu+IB+ig0trpE 2AIKyo1sJs3uxdpmSoAKPDTED/Y/XyvgJTlJHHkVVgQQQuQwDOzD3LkvtmqHKwnFkrJW nG8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7acb07f85d4si372420785a.60.2024.09.20.00.43.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Sep 2024 00:43:16 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srYI9-0004cY-Do; Fri, 20 Sep 2024 03:43:01 -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 1srYI6-0004IZ-ME; Fri, 20 Sep 2024 03:42:58 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srYI4-0000Jr-ND; Fri, 20 Sep 2024 03:42:58 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6BC1F90868; Fri, 20 Sep 2024 10:41:25 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id DD2ED1409EB; Fri, 20 Sep 2024 10:41:44 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev Subject: [PULL 18/22] tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag Date: Fri, 20 Sep 2024 10:41:30 +0300 Message-Id: <20240920074134.664961-19-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240920074134.664961-1-mjt@tls.msk.ru> References: <20240920074134.664961-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 From: Philippe Mathieu-Daudé Cc: Alex Bennée Fixes: 9f95111474 ("tests/avocado: re-factor igb test to avoid timeouts") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- tests/functional/test_netdev_ethtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/test_netdev_ethtool.py b/tests/functional/test_netdev_ethtool.py index d5b911c918..ee1a397bd2 100755 --- a/tests/functional/test_netdev_ethtool.py +++ b/tests/functional/test_netdev_ethtool.py @@ -5,7 +5,7 @@ # This test leverages ethtool's --test sequence to validate network # device behaviour. # -# SPDX-License-Identifier: GPL-2.0-or-late +# SPDX-License-Identifier: GPL-2.0-or-later from unittest import skip from qemu_test import QemuSystemTest, Asset From patchwork Fri Sep 20 07:41:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 829843 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp700420wrn; Fri, 20 Sep 2024 00:43:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlZ725R/s2gJI7z8mQ0mxn6mV87icEkl3itcJH1i5tuK6tXLlJsX9dgB2ecZAmP0yaHwlNFA==@linaro.org X-Google-Smtp-Source: AGHT+IFrvpiHV1MW/hp+QggR86K5vBwzOOo27LKNPmOZ6Dq59kz2ioL8As8+BiXmv/BwnYkAk8Oi X-Received: by 2002:a05:620a:1a9e:b0:7ac:a9b2:9374 with SMTP id af79cd13be357-7acaf531b06mr1024986685a.4.1726818187696; Fri, 20 Sep 2024 00:43:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726818187; cv=none; d=google.com; s=arc-20240605; b=KAlWO2EtTR9iyFz5sFVeUypNDiuE04UxGhPIIwGRaMCpCj0Nv4EKGMTg7ckFryjAmj e8NTjzbQpGeYy/Gc1nn8P7gXHREYRVRtBhk/ohRDVEJNf2CS13AnkG8Ks5kXLeqAo4kH BDxXO1JzU/HbZGYVxMjbwRkSTX4l02yztH8U4htY+1/BSPIeiqzxJ0ur/2VwcrSyS30x dsAHxIFunkL9Wq5Q78vHygYTUO+fF/wAFGTxJkVbAP654JkN3XMlW12pAs2iv169mfde S5mqv6dXGPD1wbt6lnEz4MI+Xyx7g4G7PfMczUDZrSFeIEXF3DMtexcBTSCxslcT1hWz feJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=V78vcDh+5Qh0YuWVIbnF1vkWYaH6ajNZvxzVFgD8BdU=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=iiOlCTzhcDJ/Fkml7k4T+gsTqfWC29G1z9r2Ua27tgBMrF7Ay2x0UQyk/v0p0qWdbx 1fpLY7Ou5hQ7p2mpRfYNYaAZOOf2PDL5vw9jf8uQIAdc09i+HTnQT3sbJwK9Iyk7xQqu a49y8RFAGc2DmItJY0daRR2FXqoVBqFdzR+GRZpnx8NCvTRr9xNqjaeiTsH0VQU6V30o zsJnEqNdat/VKC4H7787BvXlFWy4c/l+k+Cacn5r8xBL/CNL6hFmysx4GJeNpsk34Mq4 v7m1/19MVIy3gjYaEdC+Awc1WqYTP1Rxk8LWqryArKNAxZ+vA/rWfGgdstki/bUq++/W h6Tw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7acb08e3f6dsi375522885a.420.2024.09.20.00.43.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Sep 2024 00:43:07 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srYI9-0004g0-Ry; Fri, 20 Sep 2024 03:43:02 -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 1srYI7-0004Ra-Do; Fri, 20 Sep 2024 03:42:59 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srYI5-0000LG-1b; Fri, 20 Sep 2024 03:42:59 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E95D990869; Fri, 20 Sep 2024 10:41:25 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 906371409EC; Fri, 20 Sep 2024 10:41:45 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 19/22] license: Simplify GPL-2.0-or-later license descriptions Date: Fri, 20 Sep 2024 10:41:31 +0300 Message-Id: <20240920074134.664961-20-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240920074134.664961-1-mjt@tls.msk.ru> References: <20240920074134.664961-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 From: Philippe Mathieu-Daudé Since the "2 | 3+" expression can be simplified as "2+", it is pointless to mention the GPLv3 license. Add the corresponding SPDX identifier to remove all doubt. Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Michael Tokarev --- block/vdi.c | 4 +++- hw/net/eepro100.c | 4 +++- hw/ppc/rs6000_mc.c | 4 +++- include/qemu/timed-average.h | 4 +++- qemu.nsi | 4 +++- util/timed-average.c | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 6363da08ce..149e15c831 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -3,10 +3,12 @@ * * Copyright (c) 2009, 2012 Stefan Weil * + * SPDX-License-Identifier: GPL-2.0-or-later + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or - * (at your option) version 3 or any later version. + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index d9a70c4544..c8a88b9813 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -6,10 +6,12 @@ * Portions of the code are copies from grub / etherboot eepro100.c * and linux e100.c. * + * SPDX-License-Identifier: GPL-2.0-or-later + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or - * (at your option) version 3 or any later version. + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c index e6ec4b4c40..07b0b664d9 100644 --- a/hw/ppc/rs6000_mc.c +++ b/hw/ppc/rs6000_mc.c @@ -3,10 +3,12 @@ * * Copyright (c) 2017 Hervé Poussineau * + * SPDX-License-Identifier: GPL-2.0-or-later + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or - * (at your option) version 3 or any later version. + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/qemu/timed-average.h b/include/qemu/timed-average.h index 08245e7a10..dfd8d653fa 100644 --- a/include/qemu/timed-average.h +++ b/include/qemu/timed-average.h @@ -8,10 +8,12 @@ * Benoît Canet * Alberto Garcia * + * SPDX-License-Identifier: GPL-2.0-or-later + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or - * (at your option) version 3 or any later version. + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/qemu.nsi b/qemu.nsi index 564d617d11..b186f223e1 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -7,7 +7,7 @@ ; This program is free software: you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by ; the Free Software Foundation, either version 2 of the License, or -; (at your option) version 3 or any later version. +; (at your option) any later version. ; ; This program is distributed in the hope that it will be useful, ; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,6 +16,8 @@ ; ; You should have received a copy of the GNU General Public License ; along with this program. If not, see . +; +; SPDX-License-Identifier: GPL-2.0-or-later ; NSIS_WIN32_MAKENSIS diff --git a/util/timed-average.c b/util/timed-average.c index 2b49d532ce..5b5c22afd8 100644 --- a/util/timed-average.c +++ b/util/timed-average.c @@ -8,10 +8,12 @@ * Benoît Canet * Alberto Garcia * + * SPDX-License-Identifier: GPL-2.0-or-later + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or - * (at your option) version 3 or any later version. + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of From patchwork Fri Sep 20 07:41:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 829848 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp701642wrn; Fri, 20 Sep 2024 00:47:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0GjgkMDflXEw8U4EARIpenjJjP671GQ/WU4fiFhTC8skPGl1Gtgkqa9O431ZEXJ2r5EmpzA==@linaro.org X-Google-Smtp-Source: AGHT+IEZFO7oMujwONajDVSeKbtoDCyljOczPDNVX9V4e3SgEHpw4E6M1X6PxCctIBa7ANE5Fqxz X-Received: by 2002:ac8:5702:0:b0:458:216f:96ef with SMTP id d75a77b69052e-45b2057b8e1mr34713131cf.57.1726818466992; Fri, 20 Sep 2024 00:47:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726818466; cv=none; d=google.com; s=arc-20240605; b=bH67n79HwZWbwg73UVQ5qc8/QOWJgO6AFQw6EnIT1XwDs+dCa+gr2zI0/OLGXlyY/X F1htU8y586QURqQtgD3b/b/a+hzBx5etIzRdk+bGGf+kPySzOU1CrK8mWBUTLqkICydi qKqhFVEoWvoQv5f/BYMTMDbxKWZXoyDKdyONl1BEmsDOrcx/vDcqtx79hpx00Ld3nr0F Bl0eMo9asN5GXpHR0rkTzMkPxyJo7aqr2v3vQNhP6AYOUw9Ba2ZYwh8Igf5dUD+zc0Ra gfjFtq2c4PdL092oP0MaU+j77pzSglSGzaR5EHXKhsD1tzT78ngpYZ7MBff0wEXc7+Vv 4DCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=NVbAohTuPj/IaIRjiQbDlah4LWKdVIp918buCLFczCE=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=c2A17lObJ3LNFvwaaNQxGMjcue6uiJogKCEAUqvFT+4L9XErQQ/f0uHpyhQM2x81aU gNRPSc7PgpWANyasoKJJvynD+x4lMDM8HWreV3EmiqGYu9mXzLBtmkkv6mcHcwo70Oy4 fg2rQNgGnzjWBRz+F1tpqIk/pCzNJ44IX/PNdoNyzjqzxZJNTg8VLlDTlDN/dcpTzx3J FVEypfuWV/q2QFc/79ex5kFhe3KO1Di4cM8SQyGBpoTCuNA9o768BGtRUKDKkZ8jq5Ab gkUaiec4XxQGPsQlQxisfilnjDXWbd+RgPwxShIxQKKwzzw2U+q6qvd7NhMmSoen18lM ztVQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45b178edf8dsi40262721cf.366.2024.09.20.00.47.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Sep 2024 00:47:46 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srYIN-0005VD-1l; Fri, 20 Sep 2024 03:43:16 -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 1srYIA-0004pS-Is; Fri, 20 Sep 2024 03:43:03 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srYI8-0000Le-1x; Fri, 20 Sep 2024 03:43:02 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6FB759086A; Fri, 20 Sep 2024 10:41:26 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 176F71409ED; Fri, 20 Sep 2024 10:41:46 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 20/22] license: Update deprecated SPDX tag LGPL-2.0+ to LGPL-2.0-or-later Date: Fri, 20 Sep 2024 10:41:32 +0300 Message-Id: <20240920074134.664961-21-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240920074134.664961-1-mjt@tls.msk.ru> References: <20240920074134.664961-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 From: Philippe Mathieu-Daudé The 'LGPL-2.0+' license identifier has been deprecated since license list version 2.0rc2 [1] and replaced by the 'LGPL-2.0-or-later' [2] tag. [1] https://spdx.org/licenses/LGPL-2.0+.html [2] https://spdx.org/licenses/LGPL-2.0-or-later.html Mechanical patch running: $ sed -i -e s/LGPL-2.0+/LGPL-2.0-or-later/ \ $(git grep -l 'SPDX-License-Identifier: LGPL-2.0+$') Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- gdbstub/gdbstub.c | 2 +- gdbstub/syscalls.c | 2 +- gdbstub/system.c | 2 +- gdbstub/user-target.c | 2 +- gdbstub/user.c | 2 +- include/gdbstub/syscalls.h | 2 +- include/gdbstub/user.h | 2 +- target/alpha/cpu-param.h | 2 +- target/arm/cpu-param.h | 2 +- target/hppa/cpu-param.h | 2 +- target/i386/cpu-param.h | 2 +- target/m68k/cpu-param.h | 2 +- target/microblaze/cpu-param.h | 2 +- target/mips/cpu-param.h | 2 +- target/openrisc/cpu-param.h | 2 +- target/ppc/cpu-param.h | 2 +- target/sh4/cpu-param.h | 2 +- target/sparc/cpu-param.h | 2 +- target/sparc/insns.decode | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index d08568cea0..b1def7e71d 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -20,7 +20,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/gdbstub/syscalls.c b/gdbstub/syscalls.c index 4e1295b782..4ddd5cae06 100644 --- a/gdbstub/syscalls.c +++ b/gdbstub/syscalls.c @@ -7,7 +7,7 @@ * Copyright (c) 2003-2005 Fabrice Bellard * Copyright (c) 2023 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/gdbstub/system.c b/gdbstub/system.c index 1ad87fe7fd..c9f236e94f 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -7,7 +7,7 @@ * Copyright (c) 2003-2005 Fabrice Bellard * Copyright (c) 2022 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/gdbstub/user-target.c b/gdbstub/user-target.c index b5e01fd8b0..22bf4008c0 100644 --- a/gdbstub/user-target.c +++ b/gdbstub/user-target.c @@ -4,7 +4,7 @@ * Copyright (c) 2003-2005 Fabrice Bellard * Copyright (c) 2022 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/gdbstub/user.c b/gdbstub/user.c index b36033bc7a..0b4bfa9c48 100644 --- a/gdbstub/user.c +++ b/gdbstub/user.c @@ -6,7 +6,7 @@ * Copyright (c) 2003-2005 Fabrice Bellard * Copyright (c) 2022 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/include/gdbstub/syscalls.h b/include/gdbstub/syscalls.h index 54ff7245a1..d63228e96b 100644 --- a/include/gdbstub/syscalls.h +++ b/include/gdbstub/syscalls.h @@ -3,7 +3,7 @@ * * Copyright (c) 2023 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef _SYSCALLS_H_ diff --git a/include/gdbstub/user.h b/include/gdbstub/user.h index 3b8358e3da..654986d483 100644 --- a/include/gdbstub/user.h +++ b/include/gdbstub/user.h @@ -3,7 +3,7 @@ * * Copyright (c) 2022 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef GDBSTUB_USER_H diff --git a/target/alpha/cpu-param.h b/target/alpha/cpu-param.h index 5ce213a9a1..c21ddf1afd 100644 --- a/target/alpha/cpu-param.h +++ b/target/alpha/cpu-param.h @@ -2,7 +2,7 @@ * Alpha cpu parameters for qemu. * * Copyright (c) 2007 Jocelyn Mayer - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef ALPHA_CPU_PARAM_H diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h index fa6cae0e3a..bed29613c8 100644 --- a/target/arm/cpu-param.h +++ b/target/arm/cpu-param.h @@ -2,7 +2,7 @@ * ARM cpu parameters for qemu. * * Copyright (c) 2003 Fabrice Bellard - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef ARM_CPU_PARAM_H diff --git a/target/hppa/cpu-param.h b/target/hppa/cpu-param.h index 473d489f01..ef3200f0f3 100644 --- a/target/hppa/cpu-param.h +++ b/target/hppa/cpu-param.h @@ -2,7 +2,7 @@ * PA-RISC cpu parameters for qemu. * * Copyright (c) 2016 Richard Henderson - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef HPPA_CPU_PARAM_H diff --git a/target/i386/cpu-param.h b/target/i386/cpu-param.h index 5e15335203..8c75abe141 100644 --- a/target/i386/cpu-param.h +++ b/target/i386/cpu-param.h @@ -2,7 +2,7 @@ * i386 cpu parameters for qemu. * * Copyright (c) 2003 Fabrice Bellard - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef I386_CPU_PARAM_H diff --git a/target/m68k/cpu-param.h b/target/m68k/cpu-param.h index 39dcbcece8..5bbe623ba7 100644 --- a/target/m68k/cpu-param.h +++ b/target/m68k/cpu-param.h @@ -2,7 +2,7 @@ * m68k cpu parameters for qemu. * * Copyright (c) 2005-2007 CodeSourcery - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef M68K_CPU_PARAM_H diff --git a/target/microblaze/cpu-param.h b/target/microblaze/cpu-param.h index e530fead1c..00efb509e3 100644 --- a/target/microblaze/cpu-param.h +++ b/target/microblaze/cpu-param.h @@ -2,7 +2,7 @@ * MicroBlaze cpu parameters for qemu. * * Copyright (c) 2009 Edgar E. Iglesias - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef MICROBLAZE_CPU_PARAM_H diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h index 6f6ac1688f..f3a37e2dbe 100644 --- a/target/mips/cpu-param.h +++ b/target/mips/cpu-param.h @@ -1,7 +1,7 @@ /* * MIPS cpu parameters for qemu. * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef MIPS_CPU_PARAM_H diff --git a/target/openrisc/cpu-param.h b/target/openrisc/cpu-param.h index fbfc0f568b..6169ed9f55 100644 --- a/target/openrisc/cpu-param.h +++ b/target/openrisc/cpu-param.h @@ -2,7 +2,7 @@ * OpenRISC cpu parameters for qemu. * * Copyright (c) 2011-2012 Jia Liu - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef OPENRISC_CPU_PARAM_H diff --git a/target/ppc/cpu-param.h b/target/ppc/cpu-param.h index 77c5ed9a67..9c481b9f6c 100644 --- a/target/ppc/cpu-param.h +++ b/target/ppc/cpu-param.h @@ -2,7 +2,7 @@ * PowerPC cpu parameters for qemu. * * Copyright (c) 2007 Jocelyn Mayer - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef PPC_CPU_PARAM_H diff --git a/target/sh4/cpu-param.h b/target/sh4/cpu-param.h index a7cdb7edb6..a30ba992b3 100644 --- a/target/sh4/cpu-param.h +++ b/target/sh4/cpu-param.h @@ -2,7 +2,7 @@ * SH4 cpu parameters for qemu. * * Copyright (c) 2005 Samuel Tardieu - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef SH4_CPU_PARAM_H diff --git a/target/sparc/cpu-param.h b/target/sparc/cpu-param.h index 82293fb844..14105dc18b 100644 --- a/target/sparc/cpu-param.h +++ b/target/sparc/cpu-param.h @@ -1,7 +1,7 @@ /* * Sparc cpu parameters for qemu. * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef SPARC_CPU_PARAM_H diff --git a/target/sparc/insns.decode b/target/sparc/insns.decode index 923f348580..989c20b44a 100644 --- a/target/sparc/insns.decode +++ b/target/sparc/insns.decode @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.0+ +# SPDX-License-Identifier: LGPL-2.0-or-later # # Sparc instruction decode definitions. # Copyright (c) 2023 Richard Henderson From patchwork Fri Sep 20 07:41:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 829849 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp701672wrn; Fri, 20 Sep 2024 00:47:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWc8Z4msmRcLc3FR4VLIenfq5ptFw0MqkA+cDmuAzII1JdEY41jhJ2bSe64gLamPDzSbPGnOg==@linaro.org X-Google-Smtp-Source: AGHT+IFfGhCDX9cMf99S542Z2LN0ocklmNY1BUzW+V4t+UeDxoS/cSH/ThrgqYhmSMtWxQefActr X-Received: by 2002:a05:622a:14d2:b0:458:42ee:3585 with SMTP id d75a77b69052e-45b204eab48mr39450841cf.14.1726818475317; Fri, 20 Sep 2024 00:47:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726818475; cv=none; d=google.com; s=arc-20240605; b=Wgd56Bs8d0GtBXPXEmqU1VUPNAvdgmHnmorVODTwS1BIct1RnpJjdKqfVZfBn9jLzr Gy0C4JiDWC6trHInfkw8bNF9vHZTa6onXd0JSGzjADF0kz45IUoVDruJ9RNE1kugEdI2 7tTN5EtcdwlyJzN54MDiEXuvUuvteFAKCjkg7A/5/BfmR5xzeXCH/UwRXmz2iBHnZB03 xp46KDt1iRsIYzRLAYH0hkpBxbjkDpH4xVQ8YMQRCpbQTBzv711vXtmvU86BtTZLLyEC yiW9mDnaOkeHVIRrx4Hpl2mw6HOcj5Tui5MUSJ3jflJO9y709aQ2AA4F2ENo+Y7trv6x QZXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=1WFm6KARMRzhUXImtZcbgUTh4BM7SqIdHaDhdmZR1bo=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=MxPSXsQw36RiNZJtmHB770w3pR0EISCYcbqHgeoERYkK+cdC2o2zIvncS02EhPpCgs eRYPIycWHkCvrODK8nZS9Gtki8vdVyQW6/QY7z0eP2i8S7W+QgNU670A7fvgMMcuqyZ2 MgXmQC9NiaSsxkj78lla+jDZSNhwEt+zDyIjGm5TFH6Ts77QVRm5i8eDbmSkQOxW/zCz 48+FexC1k3eJY/8ZE6817efJK6RL+9089RVFtdPXc5vt03g/jzopHbSrP6YOoeJXJUO/ dSnRiY4a/l/ZN68CoXfah/Z8KC/i092YmtYtUw3wb/ok544JEA8Y73QN2DF6/j/KXkpm 7h1A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45b1786ad64si35323431cf.45.2024.09.20.00.47.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Sep 2024 00:47:55 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srYIX-0006Yy-Ju; Fri, 20 Sep 2024 03:43:25 -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 1srYIA-0004qU-SU; Fri, 20 Sep 2024 03:43:03 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srYI8-0000Lo-SI; Fri, 20 Sep 2024 03:43:02 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id F2C869086B; Fri, 20 Sep 2024 10:41:26 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 94CAC1409EE; Fri, 20 Sep 2024 10:41:46 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 21/22] license: Update deprecated SPDX tag GPL-2.0+ to GPL-2.0-or-later Date: Fri, 20 Sep 2024 10:41:33 +0300 Message-Id: <20240920074134.664961-22-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240920074134.664961-1-mjt@tls.msk.ru> References: <20240920074134.664961-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 From: Philippe Mathieu-Daudé The 'GPL-2.0+' license identifier has been deprecated since license list version 2.0rc2 [1] and replaced by the 'GPL-2.0-or-later' [2] tag. [1] https://spdx.org/licenses/GPL-2.0+.html [2] https://spdx.org/licenses/GPL-2.0-or-later.html Mechanical patch running: $ sed -i -e s/GPL-2.0+/GPL-2.0-or-later/ \ $(git grep -lP 'SPDX-License-Identifier: \W+GPL-2.0\+[ $]' \ | egrep -v '^linux-headers|^include/standard-headers') Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- hw/core/uboot_image.h | 2 +- hw/nvram/fw_cfg-acpi.c | 2 +- hw/virtio/virtio-acpi.c | 2 +- include/hw/nvram/fw_cfg_acpi.h | 2 +- include/hw/usb/dwc2-regs.h | 2 +- include/hw/virtio/virtio-acpi.h | 2 +- target/riscv/cpu-param.h | 2 +- target/s390x/cpu-param.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h index 18ac293359..e4dcfb08f0 100644 --- a/hw/core/uboot_image.h +++ b/hw/core/uboot_image.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 Semihalf * diff --git a/hw/nvram/fw_cfg-acpi.c b/hw/nvram/fw_cfg-acpi.c index 58cdcd3121..2e6ef89b98 100644 --- a/hw/nvram/fw_cfg-acpi.c +++ b/hw/nvram/fw_cfg-acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Add fw_cfg device in DSDT * diff --git a/hw/virtio/virtio-acpi.c b/hw/virtio/virtio-acpi.c index 230a669500..85becef03c 100644 --- a/hw/virtio/virtio-acpi.c +++ b/hw/virtio/virtio-acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * virtio ACPI Support * diff --git a/include/hw/nvram/fw_cfg_acpi.h b/include/hw/nvram/fw_cfg_acpi.h index b39eb0490f..dfd2a44ef0 100644 --- a/include/hw/nvram/fw_cfg_acpi.h +++ b/include/hw/nvram/fw_cfg_acpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ACPI support for fw_cfg * diff --git a/include/hw/usb/dwc2-regs.h b/include/hw/usb/dwc2-regs.h index 0bf3f2aa17..523b112c5e 100644 --- a/include/hw/usb/dwc2-regs.h +++ b/include/hw/usb/dwc2-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ /* * Imported from the Linux kernel file drivers/usb/dwc2/hw.h, commit * a89bae709b3492b478480a2c9734e7e9393b279c ("usb: dwc2: Move diff --git a/include/hw/virtio/virtio-acpi.h b/include/hw/virtio/virtio-acpi.h index cace2a315f..cdfbd943ae 100644 --- a/include/hw/virtio/virtio-acpi.h +++ b/include/hw/virtio/virtio-acpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ACPI support for virtio */ diff --git a/target/riscv/cpu-param.h b/target/riscv/cpu-param.h index 1fbd64939d..25686192c0 100644 --- a/target/riscv/cpu-param.h +++ b/target/riscv/cpu-param.h @@ -2,7 +2,7 @@ * RISC-V cpu parameters for qemu. * * Copyright (c) 2017-2018 SiFive, Inc. - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef RISCV_CPU_PARAM_H diff --git a/target/s390x/cpu-param.h b/target/s390x/cpu-param.h index 11d23b600d..a05ffcf78d 100644 --- a/target/s390x/cpu-param.h +++ b/target/s390x/cpu-param.h @@ -2,7 +2,7 @@ * S/390 cpu parameters for qemu. * * Copyright (c) 2009 Ulrich Hecht - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef S390_CPU_PARAM_H From patchwork Fri Sep 20 07:41:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 829845 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp700851wrn; Fri, 20 Sep 2024 00:44:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV286VZmCTMkBPcH46a5jsH4tlSCXEdEUkWCVRGVXaNHoo0ed4ZR6WfsJXci9keOpdSgjx5NQ==@linaro.org X-Google-Smtp-Source: AGHT+IE0jCPYItKXsO3TXNQXcTxy6h1LkER3oq9GtmCGBkbM1kH6/EoLnLoDDCWK+WBr88EZsUJK X-Received: by 2002:a05:622a:112:b0:458:4aec:2738 with SMTP id d75a77b69052e-45b205608f2mr38884811cf.56.1726818281418; Fri, 20 Sep 2024 00:44:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726818281; cv=none; d=google.com; s=arc-20240605; b=btAAzsuctEwaT5tAkbmI8TXpRbkxm4HAuGos0F+U/F80LrDb/2iNiY1Lpyt7AQF1fD Wl958Yx2R1CVF9ZbBsJTUq+bv1WrXyTssjNUZ+88fEmzPYimRgcq4hYhJnqQ/vMf0/t3 A9kCkQMFrVgGkvp1Vz8NrrT+PTwthJ53ECSX9SnhzcgqTq/1XlnZpEH+jxCwcR69PL1G gR5biyYBMStSOhFYRoxmggCsvS4sgeykDPVUpLQAogGkadVcyeH0s45+i6X8bPVwyGQB RykQgBj6xWELD2YSGBXIVzPYr8OPlK66QAPjYIJoz1mheS10eWbEAualdCEi905O7CLh B2Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=zi+kVFOmY4ViFuLkgi/yniKh65xKPy3F7qSy+qY8AxA=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=G9JVR2dTsOnDN4IyZdKnmvt533Goa7oeLeIacklpZd3kkHcFTgZKjJ6nFu1WIZ7a20 8u7Uc30vlBD6hpBRA81x0/bwnv5ULSCAlYBj/FDKk1OiXkbx4uii83JSGVoSOCt5tHYT 1HTXJSowQwLtq4A94q7JutAakugSIoJCCB0ggYoPTTFLDKcBE35HKi94XkfGen4m4n3M jHFM4lM4kVRHg5IQoFAr+Ar3R5LYi9e0AB3DblLhq5YXrkQ17fAXPVdj6l5AidBLt8PQ xoYBCbnoOG/e2TeO8MNUnUO0SW28vbbD17vb+Zeyx2wZUrRbph39XQpPz5h29bFBFRY5 V5ng==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45b1794086fsi39697941cf.627.2024.09.20.00.44.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Sep 2024 00:44:41 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srYIg-0007T4-0h; Fri, 20 Sep 2024 03:43:34 -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 1srYIZ-0006oe-84; Fri, 20 Sep 2024 03:43:28 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srYIV-0000MP-Um; Fri, 20 Sep 2024 03:43:26 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 801419086C; Fri, 20 Sep 2024 10:41:27 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 26D021409EF; Fri, 20 Sep 2024 10:41:47 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 22/22] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only Date: Fri, 20 Sep 2024 10:41:34 +0300 Message-Id: <20240920074134.664961-23-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240920074134.664961-1-mjt@tls.msk.ru> References: <20240920074134.664961-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 From: Philippe Mathieu-Daudé The 'GPL-2.0' license identifier has been deprecated since license list version 3.0 [1] and replaced by the 'GPL-2.0-only' tag [2]. [1] https://spdx.org/licenses/GPL-2.0.html [2] https://spdx.org/licenses/GPL-2.0-only.html Mechanical patch running: $ sed -i -e s/GPL-2.0/GPL-2.0-only/ \ $(git grep -l 'SPDX-License-Identifier: GPL-2.0[ $]' \ | egrep -v '^linux-headers|^include/standard-headers') Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- hw/m68k/bootinfo.h | 2 +- hw/net/igb_regs.h | 2 +- include/qemu/crc-ccitt.h | 2 +- linux-user/alpha/syscall.tbl | 2 +- linux-user/alpha/syscallhdr.sh | 2 +- linux-user/arm/syscallhdr.sh | 2 +- linux-user/hppa/syscall.tbl | 2 +- linux-user/hppa/syscallhdr.sh | 2 +- linux-user/i386/syscallhdr.sh | 2 +- linux-user/m68k/syscall.tbl | 2 +- linux-user/m68k/syscallhdr.sh | 2 +- linux-user/microblaze/syscall.tbl | 2 +- linux-user/microblaze/syscallhdr.sh | 2 +- linux-user/mips/syscall_o32.tbl | 2 +- linux-user/mips/syscallhdr.sh | 2 +- linux-user/mips64/syscall_n32.tbl | 2 +- linux-user/mips64/syscall_n64.tbl | 2 +- linux-user/mips64/syscallhdr.sh | 2 +- linux-user/ppc/syscall.tbl | 2 +- linux-user/ppc/syscallhdr.sh | 2 +- linux-user/s390x/syscall.tbl | 2 +- linux-user/s390x/syscallhdr.sh | 2 +- linux-user/sh4/syscall.tbl | 2 +- linux-user/sh4/syscallhdr.sh | 2 +- linux-user/sparc/syscall.tbl | 2 +- linux-user/sparc/syscallhdr.sh | 2 +- linux-user/x86_64/syscallhdr.sh | 2 +- linux-user/xtensa/syscall.tbl | 2 +- linux-user/xtensa/syscallhdr.sh | 2 +- scripts/kernel-doc | 2 +- tests/tcg/loongarch64/system/regdef.h | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/hw/m68k/bootinfo.h b/hw/m68k/bootinfo.h index 0e6e3eea87..70c1dc0e8c 100644 --- a/hw/m68k/bootinfo.h +++ b/hw/m68k/bootinfo.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note + * SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note * * Bootinfo tags from linux bootinfo.h and bootinfo-mac.h: * This is an easily parsable and extendable structure containing all diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index e5a47eab64..4dc4c31da2 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * This is copied + edited from kernel header files in * drivers/net/ethernet/intel/igb diff --git a/include/qemu/crc-ccitt.h b/include/qemu/crc-ccitt.h index 8918dafe07..ce28e29720 100644 --- a/include/qemu/crc-ccitt.h +++ b/include/qemu/crc-ccitt.h @@ -8,7 +8,7 @@ * * From Linux kernel v5.10 include/linux/crc-ccitt.h * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef CRC_CCITT_H diff --git a/linux-user/alpha/syscall.tbl b/linux-user/alpha/syscall.tbl index 3000a2e8ee..3fa3ea436d 100644 --- a/linux-user/alpha/syscall.tbl +++ b/linux-user/alpha/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for alpha # diff --git a/linux-user/alpha/syscallhdr.sh b/linux-user/alpha/syscallhdr.sh index 55cafe6abf..6da0c957e2 100644 --- a/linux-user/alpha/syscallhdr.sh +++ b/linux-user/alpha/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/arm/syscallhdr.sh b/linux-user/arm/syscallhdr.sh index 4c952b2cfb..692fd6a76e 100644 --- a/linux-user/arm/syscallhdr.sh +++ b/linux-user/arm/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/hppa/syscall.tbl b/linux-user/hppa/syscall.tbl index aabc37f8ca..6361e97974 100644 --- a/linux-user/hppa/syscall.tbl +++ b/linux-user/hppa/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for parisc # diff --git a/linux-user/hppa/syscallhdr.sh b/linux-user/hppa/syscallhdr.sh index ac91a95762..bf1c1d4f30 100644 --- a/linux-user/hppa/syscallhdr.sh +++ b/linux-user/hppa/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/i386/syscallhdr.sh b/linux-user/i386/syscallhdr.sh index b2eca96db7..938a793d2a 100644 --- a/linux-user/i386/syscallhdr.sh +++ b/linux-user/i386/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/m68k/syscall.tbl b/linux-user/m68k/syscall.tbl index 79c2d24c89..98d90a3e53 100644 --- a/linux-user/m68k/syscall.tbl +++ b/linux-user/m68k/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for m68k # diff --git a/linux-user/m68k/syscallhdr.sh b/linux-user/m68k/syscallhdr.sh index eeb4d01d34..39b11dd05e 100644 --- a/linux-user/m68k/syscallhdr.sh +++ b/linux-user/m68k/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/microblaze/syscall.tbl b/linux-user/microblaze/syscall.tbl index b11395a20c..04bbd854b5 100644 --- a/linux-user/microblaze/syscall.tbl +++ b/linux-user/microblaze/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for microblaze # diff --git a/linux-user/microblaze/syscallhdr.sh b/linux-user/microblaze/syscallhdr.sh index f55dce8a62..b42b669154 100644 --- a/linux-user/microblaze/syscallhdr.sh +++ b/linux-user/microblaze/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/mips/syscall_o32.tbl b/linux-user/mips/syscall_o32.tbl index d560c467a8..9c3fe03bdc 100644 --- a/linux-user/mips/syscall_o32.tbl +++ b/linux-user/mips/syscall_o32.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for mips # diff --git a/linux-user/mips/syscallhdr.sh b/linux-user/mips/syscallhdr.sh index 761e3e47dd..cd7043ef5a 100644 --- a/linux-user/mips/syscallhdr.sh +++ b/linux-user/mips/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/mips64/syscall_n32.tbl b/linux-user/mips64/syscall_n32.tbl index 9220909526..dc228e6b25 100644 --- a/linux-user/mips64/syscall_n32.tbl +++ b/linux-user/mips64/syscall_n32.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for mips # diff --git a/linux-user/mips64/syscall_n64.tbl b/linux-user/mips64/syscall_n64.tbl index 9cd1c34f31..ddd59079ce 100644 --- a/linux-user/mips64/syscall_n64.tbl +++ b/linux-user/mips64/syscall_n64.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for mips # diff --git a/linux-user/mips64/syscallhdr.sh b/linux-user/mips64/syscallhdr.sh index ed5a45165a..a4339b2041 100644 --- a/linux-user/mips64/syscallhdr.sh +++ b/linux-user/mips64/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/ppc/syscall.tbl b/linux-user/ppc/syscall.tbl index 8f052ff405..51f4efb199 100644 --- a/linux-user/ppc/syscall.tbl +++ b/linux-user/ppc/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for powerpc # diff --git a/linux-user/ppc/syscallhdr.sh b/linux-user/ppc/syscallhdr.sh index 6c44e0eaad..6e8b93d673 100644 --- a/linux-user/ppc/syscallhdr.sh +++ b/linux-user/ppc/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/s390x/syscall.tbl b/linux-user/s390x/syscall.tbl index 0690263df1..f713903bcc 100644 --- a/linux-user/s390x/syscall.tbl +++ b/linux-user/s390x/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # System call table for s390 # diff --git a/linux-user/s390x/syscallhdr.sh b/linux-user/s390x/syscallhdr.sh index 85a99c48de..ac22d422b0 100755 --- a/linux-user/s390x/syscallhdr.sh +++ b/linux-user/s390x/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/sh4/syscall.tbl b/linux-user/sh4/syscall.tbl index 0b91499ebd..d0f7cdb42c 100644 --- a/linux-user/sh4/syscall.tbl +++ b/linux-user/sh4/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for sh # diff --git a/linux-user/sh4/syscallhdr.sh b/linux-user/sh4/syscallhdr.sh index 080790556a..cb3a5de711 100644 --- a/linux-user/sh4/syscallhdr.sh +++ b/linux-user/sh4/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/sparc/syscall.tbl b/linux-user/sparc/syscall.tbl index e34cc30ef2..5eb04edc9a 100644 --- a/linux-user/sparc/syscall.tbl +++ b/linux-user/sparc/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for sparc # diff --git a/linux-user/sparc/syscallhdr.sh b/linux-user/sparc/syscallhdr.sh index 34a99dc832..938a02bb48 100644 --- a/linux-user/sparc/syscallhdr.sh +++ b/linux-user/sparc/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/x86_64/syscallhdr.sh b/linux-user/x86_64/syscallhdr.sh index 182be52a74..988256b6c6 100644 --- a/linux-user/x86_64/syscallhdr.sh +++ b/linux-user/x86_64/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/xtensa/syscall.tbl b/linux-user/xtensa/syscall.tbl index fd2f30227d..2900f53c54 100644 --- a/linux-user/xtensa/syscall.tbl +++ b/linux-user/xtensa/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for xtensa # diff --git a/linux-user/xtensa/syscallhdr.sh b/linux-user/xtensa/syscallhdr.sh index eef0644c94..dc787fbbfe 100644 --- a/linux-user/xtensa/syscallhdr.sh +++ b/linux-user/xtensa/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 240923d509..fec83f53ed 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only use warnings; use strict; diff --git a/tests/tcg/loongarch64/system/regdef.h b/tests/tcg/loongarch64/system/regdef.h index faa09b2377..b586b4e86d 100644 --- a/tests/tcg/loongarch64/system/regdef.h +++ b/tests/tcg/loongarch64/system/regdef.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2021 Loongson Technology Corporation Limited */