From nobody Mon Feb 9 12:26:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599721322; cv=none; d=zohomail.com; s=zohoarc; b=foDgxzVmUL3Sgjvh6+QJ3N864Jaz/C0E3llQMSSXjUXeTbzvR2M8UKUrQeuzKpTEwjDNj6T1eVeA65GCuo70ORERdWto5dPJPPWrsgMKDyy/Otk08Khplccfm8qDmRTFknhPdlPO6GqoXMdp8ZcYpX4akjKGjUAOonWezHN6ve0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599721322; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=rOfPlRcHNPnFEFQL04D9b7WV0+f6qJ96Y7nXN27AiJ8=; b=J5wW7hkPUaXzTCdVuOiLBRmlEJJqH/qTOhkNbpDnRl8f9W7rN5as9twT9zOuqUihRurwu0e9yxNCt68LdE3KCHdX0R4cDdDc8+L6Xi7omtAR4XpmiJcoPDOLqOTzSE4TDvjYZOts5iHA5tXnC3Bzpit47hUUwEsPGXgYddM6Qn4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1599721322663518.0907913580606; Thu, 10 Sep 2020 00:02:02 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-226-A4jhG-KBMleGG28cHWjqDA-1; Thu, 10 Sep 2020 03:01:58 -0400 Received: by mail-wr1-f71.google.com with SMTP id v12so1889020wrm.9 for ; Thu, 10 Sep 2020 00:01:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id f6sm2615123wme.32.2020.09.10.00.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599721321; 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: in-reply-to:in-reply-to:references:references; bh=rOfPlRcHNPnFEFQL04D9b7WV0+f6qJ96Y7nXN27AiJ8=; b=E8HoDR1xakX1Zi/Tk+P3apWt62fnF/8LzuoaQLhUiPQ1/RxXFiBa6luEkKGd23xnMyXszt Qv+xkCpyOiGeFUl7T4zO7XhVARYPNJfltRxIeHJbxdRQksLPZCKmigCWh+pniBgnGJuvQt r0hKNROiRD1A8NtlT0pPKCCq/bk0dzo= X-MC-Unique: A4jhG-KBMleGG28cHWjqDA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rOfPlRcHNPnFEFQL04D9b7WV0+f6qJ96Y7nXN27AiJ8=; b=no+nB7WdEGLmu0KnfRxWiciHzfOpW5vvVqpeNzjz3eWwO9BnGsHQX7ny3Nn70M681W mx0vNxSlOK3aVllT7DfzY1fhKP8I9n8nBxJvslHrxVRfQ+iGcMjjsWtdPc4VFH8kjevP y8XrpWotFXhn63Er0J1tW+VSh/cWk69jHfb1FYYljtKjhWh/lPYH9PMyXzDokdsSIsfo euFLEyNhyfDmzAboiWHhisroaQQdhcmGTOWWP0DN4d6naF76DCa/ZII1XYCtgHQAskPl iwxQO6AEku2UX64hXz3Lxra11JkBUEft6u8UbT3Bjdp/3lF2RFlzcidDmJtVRBdw6fQO Mvqw== X-Gm-Message-State: AOAM532Ws93Lsuj8zsc45qnHVRn5cSb6LkAaEWrew1j3jNF8x0C3OmZ3 L6Bo/OXQ8H5pnQTRveovKAIoZnKBze8c5lw+hpCe9ZTFbwOh0Z5yy35zv9sZr1zNr6raFvGM4Xi yFpoOT/6B7brKyA== X-Received: by 2002:adf:e852:: with SMTP id d18mr8003813wrn.40.1599721316984; Thu, 10 Sep 2020 00:01:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlwpG0tUUcWG7cYI6DeHX0M5TDMJpNZQcQfEC1vqrWrbjug/Hj3GDkPn1UBSppzX4Ol1mWhw== X-Received: by 2002:adf:e852:: with SMTP id d18mr8003791wrn.40.1599721316799; Thu, 10 Sep 2020 00:01:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvm@vger.kernel.org, qemu-arm@nongnu.org, Marcelo Tosatti , "Edgar E. Iglesias" , "Michael S. Tsirkin" , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Marcel Apfelbaum , Laurent Vivier , Peter Maydell , Andrew Jeffery , Jason Wang , Thomas Huth , Alistair Francis , qemu-trivial@nongnu.org, Eduardo Habkost , Richard Henderson , Joel Stanley , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/6] hw/net/xilinx_axienet: Rename StreamSlave as StreamSink Date: Thu, 10 Sep 2020 09:01:29 +0200 Message-Id: <20200910070131.435543-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910070131.435543-1-philmd@redhat.com> References: <20200910070131.435543-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In order to use inclusive terminology, rename 'slave stream' as 'sink stream'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Edgar E. Iglesias --- hw/net/xilinx_axienet.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 0c4ac727207..4e48535f373 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -46,11 +46,11 @@ OBJECT_CHECK(XilinxAXIEnet, (obj), TYPE_XILINX_AXI_ENET) =20 #define XILINX_AXI_ENET_DATA_STREAM(obj) \ - OBJECT_CHECK(XilinxAXIEnetStreamSlave, (obj),\ + OBJECT_CHECK(XilinxAXIEnetStreamSink, (obj),\ TYPE_XILINX_AXI_ENET_DATA_STREAM) =20 #define XILINX_AXI_ENET_CONTROL_STREAM(obj) \ - OBJECT_CHECK(XilinxAXIEnetStreamSlave, (obj),\ + OBJECT_CHECK(XilinxAXIEnetStreamSink, (obj),\ TYPE_XILINX_AXI_ENET_CONTROL_STREAM) =20 /* Advertisement control register. */ @@ -310,10 +310,10 @@ struct TEMAC { void *parent; }; =20 -typedef struct XilinxAXIEnetStreamSlave XilinxAXIEnetStreamSlave; +typedef struct XilinxAXIEnetStreamSink XilinxAXIEnetStreamSink; typedef struct XilinxAXIEnet XilinxAXIEnet; =20 -struct XilinxAXIEnetStreamSlave { +struct XilinxAXIEnetStreamSink { Object parent; =20 struct XilinxAXIEnet *enet; @@ -325,8 +325,8 @@ struct XilinxAXIEnet { qemu_irq irq; StreamSink *tx_data_dev; StreamSink *tx_control_dev; - XilinxAXIEnetStreamSlave rx_data_dev; - XilinxAXIEnetStreamSlave rx_control_dev; + XilinxAXIEnetStreamSink rx_data_dev; + XilinxAXIEnetStreamSink rx_control_dev; NICState *nic; NICConf conf; =20 @@ -859,7 +859,7 @@ xilinx_axienet_control_stream_push(StreamSink *obj, uin= t8_t *buf, size_t len, bool eop) { int i; - XilinxAXIEnetStreamSlave *cs =3D XILINX_AXI_ENET_CONTROL_STREAM(obj); + XilinxAXIEnetStreamSink *cs =3D XILINX_AXI_ENET_CONTROL_STREAM(obj); XilinxAXIEnet *s =3D cs->enet; =20 assert(eop); @@ -880,7 +880,7 @@ static size_t xilinx_axienet_data_stream_push(StreamSink *obj, uint8_t *buf, size_t size, bool eop) { - XilinxAXIEnetStreamSlave *ds =3D XILINX_AXI_ENET_DATA_STREAM(obj); + XilinxAXIEnetStreamSink *ds =3D XILINX_AXI_ENET_DATA_STREAM(obj); XilinxAXIEnet *s =3D ds->enet; =20 /* TX enable ? */ @@ -954,8 +954,8 @@ static NetClientInfo net_xilinx_enet_info =3D { static void xilinx_enet_realize(DeviceState *dev, Error **errp) { XilinxAXIEnet *s =3D XILINX_AXI_ENET(dev); - XilinxAXIEnetStreamSlave *ds =3D XILINX_AXI_ENET_DATA_STREAM(&s->rx_da= ta_dev); - XilinxAXIEnetStreamSlave *cs =3D XILINX_AXI_ENET_CONTROL_STREAM( + XilinxAXIEnetStreamSink *ds =3D XILINX_AXI_ENET_DATA_STREAM(&s->rx_dat= a_dev); + XilinxAXIEnetStreamSink *cs =3D XILINX_AXI_ENET_CONTROL_STREAM( &s->rx_control= _dev); =20 object_property_add_link(OBJECT(ds), "enet", "xlnx.axi-ethernet", @@ -1046,7 +1046,7 @@ static const TypeInfo xilinx_enet_info =3D { static const TypeInfo xilinx_enet_data_stream_info =3D { .name =3D TYPE_XILINX_AXI_ENET_DATA_STREAM, .parent =3D TYPE_OBJECT, - .instance_size =3D sizeof(struct XilinxAXIEnetStreamSlave), + .instance_size =3D sizeof(struct XilinxAXIEnetStreamSink), .class_init =3D xilinx_enet_data_stream_class_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_STREAM_SINK }, @@ -1057,7 +1057,7 @@ static const TypeInfo xilinx_enet_data_stream_info = =3D { static const TypeInfo xilinx_enet_control_stream_info =3D { .name =3D TYPE_XILINX_AXI_ENET_CONTROL_STREAM, .parent =3D TYPE_OBJECT, - .instance_size =3D sizeof(struct XilinxAXIEnetStreamSlave), + .instance_size =3D sizeof(struct XilinxAXIEnetStreamSink), .class_init =3D xilinx_enet_control_stream_class_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_STREAM_SINK }, --=20 2.26.2