[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/5] hw/arm: Silence xlnx-ep108 deprecation warning d
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 5/5] hw/arm: Silence xlnx-ep108 deprecation warning during tests |
Date: |
Mon, 20 Nov 2017 17:37:24 +0000 |
From: Thomas Huth <address@hidden>
The new deprecation warning for the xlnx-ep108 machine also pops up
during "make check" which is kind of confusing. Silence it if testing
mode is enabled.
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Acked-by: Wei Huang <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/xlnx-zcu102.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index 9631a53..bbe7d04 100644
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -24,6 +24,7 @@
#include "qemu/error-report.h"
#include "exec/address-spaces.h"
#include "qemu/log.h"
+#include "sysemu/qtest.h"
typedef struct XlnxZCU102 {
MachineState parent_obj;
@@ -164,8 +165,10 @@ 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.");
+ if (!qtest_enabled()) {
+ info_report("The Xilinx EP108 machine is deprecated, please use the "
+ "ZCU102 machine (which has the same features) instead.");
+ }
xlnx_zynqmp_init(s, machine);
}
--
2.7.4
- [Qemu-devel] [PULL 0/5] target-arm queue for rc2, Peter Maydell, 2017/11/20
- [Qemu-devel] [PULL 1/5] target/arm: Report GICv3 sysregs present in ID registers if needed, Peter Maydell, 2017/11/20
- [Qemu-devel] [PULL 5/5] hw/arm: Silence xlnx-ep108 deprecation warning during tests,
Peter Maydell <=
- [Qemu-devel] [PULL 2/5] nvic: Fix ARMv7M MPU_RBAR reads, Peter Maydell, 2017/11/20
- [Qemu-devel] [PULL 3/5] arm: check regime, not current state, for ATS write PAR format, Peter Maydell, 2017/11/20
- [Qemu-devel] [PULL 4/5] hw/arm/aspeed: Unlock SCU when running kernel, Peter Maydell, 2017/11/20
- Re: [Qemu-devel] [PULL 0/5] target-arm queue for rc2, Peter Maydell, 2017/11/21