diff mbox

[for,2.11,v2,2/2] xlnx-zcu102: Add an info message deprecating the EP108

Message ID b2df555986423d225a0a79fb58e2a93054ac5300.1510263731.git.alistair.francis@xilinx.com (mailing list archive)
State New, archived
Headers show

Commit Message

Alistair Francis Nov. 9, 2017, 9:49 p.m. UTC
The EP108 was an early access development board that is no longer used.
Add an info message to convert any users to the ZCU102 instead. On QEMU
they are both identical.

This patch also updated the qemu-doc.texi file to indicate that the
EP108 has been deprecated.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
---
V2:
 - Update the qemu-doc.texi file

 hw/arm/xlnx-zcu102.c | 3 +++
 qemu-doc.texi        | 7 +++++++
 2 files changed, 10 insertions(+)

Comments

Emilio Cota Nov. 10, 2017, 6:07 p.m. UTC | #1
On Thu, Nov 09, 2017 at 13:49:35 -0800, Alistair Francis wrote:
> The EP108 was an early access development board that is no longer used.
> Add an info message to convert any users to the ZCU102 instead. On QEMU
> they are both identical.
> 
> This patch also updated the qemu-doc.texi file to indicate that the
> EP108 has been deprecated.
> 
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>

Reviewed-by: Emilio G. Cota <cota@braap.org>

Note to potential reviewers: This patch is meant to be applied after the
patch that updates ep108's max_cpus from 1 to NR_APUS + NR_RPUS, for
otherwise the message added here won't be seen unless -smp == 1.
This other patch is already in target-arm.next:
 https://lists.gnu.org/archive/html/qemu-devel/2017-10/msg06537.html

		Emilio
Emilio Cota Nov. 10, 2017, 6:37 p.m. UTC | #2
On Fri, Nov 10, 2017 at 13:07:22 -0500, Emilio G. Cota wrote:
> On Thu, Nov 09, 2017 at 13:49:35 -0800, Alistair Francis wrote:
> > The EP108 was an early access development board that is no longer used.
> > Add an info message to convert any users to the ZCU102 instead. On QEMU
> > they are both identical.
> > 
> > This patch also updated the qemu-doc.texi file to indicate that the
> > EP108 has been deprecated.
> > 
> > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> 
> Reviewed-by: Emilio G. Cota <cota@braap.org>
> 
> Note to potential reviewers: This patch is meant to be applied after the
> patch that updates ep108's max_cpus from 1 to NR_APUS + NR_RPUS, for
> otherwise the message added here won't be seen unless -smp == 1.
> This other patch is already in target-arm.next:
>  https://lists.gnu.org/archive/html/qemu-devel/2017-10/msg06537.html

Correction: that patch does updates the zcu102, not the ep108.

I think we should update max_cpus for ep108 as well.

		Emilio
diff mbox

Patch

diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index 7ec03dad42..adddd234a1 100644
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -164,6 +164,9 @@  static void xlnx_ep108_init(MachineState *machine)
 {
     XlnxZCU102 *s = EP108_MACHINE(machine);
 
+    info_report("The Xilinx EP108 machine is deprecated, please use the "
+                "ZCU102 machine instead. It has the same features supported.");
+
     xlnx_zynqmp_init(s, machine);
 }
 
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 8c10956a66..d383ac44d4 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2537,6 +2537,13 @@  or ``ivshmem-doorbell`` device types.
 The ``spapr-pci-vfio-host-bridge'' device type is replaced by
 the ``spapr-pci-host-bridge'' device type.
 
+@section System emulator machines
+
+@subsection Xilinx EP108 (since 2.11.0)
+
+The ``xlnx-ep108'' machine has been replaced by the ``xlnx-zcu102'' machine.
+The ``xlnx-zcu102'' machine has the same features and capabilites in QEMU.
+
 @node License
 @appendix License