From: Vikram Garhwal <fnu.vikram@xilinx.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Alistair Francis <alistair@alistair23.me>,
QEMU Developers <qemu-devel@nongnu.org>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Subject: Re: [PATCH] arm: rename xlnx-zcu102.canbusN properties
Date: Mon, 25 Jan 2021 14:07:17 -0800 [thread overview]
Message-ID: <20210125220716.GA344542@xilinx.com> (raw)
In-Reply-To: <CAFEAcA_En1xo10n3121r3ZRANkhiH0dRRwT5QwMZ1wRTeLyFWA@mail.gmail.com>
On Fri, Jan 22, 2021 at 01:21:53PM +0000, Peter Maydell wrote:
Patch looks good to me.
Reviewed-by: Vikram Garhwal <fnu.vikram@xilinx.com>
> Just noticed this wasn't cc'd to the Xilinx folks. Would one
> of you like to review it?
>
> thanks
> -- PMM
>
> On Mon, 18 Jan 2021 at 16:25, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >
> > 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>
> > ---
> > 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 4ef0c516bf..c9713638c5 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 3d1120005b..54de71a686 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.26.2
prev parent reply other threads:[~2021-01-25 22:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 16:25 [PATCH] arm: rename xlnx-zcu102.canbusN properties Paolo Bonzini
2021-01-19 16:32 ` Peter Maydell
2021-01-22 13:21 ` Peter Maydell
2021-01-22 15:19 ` Edgar E. Iglesias
2021-01-22 15:29 ` Peter Maydell
2021-01-25 22:07 ` Vikram Garhwal [this message]
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=20210125220716.GA344542@xilinx.com \
--to=fnu.vikram@xilinx.com \
--cc=alistair@alistair23.me \
--cc=edgar.iglesias@gmail.com \
--cc=pbonzini@redhat.com \
--cc=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).