From patchwork Fri Mar 8 15:50:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 778825 Delivered-To: patch@linaro.org Received: by 2002:a5d:604e:0:b0:33e:7753:30bd with SMTP id j14csp336636wrt; Fri, 8 Mar 2024 07:52:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU8OC1x1YiVgNpoHaAZV+YDipBs/HW3e59VkYKrDsveUtBG+DiTsuhd6l1ORgo0SmxMLVnXxyY9HNvIVCDZyjvG X-Google-Smtp-Source: AGHT+IFnTmhR9p5st9u51dYr8G9MKCsxL4AJVdh0yC5SoGk01stk6wbsGIFgueImByYvPnEEa3MX X-Received: by 2002:a0c:cb12:0:b0:690:96b0:ae with SMTP id o18-20020a0ccb12000000b0069096b000aemr8099873qvk.58.1709913176289; Fri, 08 Mar 2024 07:52:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709913176; cv=none; d=google.com; s=arc-20160816; b=MrcR+AnrF0fZMdRrrHHK3yGpjB7AEEcWGRc8cq0Z5g6YxssSRCz2p0cTULwDP0lk4t rEGSZLcX2mIiE5yZD9rPXIfl0JYYVMkLa24VvFY5zyjMWrOWuKAquJ3sbv6YYNBXO7SK 4AunRW7+/bqZgjvgNFZpsxEWkjxpEACrwTkPoFdGXGStyvZeiZoU4JRNo42iyrHAmExp cBaMOAG3VnVhF9d79TUMwMZw1xZGCGHQH/vFb7u6sTuiYjX4Be6jJI6v1QxAdWp3in3C dYsD7Rd1UUwzjz/MMWEOro9O9idPO5GUi3FcyXNJQQAcGHyEJkUU+mLb8UIedV5ZKLxk Jvog== 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:to:from :dkim-signature; bh=xCyKHrVDgE4duKvrjOPXtlhJ/eSl12oKbAB88FqLRxs=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=eojbgy7Lou7q8eSeX5Nip+f5x/R5OJ7x/Q8k1gBQ6/Jhi/qq8SH5sHfCDr3csE6WrK eWPWHpl0btSPOOw/N26PPBVPFedcssf7RVYAFdcCYQn/GDlhnVx48YCwC0WO9CACuF7F bMJZkPGilrC3v9JEl60J+0BBVbrjFbL+xei4LH23JRBgx+V2Cgq2vddPTOZMcLNU1WgX W1+nDWCta/7XgB1Epw9dNMhWQ+HQd2HuMPAPg4WHeU8ULWKSUjJbucjEG8wu6mGTX1bj PNBeEJFSheekIS3kdiZbDGRd9JH1pH+dp2fxzZmczFc29vw/A1o/2IkncojNKr3864aB yoXA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=n2py2XLK; 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 dv12-20020ad44eec000000b0068efcba558fsi19186793qvb.480.2024.03.08.07.52.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Mar 2024 07:52:56 -0800 (PST) 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=n2py2XLK; 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 1ricUS-00083e-7I; Fri, 08 Mar 2024 10:50:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ricUO-0007jt-Dy for qemu-devel@nongnu.org; Fri, 08 Mar 2024 10:50:28 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ricUK-0004U9-99 for qemu-devel@nongnu.org; Fri, 08 Mar 2024 10:50:28 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33d6f26ff33so1556887f8f.0 for ; Fri, 08 Mar 2024 07:50:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709913022; x=1710517822; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xCyKHrVDgE4duKvrjOPXtlhJ/eSl12oKbAB88FqLRxs=; b=n2py2XLKL48r2h1l8Tg05eE8L0IzMaRqDsuVCVYHXPzavLiT23/xnrJAogNT2Kvm6p VkqeXmloPgpXdeTmJ4tsMc+8mQqSofiH7clZpj1ORqEm2P3qhlpIRiwkW1sW0Twt/qqD uaI8TncLEWTZy9zb/GQzOoqspJIvcCs/PmOokZN3ST/y0UOLKZySRSkJSE/VxRfiNW45 o7MM0bjwPTeSQC28sso38hBzJeu2hhONengimG5ItbfPPbW+xnU/mBosD8iTk0qTHVcI p1yk5kj7PRxSaiHqKizV8Vf6+yVrZG2Cn1AIAMZ4E0JIDjFce6YDih7pzSl2ILrVVJTi tYfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709913022; x=1710517822; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xCyKHrVDgE4duKvrjOPXtlhJ/eSl12oKbAB88FqLRxs=; b=UI/WDX2h5A4tEHRu/ztqOMhU2Wu3OwftSsI73pwmJARp2jnt9C/+MLWDdUj2tqE+0e HLz2eYIruKBCkWunscrC6IAxGPMwEORS7YVkYa4NzLDChzpHkJ6Vr4CCadCm8PZDEGs4 r/ssQe34OhC/QU5/2kh9ZSFdfUriUvH0N+LJdnVZa2GlOp9rBXR5J6tknz6u71Lf2BXl Viv1isYHdoCvZRFGdEDBt1GAJKue8+QHh2QGPVKVBYtgmU8HBZbpEv/q3IoAggzgWwS2 XodgYMXRe2XfEK0SNxPgMI6juM9qgfDIB5gJFiZJcwOqzjieJh3JdBcPf/o+eK4Wp8PN 4hFw== X-Gm-Message-State: AOJu0YwE0p+wVhf7Kg5cZJ41PoDALURRA88nduaUMpyV3Hb/XEpX0cY+ w8igiyKk4XUgGzoP46p5Y9zK60ePGR0RsJ9NNsxkfaYUx9XoF0GyGVOfrCg2P9+OvMfB6ZXGdN6 Q X-Received: by 2002:a5d:5a03:0:b0:33e:737c:792a with SMTP id bq3-20020a5d5a03000000b0033e737c792amr3943479wrb.68.1709913022592; Fri, 08 Mar 2024 07:50:22 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f2-20020adff8c2000000b0033e7a204dc7sm856080wrq.32.2024.03.08.07.50.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 07:50:22 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/14] hw/rtc/sun4v-rtc: Relicense to GPLv2-or-later Date: Fri, 8 Mar 2024 15:50:14 +0000 Message-Id: <20240308155015.3637663-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240308155015.3637663-1-peter.maydell@linaro.org> References: <20240308155015.3637663-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 was unfortunately added with a license of GPL-v3-or-later, which is not compatible with other QEMU code which has a GPL-v2-only license. Relicense the code in the .c and the .h file to GPL-v2-or-later, to make it compatible with the rest of QEMU. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Signed-off-by: Paolo Bonzini (for Red Hat) Signed-off-by: Artyom Tarasenko Signed-off-by: Markus Armbruster Signed-off-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé Acked-by: Alex Bennée Message-id: 20240223161300.938542-1-peter.maydell@linaro.org Signed-off-by: Peter Maydell --- include/hw/rtc/sun4v-rtc.h | 2 +- hw/rtc/sun4v-rtc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/hw/rtc/sun4v-rtc.h b/include/hw/rtc/sun4v-rtc.h index fc54dfcba47..26a9eb61967 100644 --- a/include/hw/rtc/sun4v-rtc.h +++ b/include/hw/rtc/sun4v-rtc.h @@ -5,7 +5,7 @@ * * Copyright (c) 2016 Artyom Tarasenko * - * This code is licensed under the GNU GPL v3 or (at your option) any later + * This code is licensed under the GNU GPL v2 or (at your option) any later * version. */ diff --git a/hw/rtc/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c index e037acd1b56..ffcc0aa25d9 100644 --- a/hw/rtc/sun4v-rtc.c +++ b/hw/rtc/sun4v-rtc.c @@ -5,7 +5,7 @@ * * Copyright (c) 2016 Artyom Tarasenko * - * This code is licensed under the GNU GPL v3 or (at your option) any later + * This code is licensed under the GNU GPL v2 or (at your option) any later * version. */