Xilinx ZCU102 fixes for 2.11

These are two small fixes for 2.11.

V2:
- Update qemu-doc.texi

Alistair Francis (2):
xlnx-zynqmp: Properly support the smp command line option
xlnx-zcu102: Add an info message deprecating the EP108

 hw/arm/xlnx-zcu102.c |  6 +++++-
 hw/arm/xlnx-zynqmp.c | 26 ++++++++++++++++----------
 qemu-doc.texi        |  7 +++++++
 3 files changed, 28 insertions(+), 11 deletions(-)

2.14.1

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.

---
V2:
- Update the qemu-doc.texi file

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

index 7ec03dad42..adddd234a1 100644
@@ -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);
 }
 

index 8c10956a66..d383ac44d4 100644
@@ -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
 

2.14.1

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

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

I think we should update max_cpus for ep108 as well.

Emilio

As I said in the other thread, this is much better than fiddling with MachineClass -- thanks!

I'll send now a proper series with the fixes we discussed in the other thread:
https://lists.gnu.org/archive/html/qemu-devel/2017-11/msg00502.html

Emilio

Peter: please do not merge this yet!

Given that these two changes require another patch to be tested, I am going to include these two patches in an upcoming series with the required patch added first.

BTW I'll also add my R-b tags plus the max_cpus update for the ep108.

Emilio