From nobody Mon Apr 29 04:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610987193; cv=none; d=zohomail.com; s=zohoarc; b=Krf6tONlr+L8aY6hbP0E9rXjTAV4WtDdfv1ZUxqLqq0nxiF90yaD1E483ieo/JAEn3egbmYH6Oxa0nWUuz2z2a6OqXiKq+S+tmgOuXkAfY3arCZtVMcgdDcEMCHOmV3JXK0eXQu8GkfyDl1coJZBRSYjmk6pacpWFKLvKHOBTbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610987193; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=/h6/sK+7NBVzrl8kG33odiHbt8P2Pe/t/OGYGOP5BfE=; b=L6UHeFizF7Bu0BWes1m4T+UwOKAt1EKfW158PK4vlpv2P3keWTEeq+0j/ddTvMwPXFwRB0eMntb7HK6TL6Gcv0bzhQ42qtMrRUR6WTlgwO49oo02bvl1B4QWdfihHzxYmeT0nhZn4qW3yGMbOYkNcyPlKIicE4TIo5/2wg6ftBs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610987193962784.3573629186347; Mon, 18 Jan 2021 08:26:33 -0800 (PST) Received: from localhost ([::1]:33590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1XMO-0000ya-8S for importer@patchew.org; Mon, 18 Jan 2021 11:26:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1XLe-0000MV-4S for qemu-devel@nongnu.org; Mon, 18 Jan 2021 11:25:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l1XLb-0007t0-SE for qemu-devel@nongnu.org; Mon, 18 Jan 2021 11:25:45 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-432-JTGEoDGxPi-5v9U5lEZ77A-1; Mon, 18 Jan 2021 11:25:39 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 68C57107ACE4; Mon, 18 Jan 2021 16:25:38 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21BC119C66; Mon, 18 Jan 2021 16:25:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610987141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/h6/sK+7NBVzrl8kG33odiHbt8P2Pe/t/OGYGOP5BfE=; b=Zlwdvb2au3H5GqZmDe6AM6+Jn2tThD6c11JkgxZAwr6fLWEj6notjah1UCAFU113iwNUv/ KmjIAtDu5xYNn0BTZHD9vey5GMgvRCz01tuQHnDJ2J2ZdsH1o75GDgFme4aVtH7vu1Az+M aFGM5vief5KiXiXJX7lOO9iROHPcm+I= X-MC-Unique: JTGEoDGxPi-5v9U5lEZ77A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] arm: rename xlnx-zcu102.canbusN properties Date: Mon, 18 Jan 2021 11:25:37 -0500 Message-Id: <20210118162537.779542-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.175, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 t= ypes, and besides the "xlnx-zcu102." prefix is both unnecessary and different from any other machine property name. Remove it. Signed-off-by: Paolo Bonzini Reviewed-by: Vikram Garhwal --- 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 =3D false; /* Default to virt (EL2) being disabled */ s->virt =3D 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); =20 - 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 =3D 1; =20 QTestState *qts =3D qtest_init("-machine xlnx-zcu102" - " -object can-bus,id=3Dcanbus0" - " -machine xlnx-zcu102.canbus0=3Dcanbus0" - " -machine xlnx-zcu102.canbus1=3Dcanbus0" + " -object can-bus,id=3Dcanbus" + " -machine canbus0=3Dcanbus" + " -machine canbus1=3Dcanbus" ); =20 /* Configure the CAN0 and CAN1. */ @@ -175,9 +175,9 @@ static void test_can_loopback(void) uint32_t status =3D 0; =20 QTestState *qts =3D qtest_init("-machine xlnx-zcu102" - " -object can-bus,id=3Dcanbus0" - " -machine xlnx-zcu102.canbus0=3Dcanbus0" - " -machine xlnx-zcu102.canbus1=3Dcanbus0" + " -object can-bus,id=3Dcanbus" + " -machine canbus0=3Dcanbus" + " -machine canbus1=3Dcanbus" ); =20 /* Configure the CAN0 in loopback mode. */ @@ -223,9 +223,9 @@ static void test_can_filter(void) uint8_t can_timestamp =3D 1; =20 QTestState *qts =3D qtest_init("-machine xlnx-zcu102" - " -object can-bus,id=3Dcanbus0" - " -machine xlnx-zcu102.canbus0=3Dcanbus0" - " -machine xlnx-zcu102.canbus1=3Dcanbus0" + " -object can-bus,id=3Dcanbus" + " -machine canbus0=3Dcanbus" + " -machine canbus1=3Dcanbus" ); =20 /* Configure the CAN0 and CAN1. */ @@ -271,9 +271,9 @@ static void test_can_sleepmode(void) uint8_t can_timestamp =3D 1; =20 QTestState *qts =3D qtest_init("-machine xlnx-zcu102" - " -object can-bus,id=3Dcanbus0" - " -machine xlnx-zcu102.canbus0=3Dcanbus0" - " -machine xlnx-zcu102.canbus1=3Dcanbus0" + " -object can-bus,id=3Dcanbus" + " -machine canbus0=3Dcanbus" + " -machine canbus1=3Dcanbus" ); =20 /* Configure the CAN0. */ @@ -317,9 +317,9 @@ static void test_can_snoopmode(void) uint8_t can_timestamp =3D 1; =20 QTestState *qts =3D qtest_init("-machine xlnx-zcu102" - " -object can-bus,id=3Dcanbus0" - " -machine xlnx-zcu102.canbus0=3Dcanbus0" - " -machine xlnx-zcu102.canbus1=3Dcanbus0" + " -object can-bus,id=3Dcanbus" + " -machine canbus0=3Dcanbus" + " -machine canbus1=3Dcanbus" ); =20 /* Configure the CAN0. */ --=20 2.26.2