All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 03/46] arm: rename xlnx-zcu102.canbusN properties
Date: Fri, 29 Jan 2021 10:59:29 +0000	[thread overview]
Message-ID: <20210129110012.8660-4-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210129110012.8660-1-peter.maydell@linaro.org>

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



  parent reply	other threads:[~2021-01-29 11:02 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-29 10:59 [PULL 00/46] target-arm queue Peter Maydell
2021-01-29 10:59 ` [PULL 01/46] target/arm: Implement ID_PFR2 Peter Maydell
2021-01-29 10:59 ` [PULL 02/46] target/arm: Conditionalize DBGDIDR Peter Maydell
2021-01-29 10:59 ` Peter Maydell [this message]
2021-01-29 10:59 ` [PULL 04/46] hw: gpio: implement gpio-pwr driver for qemu reset/poweroff Peter Maydell
2021-01-29 10:59 ` [PULL 05/46] arm-virt: refactor gpios creation Peter Maydell
2021-01-29 10:59 ` [PULL 06/46] arm-virt: add secure pl061 for reset/power down Peter Maydell
2021-01-29 10:59 ` [PULL 07/46] hw/misc: Fix arith overflow in NPCM7XX PWM module Peter Maydell
2021-01-29 10:59 ` [PULL 08/46] target/arm: Replace magic value by MMU_DATA_LOAD definition Peter Maydell
2021-01-29 10:59 ` [PULL 09/46] configure: Move preadv check to meson.build Peter Maydell
2021-01-29 10:59 ` [PULL 10/46] configure: cross-compiling with empty cross_prefix Peter Maydell
2021-01-29 10:59 ` [PULL 11/46] osdep: build with non-working system() function Peter Maydell
2021-01-29 10:59 ` [PULL 12/46] darwin: remove redundant dependency declaration Peter Maydell
2021-01-29 10:59 ` [PULL 13/46] darwin: fix cross-compiling for Darwin Peter Maydell
2021-01-29 10:59 ` [PULL 14/46] configure: cross compile should use x86_64 cpu_family Peter Maydell
2021-01-29 10:59 ` [PULL 15/46] darwin: detect CoreAudio for build Peter Maydell
2021-01-29 10:59 ` [PULL 16/46] darwin: remove 64-bit build detection on 32-bit OS Peter Maydell
2021-01-29 10:59 ` [PULL 17/46] hvf: Add hypervisor entitlement to output binaries Peter Maydell
2021-01-29 10:59 ` [PULL 18/46] hw/misc/pvpanic: split-out generic and bus dependent code Peter Maydell
2021-01-29 10:59 ` [PULL 19/46] hw/misc/pvpanic: add PCI interface support Peter Maydell
2021-01-29 10:59 ` [PULL 20/46] pvpanic : update pvpanic spec document Peter Maydell
2021-01-29 10:59 ` [PULL 21/46] tests/qtest: add a test case for pvpanic-pci Peter Maydell
2021-01-29 15:57   ` Peter Maydell
2021-01-29 17:00     ` Mihai Carabas
2021-01-29 10:59 ` [PULL 22/46] ptimer: Add new ptimer_set_period_from_clock() function Peter Maydell
2021-01-29 10:59 ` [PULL 23/46] clock: Add new clock_has_source() function Peter Maydell
2021-01-29 10:59 ` [PULL 24/46] tests: Add a simple test of the CMSDK APB timer Peter Maydell
2021-01-29 10:59 ` [PULL 25/46] tests: Add a simple test of the CMSDK APB watchdog Peter Maydell
2021-01-29 10:59 ` [PULL 26/46] tests: Add a simple test of the CMSDK APB dual timer Peter Maydell
2021-01-29 10:59 ` [PULL 27/46] hw/timer/cmsdk-apb-timer: Rename CMSDKAPBTIMER struct to CMSDKAPBTimer Peter Maydell
2021-01-29 10:59 ` [PULL 28/46] hw/timer/cmsdk-apb-timer: Add Clock input Peter Maydell
2021-01-29 10:59 ` [PULL 29/46] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-29 10:59 ` [PULL 30/46] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-29 10:59 ` [PULL 31/46] hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ" Peter Maydell
2021-01-29 10:59 ` [PULL 32/46] hw/arm/armsse: Wire up clocks Peter Maydell
2021-01-29 10:59 ` [PULL 33/46] hw/arm/mps2: Inline CMSDK_APB_TIMER creation Peter Maydell
2021-01-29 11:00 ` [PULL 34/46] hw/arm/mps2: Create and connect SYSCLK Clock Peter Maydell
2021-01-29 11:00 ` [PULL 35/46] hw/arm/mps2-tz: Create and connect ARMSSE Clocks Peter Maydell
2021-01-29 11:00 ` [PULL 36/46] hw/arm/musca: " Peter Maydell
2021-01-29 11:00 ` [PULL 37/46] hw/arm/stellaris: Convert SSYS to QOM device Peter Maydell
2021-01-29 11:00 ` [PULL 38/46] hw/arm/stellaris: Create Clock input for watchdog Peter Maydell
2021-01-29 11:00 ` [PULL 39/46] hw/timer/cmsdk-apb-timer: Convert to use Clock input Peter Maydell
2021-01-29 11:00 ` [PULL 40/46] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-29 11:00 ` [PULL 41/46] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-29 11:00 ` [PULL 42/46] tests/qtest/cmsdk-apb-watchdog-test: Test clock changes Peter Maydell
2021-01-29 11:00 ` [PULL 43/46] hw/arm/armsse: Use Clock to set system_clock_scale Peter Maydell
2021-01-29 11:00 ` [PULL 44/46] arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog, ARMSSE Peter Maydell
2021-01-29 11:00 ` [PULL 45/46] arm: Remove frq " Peter Maydell
2021-01-29 11:00 ` [PULL 46/46] hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS Peter Maydell
2021-01-29 11:42 ` [PULL 00/46] target-arm queue no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210129110012.8660-4-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.