[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/46] arm: rename xlnx-zcu102.canbusN properties
From: |
Peter Maydell |
Subject: |
[PULL 03/46] arm: rename xlnx-zcu102.canbusN properties |
Date: |
Fri, 29 Jan 2021 10:59:29 +0000 |
From: Paolo Bonzini <pbonzini@redhat.com>
The properties to attach a CANBUS object to the xlnx-zcu102 machine have
a period in them. We want to use periods in properties for compound QAPI types,
and besides the "xlnx-zcu102." prefix is both unnecessary and different
from any other machine property name. Remove it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210118162537.779542-1-pbonzini@redhat.com
Reviewed-by: Vikram Garhwal <fnu.vikram@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/arm/xlnx-zcu102.c | 4 ++--
tests/qtest/xlnx-can-test.c | 30 +++++++++++++++---------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index 4ef0c516bfd..c9713638c5b 100644
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -219,12 +219,12 @@ static void xlnx_zcu102_machine_instance_init(Object *obj)
s->secure = false;
/* Default to virt (EL2) being disabled */
s->virt = false;
- object_property_add_link(obj, "xlnx-zcu102.canbus0", TYPE_CAN_BUS,
+ object_property_add_link(obj, "canbus0", TYPE_CAN_BUS,
(Object **)&s->canbus[0],
object_property_allow_set_link,
0);
- object_property_add_link(obj, "xlnx-zcu102.canbus1", TYPE_CAN_BUS,
+ object_property_add_link(obj, "canbus1", TYPE_CAN_BUS,
(Object **)&s->canbus[1],
object_property_allow_set_link,
0);
diff --git a/tests/qtest/xlnx-can-test.c b/tests/qtest/xlnx-can-test.c
index 3d1120005b6..54de71a6864 100644
--- a/tests/qtest/xlnx-can-test.c
+++ b/tests/qtest/xlnx-can-test.c
@@ -138,9 +138,9 @@ static void test_can_bus(void)
uint8_t can_timestamp = 1;
QTestState *qts = qtest_init("-machine xlnx-zcu102"
- " -object can-bus,id=canbus0"
- " -machine xlnx-zcu102.canbus0=canbus0"
- " -machine xlnx-zcu102.canbus1=canbus0"
+ " -object can-bus,id=canbus"
+ " -machine canbus0=canbus"
+ " -machine canbus1=canbus"
);
/* Configure the CAN0 and CAN1. */
@@ -175,9 +175,9 @@ static void test_can_loopback(void)
uint32_t status = 0;
QTestState *qts = qtest_init("-machine xlnx-zcu102"
- " -object can-bus,id=canbus0"
- " -machine xlnx-zcu102.canbus0=canbus0"
- " -machine xlnx-zcu102.canbus1=canbus0"
+ " -object can-bus,id=canbus"
+ " -machine canbus0=canbus"
+ " -machine canbus1=canbus"
);
/* Configure the CAN0 in loopback mode. */
@@ -223,9 +223,9 @@ static void test_can_filter(void)
uint8_t can_timestamp = 1;
QTestState *qts = qtest_init("-machine xlnx-zcu102"
- " -object can-bus,id=canbus0"
- " -machine xlnx-zcu102.canbus0=canbus0"
- " -machine xlnx-zcu102.canbus1=canbus0"
+ " -object can-bus,id=canbus"
+ " -machine canbus0=canbus"
+ " -machine canbus1=canbus"
);
/* Configure the CAN0 and CAN1. */
@@ -271,9 +271,9 @@ static void test_can_sleepmode(void)
uint8_t can_timestamp = 1;
QTestState *qts = qtest_init("-machine xlnx-zcu102"
- " -object can-bus,id=canbus0"
- " -machine xlnx-zcu102.canbus0=canbus0"
- " -machine xlnx-zcu102.canbus1=canbus0"
+ " -object can-bus,id=canbus"
+ " -machine canbus0=canbus"
+ " -machine canbus1=canbus"
);
/* Configure the CAN0. */
@@ -317,9 +317,9 @@ static void test_can_snoopmode(void)
uint8_t can_timestamp = 1;
QTestState *qts = qtest_init("-machine xlnx-zcu102"
- " -object can-bus,id=canbus0"
- " -machine xlnx-zcu102.canbus0=canbus0"
- " -machine xlnx-zcu102.canbus1=canbus0"
+ " -object can-bus,id=canbus"
+ " -machine canbus0=canbus"
+ " -machine canbus1=canbus"
);
/* Configure the CAN0. */
--
2.20.1
- [PULL 00/46] target-arm queue, Peter Maydell, 2021/01/29
- [PULL 05/46] arm-virt: refactor gpios creation, Peter Maydell, 2021/01/29
- [PULL 01/46] target/arm: Implement ID_PFR2, Peter Maydell, 2021/01/29
- [PULL 03/46] arm: rename xlnx-zcu102.canbusN properties,
Peter Maydell <=
- [PULL 06/46] arm-virt: add secure pl061 for reset/power down, Peter Maydell, 2021/01/29
- [PULL 02/46] target/arm: Conditionalize DBGDIDR, Peter Maydell, 2021/01/29
- [PULL 09/46] configure: Move preadv check to meson.build, Peter Maydell, 2021/01/29
- [PULL 11/46] osdep: build with non-working system() function, Peter Maydell, 2021/01/29
- [PULL 07/46] hw/misc: Fix arith overflow in NPCM7XX PWM module, Peter Maydell, 2021/01/29
- [PULL 08/46] target/arm: Replace magic value by MMU_DATA_LOAD definition, Peter Maydell, 2021/01/29
- [PULL 04/46] hw: gpio: implement gpio-pwr driver for qemu reset/poweroff, Peter Maydell, 2021/01/29
- [PULL 13/46] darwin: fix cross-compiling for Darwin, Peter Maydell, 2021/01/29
- [PULL 10/46] configure: cross-compiling with empty cross_prefix, Peter Maydell, 2021/01/29
- [PULL 12/46] darwin: remove redundant dependency declaration, Peter Maydell, 2021/01/29