From nobody Mon Feb 9 21:37:40 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=1599721310; cv=none; d=zohomail.com; s=zohoarc; b=I0fFfcJ5IH6Ir4LBsbGJ/yhOfu6NMhHhvsskKfkEPu5XUiu9IVfJrTYj2ilkiP67BJYpSv74sNUjHuzw9TxQlHawidbIQO6nndW5O6MwsZxTHgGtq3tK0KQDH3uhbsvuH4WFebvLtY8BuMDeCqvaCcwItkR+CpctWdV17VImKrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599721310; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=r7XFBGUbtmw6+pIarSdnNbYpBrhpwFO1Rb8y52JScyA=; b=b0T1TKEFtJudYcKDE1y3V/OeBWNRPWJ4rA6G6tqZdeNwATdBXRKWPHCc8J10F4yPrBJkJ/8DWeKbhotsW+VGRflATG1+CndlLnEfvWVoE93C5C6ogMMVldl2R9e+W+ETYyyxvJA/ZbGsyraUwLdQx1gQkI5wnuR2ClkqOqePZEE= 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 1599721310710442.62876751762576; Thu, 10 Sep 2020 00:01:50 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-G4zk2_s_NxuEoDk3EAXyTg-1; Thu, 10 Sep 2020 03:01:47 -0400 Received: by mail-wr1-f72.google.com with SMTP id f18so1881248wrv.19 for ; Thu, 10 Sep 2020 00:01:47 -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 z7sm7666348wrw.93.2020.09.10.00.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599721309; 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=r7XFBGUbtmw6+pIarSdnNbYpBrhpwFO1Rb8y52JScyA=; b=JQWqLZgL3+6ESTe9xeUTqFY4cASa0xqGRxoCIQfIrlN0KNrjKBTDNcDbet4UbjYjo1ItYy +H73VTXMVcP3kw8QtzNUupDgzNAcvHNKI+/wTUs00G4f0dS9litjP6wQxPSDO1K3vZ8MS1 Uqo1//1CgV/jUpIZlar93mArkYWxOKA= X-MC-Unique: G4zk2_s_NxuEoDk3EAXyTg-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=r7XFBGUbtmw6+pIarSdnNbYpBrhpwFO1Rb8y52JScyA=; b=iYn5IidV9u1TMYM6Kr22qFPJoAjc2uSkzPe8Hc2AELL9GxCSsWPt/JcCsnlw/dArNt 5Q/fHlGki8rvw90hezzhrNhCACEQjuVDYW0w9AC60qbSa9VmigY6o7Wj18hWJc7538H5 BnS6+DloVFBltLu7DJXhP61udCGIlsYLh0gQKdii/5Kx8v02qyOa6bPU1+DYNOcvUPSH eh60/PM3C6LMPF59xU0KFCS4LV0dtsYju/OZzGZjx1X9QJpFS2rIpYpFAPDwqH3Tj6aq 0dTHvtePAy9mRohr+bsVuBKjloMK6kW8bYR8dkuE7ZwDfq7lHeTrcvhhsKqHlKxfTYCC 8aVA== X-Gm-Message-State: AOAM533UHO1L1a/c3VYVsc1k+DvJs/tpKqJFHcmCPGhsn71Orxbyxa8x 2RdCwrtCOntzstTgnHwkZ9gHTr+HLBhlLwWqYHvuhS9R2JFFq9Fm9NT5tlZbI1RgBbXTsCS1UiC OAIkwtZ8dDg0lqA== X-Received: by 2002:a7b:ce17:: with SMTP id m23mr6726956wmc.98.1599721305931; Thu, 10 Sep 2020 00:01:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7BwDX40M9FcvmDDKL7Sv5M5flTDXcgcHzKzgkmRdWZC6SYh+Ne8NxJgQ8zHZWT11W+dNcDQ== X-Received: by 2002:a7b:ce17:: with SMTP id m23mr6726926wmc.98.1599721305563; Thu, 10 Sep 2020 00:01:45 -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 2/6] hw/core/stream: Rename StreamSlave as StreamSink Date: Thu, 10 Sep 2020 09:01:27 +0200 Message-Id: <20200910070131.435543-3-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 --- include/hw/ssi/xilinx_spips.h | 2 +- include/hw/stream.h | 46 +++++++++++++++++------------------ hw/core/stream.c | 20 +++++++-------- hw/dma/xilinx_axidma.c | 32 ++++++++++++------------ hw/net/xilinx_axienet.c | 20 +++++++-------- hw/ssi/xilinx_spips.c | 2 +- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/include/hw/ssi/xilinx_spips.h b/include/hw/ssi/xilinx_spips.h index 6a39b55a7bd..fde8a3ebda6 100644 --- a/include/hw/ssi/xilinx_spips.h +++ b/include/hw/ssi/xilinx_spips.h @@ -97,7 +97,7 @@ typedef struct { typedef struct { XilinxQSPIPS parent_obj; =20 - StreamSlave *dma; + StreamSink *dma; int gqspi_irqline; =20 uint32_t regs[XLNX_ZYNQMP_SPIPS_R_MAX]; diff --git a/include/hw/stream.h b/include/hw/stream.h index ed09e83683d..8ca161991ca 100644 --- a/include/hw/stream.h +++ b/include/hw/stream.h @@ -3,52 +3,52 @@ =20 #include "qom/object.h" =20 -/* stream slave. Used until qdev provides a generic way. */ -#define TYPE_STREAM_SLAVE "stream-slave" +/* stream sink. Used until qdev provides a generic way. */ +#define TYPE_STREAM_SINK "stream-slave" =20 -#define STREAM_SLAVE_CLASS(klass) \ - OBJECT_CLASS_CHECK(StreamSlaveClass, (klass), TYPE_STREAM_SLAVE) -#define STREAM_SLAVE_GET_CLASS(obj) \ - OBJECT_GET_CLASS(StreamSlaveClass, (obj), TYPE_STREAM_SLAVE) -#define STREAM_SLAVE(obj) \ - INTERFACE_CHECK(StreamSlave, (obj), TYPE_STREAM_SLAVE) +#define STREAM_SINK_CLASS(klass) \ + OBJECT_CLASS_CHECK(StreamSinkClass, (klass), TYPE_STREAM_SINK) +#define STREAM_SINK_GET_CLASS(obj) \ + OBJECT_GET_CLASS(StreamSinkClass, (obj), TYPE_STREAM_SINK) +#define STREAM_SINK(obj) \ + INTERFACE_CHECK(StreamSink, (obj), TYPE_STREAM_SINK) =20 -typedef struct StreamSlave StreamSlave; +typedef struct StreamSink StreamSink; =20 typedef void (*StreamCanPushNotifyFn)(void *opaque); =20 -typedef struct StreamSlaveClass { +typedef struct StreamSinkClass { InterfaceClass parent; /** - * can push - determine if a stream slave is capable of accepting at l= east + * can push - determine if a stream sink is capable of accepting at le= ast * one byte of data. Returns false if cannot accept. If not implemente= d, the - * slave is assumed to always be capable of receiving. - * @notify: Optional callback that the slave will call when the slave = is + * sink is assumed to always be capable of receiving. + * @notify: Optional callback that the sink will call when the sink is * capable of receiving again. Only called if false is returned. * @notify_opaque: opaque data to pass to notify call. */ - bool (*can_push)(StreamSlave *obj, StreamCanPushNotifyFn notify, + bool (*can_push)(StreamSink *obj, StreamCanPushNotifyFn notify, void *notify_opaque); /** - * push - push data to a Stream slave. The number of bytes pushed is - * returned. If the slave short returns, the master must wait before t= rying - * again, the slave may continue to just return 0 waiting for the vm t= ime to + * push - push data to a Stream sink. The number of bytes pushed is + * returned. If the sink short returns, the master must wait before tr= ying + * again, the sink may continue to just return 0 waiting for the vm ti= me to * advance. The can_push() function can be used to trap the point in t= ime - * where the slave is ready to receive again, otherwise polling on a Q= EMU + * where the sink is ready to receive again, otherwise polling on a QE= MU * timer will work. - * @obj: Stream slave to push to + * @obj: Stream sink to push to * @buf: Data to write * @len: Maximum number of bytes to write * @eop: End of packet flag */ - size_t (*push)(StreamSlave *obj, unsigned char *buf, size_t len, bool = eop); -} StreamSlaveClass; + size_t (*push)(StreamSink *obj, unsigned char *buf, size_t len, bool e= op); +} StreamSinkClass; =20 size_t -stream_push(StreamSlave *sink, uint8_t *buf, size_t len, bool eop); +stream_push(StreamSink *sink, uint8_t *buf, size_t len, bool eop); =20 bool -stream_can_push(StreamSlave *sink, StreamCanPushNotifyFn notify, +stream_can_push(StreamSink *sink, StreamCanPushNotifyFn notify, void *notify_opaque); =20 =20 diff --git a/hw/core/stream.c b/hw/core/stream.c index a65ad1208d8..19477d0f2df 100644 --- a/hw/core/stream.c +++ b/hw/core/stream.c @@ -3,32 +3,32 @@ #include "qemu/module.h" =20 size_t -stream_push(StreamSlave *sink, uint8_t *buf, size_t len, bool eop) +stream_push(StreamSink *sink, uint8_t *buf, size_t len, bool eop) { - StreamSlaveClass *k =3D STREAM_SLAVE_GET_CLASS(sink); + StreamSinkClass *k =3D STREAM_SINK_GET_CLASS(sink); =20 return k->push(sink, buf, len, eop); } =20 bool -stream_can_push(StreamSlave *sink, StreamCanPushNotifyFn notify, +stream_can_push(StreamSink *sink, StreamCanPushNotifyFn notify, void *notify_opaque) { - StreamSlaveClass *k =3D STREAM_SLAVE_GET_CLASS(sink); + StreamSinkClass *k =3D STREAM_SINK_GET_CLASS(sink); =20 return k->can_push ? k->can_push(sink, notify, notify_opaque) : true; } =20 -static const TypeInfo stream_slave_info =3D { - .name =3D TYPE_STREAM_SLAVE, +static const TypeInfo stream_sink_info =3D { + .name =3D TYPE_STREAM_SINK, .parent =3D TYPE_INTERFACE, - .class_size =3D sizeof(StreamSlaveClass), + .class_size =3D sizeof(StreamSinkClass), }; =20 =20 -static void stream_slave_register_types(void) +static void stream_sink_register_types(void) { - type_register_static(&stream_slave_info); + type_register_static(&stream_sink_info); } =20 -type_init(stream_slave_register_types) +type_init(stream_sink_register_types) diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index a4812e480a0..cf12a852ea1 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -131,8 +131,8 @@ struct XilinxAXIDMA { AddressSpace as; =20 uint32_t freqhz; - StreamSlave *tx_data_dev; - StreamSlave *tx_control_dev; + StreamSink *tx_data_dev; + StreamSink *tx_control_dev; XilinxAXIDMAStreamSlave rx_data_dev; XilinxAXIDMAStreamSlave rx_control_dev; =20 @@ -264,8 +264,8 @@ static void stream_complete(struct Stream *s) ptimer_transaction_commit(s->ptimer); } =20 -static void stream_process_mem2s(struct Stream *s, StreamSlave *tx_data_de= v, - StreamSlave *tx_control_dev) +static void stream_process_mem2s(struct Stream *s, StreamSink *tx_data_dev, + StreamSink *tx_control_dev) { uint32_t prev_d; uint32_t txlen; @@ -387,7 +387,7 @@ static void xilinx_axidma_reset(DeviceState *dev) } =20 static size_t -xilinx_axidma_control_stream_push(StreamSlave *obj, unsigned char *buf, +xilinx_axidma_control_stream_push(StreamSink *obj, unsigned char *buf, size_t len, bool eop) { XilinxAXIDMAStreamSlave *cs =3D XILINX_AXI_DMA_CONTROL_STREAM(obj); @@ -403,7 +403,7 @@ xilinx_axidma_control_stream_push(StreamSlave *obj, uns= igned char *buf, } =20 static bool -xilinx_axidma_data_stream_can_push(StreamSlave *obj, +xilinx_axidma_data_stream_can_push(StreamSink *obj, StreamCanPushNotifyFn notify, void *notify_opaque) { @@ -420,7 +420,7 @@ xilinx_axidma_data_stream_can_push(StreamSlave *obj, } =20 static size_t -xilinx_axidma_data_stream_push(StreamSlave *obj, unsigned char *buf, size_= t len, +xilinx_axidma_data_stream_push(StreamSink *obj, unsigned char *buf, size_t= len, bool eop) { XilinxAXIDMAStreamSlave *ds =3D XILINX_AXI_DMA_DATA_STREAM(obj); @@ -591,9 +591,9 @@ static void xilinx_axidma_init(Object *obj) static Property axidma_properties[] =3D { DEFINE_PROP_UINT32("freqhz", XilinxAXIDMA, freqhz, 50000000), DEFINE_PROP_LINK("axistream-connected", XilinxAXIDMA, - tx_data_dev, TYPE_STREAM_SLAVE, StreamSlave *), + tx_data_dev, TYPE_STREAM_SINK, StreamSink *), DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIDMA, - tx_control_dev, TYPE_STREAM_SLAVE, StreamSlave *), + tx_control_dev, TYPE_STREAM_SINK, StreamSink *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -606,21 +606,21 @@ static void axidma_class_init(ObjectClass *klass, voi= d *data) device_class_set_props(dc, axidma_properties); } =20 -static StreamSlaveClass xilinx_axidma_data_stream_class =3D { +static StreamSinkClass xilinx_axidma_data_stream_class =3D { .push =3D xilinx_axidma_data_stream_push, .can_push =3D xilinx_axidma_data_stream_can_push, }; =20 -static StreamSlaveClass xilinx_axidma_control_stream_class =3D { +static StreamSinkClass xilinx_axidma_control_stream_class =3D { .push =3D xilinx_axidma_control_stream_push, }; =20 static void xilinx_axidma_stream_class_init(ObjectClass *klass, void *data) { - StreamSlaveClass *ssc =3D STREAM_SLAVE_CLASS(klass); + StreamSinkClass *ssc =3D STREAM_SINK_CLASS(klass); =20 - ssc->push =3D ((StreamSlaveClass *)data)->push; - ssc->can_push =3D ((StreamSlaveClass *)data)->can_push; + ssc->push =3D ((StreamSinkClass *)data)->push; + ssc->can_push =3D ((StreamSinkClass *)data)->can_push; } =20 static const TypeInfo axidma_info =3D { @@ -638,7 +638,7 @@ static const TypeInfo xilinx_axidma_data_stream_info = =3D { .class_init =3D xilinx_axidma_stream_class_init, .class_data =3D &xilinx_axidma_data_stream_class, .interfaces =3D (InterfaceInfo[]) { - { TYPE_STREAM_SLAVE }, + { TYPE_STREAM_SINK }, { } } }; @@ -650,7 +650,7 @@ static const TypeInfo xilinx_axidma_control_stream_info= =3D { .class_init =3D xilinx_axidma_stream_class_init, .class_data =3D &xilinx_axidma_control_stream_class, .interfaces =3D (InterfaceInfo[]) { - { TYPE_STREAM_SLAVE }, + { TYPE_STREAM_SINK }, { } } }; diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 2e89f236b4a..0c4ac727207 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -323,8 +323,8 @@ struct XilinxAXIEnet { SysBusDevice busdev; MemoryRegion iomem; qemu_irq irq; - StreamSlave *tx_data_dev; - StreamSlave *tx_control_dev; + StreamSink *tx_data_dev; + StreamSink *tx_control_dev; XilinxAXIEnetStreamSlave rx_data_dev; XilinxAXIEnetStreamSlave rx_control_dev; NICState *nic; @@ -855,7 +855,7 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t= *buf, size_t size) } =20 static size_t -xilinx_axienet_control_stream_push(StreamSlave *obj, uint8_t *buf, size_t = len, +xilinx_axienet_control_stream_push(StreamSink *obj, uint8_t *buf, size_t l= en, bool eop) { int i; @@ -877,7 +877,7 @@ xilinx_axienet_control_stream_push(StreamSlave *obj, ui= nt8_t *buf, size_t len, } =20 static size_t -xilinx_axienet_data_stream_push(StreamSlave *obj, uint8_t *buf, size_t siz= e, +xilinx_axienet_data_stream_push(StreamSink *obj, uint8_t *buf, size_t size, bool eop) { XilinxAXIEnetStreamSlave *ds =3D XILINX_AXI_ENET_DATA_STREAM(obj); @@ -1005,9 +1005,9 @@ static Property xilinx_enet_properties[] =3D { DEFINE_PROP_UINT32("txmem", XilinxAXIEnet, c_txmem, 0x1000), DEFINE_NIC_PROPERTIES(XilinxAXIEnet, conf), DEFINE_PROP_LINK("axistream-connected", XilinxAXIEnet, - tx_data_dev, TYPE_STREAM_SLAVE, StreamSlave *), + tx_data_dev, TYPE_STREAM_SINK, StreamSink *), DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIEnet, - tx_control_dev, TYPE_STREAM_SLAVE, StreamSlave *), + tx_control_dev, TYPE_STREAM_SINK, StreamSink *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -1023,14 +1023,14 @@ static void xilinx_enet_class_init(ObjectClass *kla= ss, void *data) static void xilinx_enet_control_stream_class_init(ObjectClass *klass, void *data) { - StreamSlaveClass *ssc =3D STREAM_SLAVE_CLASS(klass); + StreamSinkClass *ssc =3D STREAM_SINK_CLASS(klass); =20 ssc->push =3D xilinx_axienet_control_stream_push; } =20 static void xilinx_enet_data_stream_class_init(ObjectClass *klass, void *d= ata) { - StreamSlaveClass *ssc =3D STREAM_SLAVE_CLASS(klass); + StreamSinkClass *ssc =3D STREAM_SINK_CLASS(klass); =20 ssc->push =3D xilinx_axienet_data_stream_push; } @@ -1049,7 +1049,7 @@ static const TypeInfo xilinx_enet_data_stream_info = =3D { .instance_size =3D sizeof(struct XilinxAXIEnetStreamSlave), .class_init =3D xilinx_enet_data_stream_class_init, .interfaces =3D (InterfaceInfo[]) { - { TYPE_STREAM_SLAVE }, + { TYPE_STREAM_SINK }, { } } }; @@ -1060,7 +1060,7 @@ static const TypeInfo xilinx_enet_control_stream_info= =3D { .instance_size =3D sizeof(struct XilinxAXIEnetStreamSlave), .class_init =3D xilinx_enet_control_stream_class_init, .interfaces =3D (InterfaceInfo[]) { - { TYPE_STREAM_SLAVE }, + { TYPE_STREAM_SINK }, { } } }; diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index b9371dbf8d7..6109ba55107 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -1353,7 +1353,7 @@ static void xlnx_zynqmp_qspips_init(Object *obj) { XlnxZynqMPQSPIPS *rq =3D XLNX_ZYNQMP_QSPIPS(obj); =20 - object_property_add_link(obj, "stream-connected-dma", TYPE_STREAM_SLAV= E, + object_property_add_link(obj, "stream-connected-dma", TYPE_STREAM_SINK, (Object **)&rq->dma, object_property_allow_set_link, OBJ_PROP_LINK_STRONG); --=20 2.26.2