From nobody Mon Feb 9 14:33:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1599721317; cv=none; d=zohomail.com; s=zohoarc; b=JvxIjKh2mqeRTRDfBrC0mtQofX+JEC3T23qBrneagI20DoLMnt5xoalt+GZSvJHaJhY+7MZGkMyVl3XYQ8xmGEgJc77ZkawOt0oHsGLghGYQHCpr/5bkT9//zSa9IukO9/oabQ/ezmYd7eLpOnDyNcitLP6BEpuFOk6Giac7akc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599721317; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tLJtjbF1Sn9R0haF3xV7HnFQaxPu+haN5ye/cmISEq4=; b=PkMw+hhNfixvMBCMG6+deNzxlo4/Zg7wgblcm2kdCOCRZOKnkz1L02RwvFT2tERSbaBj9G5dc231f9BlVikZrvR2WVK13e/U6KiuEYfvsQXY4795EQsD+FtauR5EGXVaPrpIbcD6UWRB25zer4QuJAwIRUWizvxE3aHJn6o+6Xg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1599721317670421.30471259172236; Thu, 10 Sep 2020 00:01:57 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-50-b-kN3cc7Nvm83rdRht-mlw-1; Thu, 10 Sep 2020 03:01:52 -0400 Received: by mail-wm1-f69.google.com with SMTP id g79so551615wmg.0 for ; Thu, 10 Sep 2020 00:01:52 -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 n21sm2230672wmi.21.2020.09.10.00.01.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599721316; 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=tLJtjbF1Sn9R0haF3xV7HnFQaxPu+haN5ye/cmISEq4=; b=TrxS+4zHj3gLTE/lhdybqFzS3xouImV4qx1j3MwfOV3UPiQCjENZS0S3YXXOZb+ZGY4w2S dHfQPXyrnMFVCzDa9Tc2krC7C9j4Mo6siiJm5FNjXZBUEf+DW94mFxWq2ANqqlWQUs4d4s M6A2eYe1PouvXuPNB3Nw1sffLCLccdY= X-MC-Unique: b-kN3cc7Nvm83rdRht-mlw-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=tLJtjbF1Sn9R0haF3xV7HnFQaxPu+haN5ye/cmISEq4=; b=gOVcZGigW9sjkDLyZTcJ2P9qV1jud3ASQsAwhjsRcPGmJe7aWV/d+z1BPr/SQUAe1r vh9I7dYIeZU6jMCWjsoU7n58dEvujKJmVnX2eLhz4Df0/cUT+8vc2+RViCTXFFRlcoNR acP6DJ63rv8CS8+b8/uh4Lh7mGSEuBHw4CneXizVreYcbov0W2Az+Wm3bgdOU2/K+RV0 0ZSAugf/tdd7e5Ax8d4VCUvBeXcSwJsvcxFPbHVsfZavGpmKaQYJPdxD4VR6D1Xs/cnY XssVTJC5FwyUTjZYYpxt2WDsUfFUvgtVMgG0HXY4LCbfmJ3MlgZbBl/Wt0Y7mMTbPAyM NtiA== X-Gm-Message-State: AOAM533mtqz8SSZo2AN3OTlci/cv38xz6AzJJdeJwwfaruIjc80vjbOY UnBh1SGQrQlPXqu9ANLIrolLiv7MvWZY7vRDw6y8OO9nA6al3UMIem97w6pZ2o5epdb9bwWcuWE TcXtMC9+Qv+PbBw== X-Received: by 2002:a5d:4ccb:: with SMTP id c11mr7278671wrt.159.1599721311426; Thu, 10 Sep 2020 00:01:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8i7cmKf45V5kbz2l0XObKJh2WEGqkHysM6c4v7BhvhCTsiOpA+VO+/qwWJnvJcR5KLi5V/A== X-Received: by 2002:a5d:4ccb:: with SMTP id c11mr7278646wrt.159.1599721311241; Thu, 10 Sep 2020 00:01:51 -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 3/6] hw/dma/xilinx_axidma: Rename StreamSlave as StreamSink Date: Thu, 10 Sep 2020 09:01:28 +0200 Message-Id: <20200910070131.435543-4-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/dma/xilinx_axidma.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index cf12a852ea1..19e14a2997e 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -46,11 +46,11 @@ OBJECT_CHECK(XilinxAXIDMA, (obj), TYPE_XILINX_AXI_DMA) =20 #define XILINX_AXI_DMA_DATA_STREAM(obj) \ - OBJECT_CHECK(XilinxAXIDMAStreamSlave, (obj),\ + OBJECT_CHECK(XilinxAXIDMAStreamSink, (obj),\ TYPE_XILINX_AXI_DMA_DATA_STREAM) =20 #define XILINX_AXI_DMA_CONTROL_STREAM(obj) \ - OBJECT_CHECK(XilinxAXIDMAStreamSlave, (obj),\ + OBJECT_CHECK(XilinxAXIDMAStreamSink, (obj),\ TYPE_XILINX_AXI_DMA_CONTROL_STREAM) =20 #define R_DMACR (0x00 / 4) @@ -63,7 +63,7 @@ #define CONTROL_PAYLOAD_SIZE (CONTROL_PAYLOAD_WORDS * (sizeof(uint32_t))) =20 typedef struct XilinxAXIDMA XilinxAXIDMA; -typedef struct XilinxAXIDMAStreamSlave XilinxAXIDMAStreamSlave; +typedef struct XilinxAXIDMAStreamSink XilinxAXIDMAStreamSink; =20 enum { DMACR_RUNSTOP =3D 1, @@ -118,7 +118,7 @@ struct Stream { unsigned char txbuf[16 * 1024]; }; =20 -struct XilinxAXIDMAStreamSlave { +struct XilinxAXIDMAStreamSink { Object parent; =20 struct XilinxAXIDMA *dma; @@ -133,8 +133,8 @@ struct XilinxAXIDMA { uint32_t freqhz; StreamSink *tx_data_dev; StreamSink *tx_control_dev; - XilinxAXIDMAStreamSlave rx_data_dev; - XilinxAXIDMAStreamSlave rx_control_dev; + XilinxAXIDMAStreamSink rx_data_dev; + XilinxAXIDMAStreamSink rx_control_dev; =20 struct Stream streams[2]; =20 @@ -390,7 +390,7 @@ static size_t xilinx_axidma_control_stream_push(StreamSink *obj, unsigned char *buf, size_t len, bool eop) { - XilinxAXIDMAStreamSlave *cs =3D XILINX_AXI_DMA_CONTROL_STREAM(obj); + XilinxAXIDMAStreamSink *cs =3D XILINX_AXI_DMA_CONTROL_STREAM(obj); struct Stream *s =3D &cs->dma->streams[1]; =20 if (len !=3D CONTROL_PAYLOAD_SIZE) { @@ -407,7 +407,7 @@ xilinx_axidma_data_stream_can_push(StreamSink *obj, StreamCanPushNotifyFn notify, void *notify_opaque) { - XilinxAXIDMAStreamSlave *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); + XilinxAXIDMAStreamSink *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); struct Stream *s =3D &ds->dma->streams[1]; =20 if (!stream_running(s) || stream_idle(s)) { @@ -423,7 +423,7 @@ static size_t xilinx_axidma_data_stream_push(StreamSink *obj, unsigned char *buf, size_t= len, bool eop) { - XilinxAXIDMAStreamSlave *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); + XilinxAXIDMAStreamSink *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); struct Stream *s =3D &ds->dma->streams[1]; size_t ret; =20 @@ -534,8 +534,8 @@ static const MemoryRegionOps axidma_ops =3D { static void xilinx_axidma_realize(DeviceState *dev, Error **errp) { XilinxAXIDMA *s =3D XILINX_AXI_DMA(dev); - XilinxAXIDMAStreamSlave *ds =3D XILINX_AXI_DMA_DATA_STREAM(&s->rx_data= _dev); - XilinxAXIDMAStreamSlave *cs =3D XILINX_AXI_DMA_CONTROL_STREAM( + XilinxAXIDMAStreamSink *ds =3D XILINX_AXI_DMA_DATA_STREAM(&s->rx_data_= dev); + XilinxAXIDMAStreamSink *cs =3D XILINX_AXI_DMA_CONTROL_STREAM( &s->rx_control= _dev); int i; =20 @@ -634,7 +634,7 @@ static const TypeInfo axidma_info =3D { static const TypeInfo xilinx_axidma_data_stream_info =3D { .name =3D TYPE_XILINX_AXI_DMA_DATA_STREAM, .parent =3D TYPE_OBJECT, - .instance_size =3D sizeof(struct XilinxAXIDMAStreamSlave), + .instance_size =3D sizeof(struct XilinxAXIDMAStreamSink), .class_init =3D xilinx_axidma_stream_class_init, .class_data =3D &xilinx_axidma_data_stream_class, .interfaces =3D (InterfaceInfo[]) { @@ -646,7 +646,7 @@ static const TypeInfo xilinx_axidma_data_stream_info = =3D { static const TypeInfo xilinx_axidma_control_stream_info =3D { .name =3D TYPE_XILINX_AXI_DMA_CONTROL_STREAM, .parent =3D TYPE_OBJECT, - .instance_size =3D sizeof(struct XilinxAXIDMAStreamSlave), + .instance_size =3D sizeof(struct XilinxAXIDMAStreamSink), .class_init =3D xilinx_axidma_stream_class_init, .class_data =3D &xilinx_axidma_control_stream_class, .interfaces =3D (InterfaceInfo[]) { --=20 2.26.2