From patchwork Thu Mar 8 15:40:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 131030 Delivered-To: patches@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6623589lja; Thu, 8 Mar 2018 07:40:19 -0800 (PST) X-Google-Smtp-Source: AG47ELvr8ngq4M1mKfpic8TsN9aOAL+Y1ArKPMqtMCGD/3DrkGXt/RchMiIr9I/VR909TeU7w7Xo X-Received: by 10.223.189.8 with SMTP id j8mr24856084wrh.20.1520523619471; Thu, 08 Mar 2018 07:40:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520523619; cv=none; d=google.com; s=arc-20160816; b=HGU/fjjycXht+QbluaJTQQ254rwEO8HL7iiCy0ELVrbGCBUDwvbubS8xWvCOhZZ9a4 /tjv3BCLiDSCXxFN2c5d0RArOIncPHXYkgk6M4+0uqK1AxKlVEmLae78U69Dgx9erxfs SgPYteY6K1Zzuc6BgFf83VqxptqZN0JrK5I8k+vhhOvRUwYKwO1tRT4RGJPMgHXau5i7 69QLYF6Ke4zSTg9ajeiWF0jCiaWLAVghBLjVgRF/p2s3s6fuKzpxTV2aiRvkFb84fA/a iznVovi7B1L7Yn9DQYueYGRoVZZfdTkzS5gXeIgcnzwKDHXf9Djp77ZxHQHEHsREHumm yzFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=bYh7ob84IxDVaPUzw3jVQEg3vLZMJ49/4LAw8wLVlNk=; b=nH1Yf3utHD0koiLsknOUmnh1hfm6WjcjdAKEabmVMBSP/DAaDeukPZ86QoTcaBP6aO lRv7DcFu9ePG6HLij4ypq0txDV3W4iLDV5JQhcvQYqkiaZUxuSiu6fsqihgE9DkgZ5uV CV0YFa1JCru43q7IlfxsNIrPOlm9s3Lchtbkv8C88DcWRrW09W2DS61ITSQH9gk2vmSc ib5YCB8u2lPNg6BaG2I9egxDpPRN/zgy0CCxvCt2KFId8tRLev4jTcpwV6imv+IKqDrR /DuC8IBg2JqD6TX3gv7xIdOZTzTc/Uc6fjWH5Ujpn9xmHMkfmElogXEkKhHe8okp7I94 7aNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id 11si9489775wmd.198.2018.03.08.07.40.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Mar 2018 07:40:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1etxeT-00067r-HZ; Thu, 08 Mar 2018 15:40:17 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Guan Xuetao , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?b?w6k=?= Subject: [PATCH] unicore32: Mark as deprecated Date: Thu, 8 Mar 2018 15:40:16 +0000 Message-Id: <20180308154016.22228-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 We intend to remove the unicore32 target code: * It has had no changes since 2012 that were not tree-wide maintenance/API changes/other global updates * We dropped the linux-user unicore32 support in 2016 because of a clash between the 'old ABI' that it was implementing and the ABI that's actually in the upstream Linux kernel, and there have been no moves to get this fixed so we could re-enable it, nor any complaints when it went away * Linux is now planning to drop unicore support: https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1619640.html * there is apparently no upstream gcc support for the architecture * nobody has ever reported a bug or problem to us about it This commit patches the unicore32 target to warn on startup that it is deprecated, and adds a note to our documentation's deprecation section. Signed-off-by: Peter Maydell --- I proposed deprecation of unicore32 on 27th Feb: https://lists.gnu.org/archive/html/qemu-devel/2018-02/msg06634.html and got several 'yes'es and no objections. This is the "changing the codebase" part of that, ready for the 2.12 codefreeze. We should also note this in the 2.12 Changelog. --- target/unicore32/cpu.c | 11 +++++++++++ qemu-doc.texi | 5 +++++ 2 files changed, 16 insertions(+) -- 2.16.2 Reviewed-by: Daniel P. Berrangé diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c index 29d160a88d..e95fa55b8e 100644 --- a/target/unicore32/cpu.c +++ b/target/unicore32/cpu.c @@ -19,6 +19,8 @@ #include "migration/vmstate.h" #include "exec/exec-all.h" #include "fpu/softfloat.h" +#include "sysemu/qtest.h" +#include "qemu/error-report.h" static void uc32_cpu_set_pc(CPUState *cs, vaddr value) { @@ -120,6 +122,15 @@ static void uc32_cpu_initfn(Object *obj) #endif tlb_flush(cs); + + /* We can't do this in class_init because the qtest_enabled + * flag hasn't yet been initialized there. Luckily the Unicore32 + * machines don't support SMP so the message will only appear once. + */ + if (!qtest_enabled()) { + warn_report("qemu-system-unicore32 is deprecated " + "and will be removed in a future QEMU release."); + } } static const VMStateDescription vmstate_uc32_cpu = { diff --git a/qemu-doc.texi b/qemu-doc.texi index 39e38c87ec..0e8609c11c 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2779,6 +2779,11 @@ support page sizes < 4096 any longer. The ``xlnx-ep108'' machine has been replaced by the ``xlnx-zcu102'' machine. The ``xlnx-zcu102'' machine has the same features and capabilites in QEMU. +@subsection Unicore32 targets (since 2.12.0) + +The ``unicore32'' CPU target and ``qemu-system-unicore32'' will be removed, +since this architecture is unmaintained. + @node License @appendix License