From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp543425lfg; Thu, 20 Feb 2020 05:06:26 -0800 (PST) X-Google-Smtp-Source: APXvYqytWChNWmFFOnWAcYJA33sXF4UlPTX0o9Fy6PXFMuC89iMsc6NrQzwr8UtN2g10qG+5Sct/ X-Received: by 2002:aca:c4c4:: with SMTP id u187mr1916836oif.120.1582203986620; Thu, 20 Feb 2020 05:06:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582203986; cv=none; d=google.com; s=arc-20160816; b=hEwYr+nNEdAqZcTOu1RvbTL8OjBkN2m2GAI+p8gHJEcz+aXnLs4vxT29rilq8VVT9W +CWrVdSeib4vS3CWH/SvD0N9ITStYFmz31DxAgdelrSoKlZx3m6TDzm115GZUOjIdKRZ huc1M1N/+yxGmaexHpug4yTBTvWIOjqSsr+TH0J8HKmHuirU5oQKGdJ0hvBOaFqSeRz/ ElVl9pRGKOBqSKRR5u4CXPfKA/WNLJVxHCIk5zGYXD1O1Z72f/KcksM4cusZAVSLi2fJ LrTuoGL/T7F3unt5oyZL9dmuKQJiDIjzaT2xCSp2t7bVoSQCVtSuM0O6mDu5fhmB7LGX BPbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pVKWVWwp9TVJU5qM7Beut+kG2DV5MFLYTF1Kx3cmH3A=; b=UlQcZiHhftLGdtcuwGY0coXUTN5j6Z7TY6yh5dI+wmsDbd85R0yTYnQWLqmv1pP1J2 sQlelJA/m5up95zmJ7/TJ9zk9BcNkxiyN3nUauSI8tcljlnvag4jl/mcvuGik8qx5JUH vQt2j5d8UQlF0ukjR1rFNYWARUOixyQnOBwt0pksKGx/1klq4MDDcTs6GJv5RJCHdIyI pwpOgaLe+gq6jAr0SNkHCU82spqKKR1+Rvht5PUO4moKMmghXvNuzRFxPSSQBwA3XY4a O9Yo87ORMGf7AIxqE0QFtIlvQL0C0H8V897wLq3CHa/+NBxBSJceW0J5ltyV8yGcKV+D 1xpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VOz5yQVt; spf=pass (google.com: best guess record for domain of kvm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=kvm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b2si1957201ots.284.2020.02.20.05.06.26; Thu, 20 Feb 2020 05:06:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of kvm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VOz5yQVt; spf=pass (google.com: best guess record for domain of kvm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=kvm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728149AbgBTNGZ (ORCPT + 5 others); Thu, 20 Feb 2020 08:06:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51339 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728160AbgBTNGZ (ORCPT ); Thu, 20 Feb 2020 08:06:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203983; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pVKWVWwp9TVJU5qM7Beut+kG2DV5MFLYTF1Kx3cmH3A=; b=VOz5yQVt6lLlJ18HbJIoxtfPaQuyZsRZS+Idit5RuiTOIOMQe1muWY6NfGX6SwK3FTXQM0 PBl9g8NYoMhNdFavxU44/f3trtSAETGjVmTRbOer1/ozgoxSr+OuwAkVSV07sQcZNeTEj3 I7iYIQHho/vJ87u4vJEf9dWZxsbXJBY= 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-5-j_HWigesOYm-9cLnjZwJWg-1; Thu, 20 Feb 2020 08:06:21 -0500 X-MC-Unique: j_HWigesOYm-9cLnjZwJWg-1 Received: by mail-wr1-f72.google.com with SMTP id m15so1683027wrs.22 for ; Thu, 20 Feb 2020 05:06:21 -0800 (PST) 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=pVKWVWwp9TVJU5qM7Beut+kG2DV5MFLYTF1Kx3cmH3A=; b=jldAPeJX01RIhmdzF3ktwUBUe45tLYyIAZ23mNTT3nShGZOgpuM2cZGO4CkYTa+TgV 4bvB96f9op1oalqv6BzcHIr1Q37biXROUmFfk2u7DOE4PSy7uPla9CAf3aEKVFk5JcXl OcG/U8yqDskyycwG31IyBSD4h3Y276FKEZxRnE2i3FseJFvS1REun8L2oe5RNuMWmIPS kNYT8y0ADatchH9MKRi3AtsyxNiIjQMFcJpyLVew3ZmCetPydNghFLYL0KjoBpcrnygs Lvc9RCCrTmbZtza1EDfuUFyBQdeVdIwW9V7aHQ+1ADCw9qv2N0Xh2+uxx9lIy7VHlqYu hCHQ== X-Gm-Message-State: APjAAAW9nj0TA0L9yYZ0v9K3pcZVjBKbUdXDecZcC5dETvnaLUk1GSJn F+lX3hBPm1QTET7WObDr0XW6e4aLUA9CYVz4MXlIlNXpP2dgddaxkp8hV8oaGvEQgnB4x00ZJfF 5jEYqCgtSi7Jv X-Received: by 2002:a5d:4687:: with SMTP id u7mr40881734wrq.176.1582203980204; Thu, 20 Feb 2020 05:06:20 -0800 (PST) X-Received: by 2002:a5d:4687:: with SMTP id u7mr40881691wrq.176.1582203979939; Thu, 20 Feb 2020 05:06:19 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id b67sm4594690wmc.38.2020.02.20.05.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Anthony Perard , Fam Zheng , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, Laurent Vivier , Thomas Huth , Stefan Weil , Eric Auger , Halil Pasic , Marcel Apfelbaum , qemu-s390x@nongnu.org, Aleksandar Rikalo , David Gibson , Michael Walle , qemu-ppc@nongnu.org, Gerd Hoffmann , Cornelia Huck , qemu-arm@nongnu.org, Alistair Francis , qemu-block@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Jason Wang , xen-devel@lists.xenproject.org, Christian Borntraeger , Dmitry Fleytman , Matthew Rosato , Eduardo Habkost , Richard Henderson , "Michael S. Tsirkin" , David Hildenbrand , Paolo Bonzini , Stefano Stabellini , Igor Mitsyanko , Paul Durrant , Richard Henderson , John Snow Subject: [PATCH v3 07/20] hw/net: Avoid casting non-const pointer, use address_space_write() Date: Thu, 20 Feb 2020 14:05:35 +0100 Message-Id: <20200220130548.29974-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220130548.29974-1-philmd@redhat.com> References: <20200220130548.29974-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-TUID: JSVpzqSj76Zf The NetReceive prototype gets a const buffer: typedef ssize_t (NetReceive)(NetClientState *, const uint8_t *, size_t); We already have the address_space_write() method to write a const buffer to an address space. Use it to avoid: hw/net/i82596.c: In function ‘i82596_receive’: hw/net/i82596.c:644:54: error: passing argument 4 of ‘address_space_rw’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const. Signed-off-by: Philippe Mathieu-Daudé --- scripts/coccinelle/exec_rw_const.cocci | 14 ++++++++++++++ hw/net/dp8393x.c | 3 +-- hw/net/i82596.c | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/exec_rw_const.cocci index a0054f009d..4e459d915b 100644 --- a/scripts/coccinelle/exec_rw_const.cocci +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -1,6 +1,20 @@ // Usage: // spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-place +// Use address_space_write instead of casting to non-const +@@ +type T; +const T *V; +expression E1, E2, E3, E4; +@@ +( +- address_space_rw(E1, E2, E3, (T *)V, E4, 1) ++ address_space_write(E1, E2, E3, V, E4) +| +- address_space_rw(E1, E2, E3, (void *)V, E4, 1) ++ address_space_write(E1, E2, E3, V, E4) +) + // Remove useless cast @@ expression E1, E2, E3, E4; diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index a134d431ae..580ae4437e 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -787,8 +787,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf, /* Put packet into RBA */ DPRINTF("Receive packet at %08x\n", dp8393x_crba(s)); address = dp8393x_crba(s); - address_space_rw(&s->as, address, - MEMTXATTRS_UNSPECIFIED, (uint8_t *)buf, rx_len, 1); + address_space_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, buf, rx_len); address += rx_len; address_space_rw(&s->as, address, MEMTXATTRS_UNSPECIFIED, (uint8_t *)&checksum, 4, 1); diff --git a/hw/net/i82596.c b/hw/net/i82596.c index 3a0e1ec4c0..a292984e06 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -640,8 +640,8 @@ ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz) } rba = get_uint32(rbd + 8); /* printf("rba is 0x%x\n", rba); */ - address_space_rw(&address_space_memory, rba, - MEMTXATTRS_UNSPECIFIED, (void *)buf, num, 1); + address_space_write(&address_space_memory, rba, + MEMTXATTRS_UNSPECIFIED, buf, num); rba += num; buf += num; len -= num; -- 2.21.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88D8BC11D05 for ; Thu, 20 Feb 2020 13:06:35 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5DF07206ED for ; Thu, 20 Feb 2020 13:06:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="M6pP8130" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DF07206ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4lX7-0001Ax-NL; Thu, 20 Feb 2020 13:06:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4lX6-00019C-AH for xen-devel@lists.xenproject.org; Thu, 20 Feb 2020 13:06:24 +0000 X-Inumbo-ID: cba945ba-53e1-11ea-ade5-bc764e2007e4 Received: from us-smtp-1.mimecast.com (unknown [205.139.110.120]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id cba945ba-53e1-11ea-ade5-bc764e2007e4; Thu, 20 Feb 2020 13:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203983; 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=EvIA11c99fe9jZjyk6Bhj+dUz8AZyW6zBDm4tJjkdl0=; b=M6pP8130TCNN20jOqy/yn8zC+zWl35M2q5d8128XA/WZCZNUGa7y2tEeiPi3qwlcK6sc5I MZbuAGtONIxUUxJUumaXJU1cFw+0BwNRS6WwRFl2Uhb10z4h8V8D3kK6d++/Y4/OWRgq8L mu6uFapgRXE0op2MDiyuI5a8b6mCxhk= 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-180-wGoi-NvVOyaTGx9Og7Am4w-1; Thu, 20 Feb 2020 08:06:21 -0500 Received: by mail-wr1-f71.google.com with SMTP id z15so1725308wrw.0 for ; Thu, 20 Feb 2020 05:06:21 -0800 (PST) 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=pVKWVWwp9TVJU5qM7Beut+kG2DV5MFLYTF1Kx3cmH3A=; b=qw9yk/gU0WhQ8MwxyqFLupkFD2e3HbXbr8IBKdUrn4YXmc6jH8QGoIDm0RfcJXWrSh 173hHkqgpTd3zUs5mjNbtZDLCKKtrREzspM4AiDD9ExH1ud4aTTybT4ndcetVXk1zXFq Kakrs92UjlNnaf3moR5Yth4CjspfP0YFScfBIIucbCW1Q67+jndu6RehKGV6eJ8xUyzP 4fOo0SYNyfeppU2wbEBbCoemWhMhgM4AaUSNapHRDvC6eqqWlQWHgjwMfbh1kGtfYGUq ybPRqF92n4MiCauqP6uuj3fHSswhW07nL1gg7LH9oG0Xcx4eFcc4YSE6Fc3/zlOgWpGR 6HSQ== X-Gm-Message-State: APjAAAUIGoDqVcEZxZyvRQvx/XhIrqhqo5tUK3bxsVQXacntnNOIxltE ev0+gOn+pqybQLbezWOUq8Rw4aZfumNWDTitcxae395AT3SV+4B7I/rdUu7W9Pk91tUBHz0q/2M VRH/QNGNlS+c5M2xMJPiVw8n4alw= X-Received: by 2002:a5d:4687:: with SMTP id u7mr40881706wrq.176.1582203980202; Thu, 20 Feb 2020 05:06:20 -0800 (PST) X-Google-Smtp-Source: APXvYqwfQdFudKu/IvbI9dQMK95qUdVs2MjCpL2sBTVu5yezv4G1pdvxpKJvTb+aMe+m36JC5h7NRg== X-Received: by 2002:a5d:4687:: with SMTP id u7mr40881691wrq.176.1582203979939; Thu, 20 Feb 2020 05:06:19 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id b67sm4594690wmc.38.2020.02.20.05.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 20 Feb 2020 14:05:35 +0100 Message-Id: <20200220130548.29974-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220130548.29974-1-philmd@redhat.com> References: <20200220130548.29974-1-philmd@redhat.com> MIME-Version: 1.0 X-MC-Unique: wGoi-NvVOyaTGx9Og7Am4w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [Xen-devel] [PATCH v3 07/20] hw/net: Avoid casting non-const pointer, use address_space_write() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Dmitry Fleytman , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Matthew Rosato , qemu-block@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Stefan Weil , Alistair Francis , Richard Henderson , Paul Durrant , Eric Auger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" VGhlIE5ldFJlY2VpdmUgcHJvdG90eXBlIGdldHMgYSBjb25zdCBidWZmZXI6CgogIHR5cGVkZWYg c3NpemVfdCAoTmV0UmVjZWl2ZSkoTmV0Q2xpZW50U3RhdGUgKiwgY29uc3QgdWludDhfdCAqLCBz aXplX3QpOwoKV2UgYWxyZWFkeSBoYXZlIHRoZSBhZGRyZXNzX3NwYWNlX3dyaXRlKCkgbWV0aG9k IHRvIHdyaXRlIGEgY29uc3QKYnVmZmVyIHRvIGFuIGFkZHJlc3Mgc3BhY2UuIFVzZSBpdCB0byBh dm9pZDoKCiAgaHcvbmV0L2k4MjU5Ni5jOiBJbiBmdW5jdGlvbiDigJhpODI1OTZfcmVjZWl2ZeKA mToKICBody9uZXQvaTgyNTk2LmM6NjQ0OjU0OiBlcnJvcjogcGFzc2luZyBhcmd1bWVudCA0IG9m IOKAmGFkZHJlc3Nfc3BhY2VfcnfigJkgZGlzY2FyZHMg4oCYY29uc3TigJkgcXVhbGlmaWVyIGZy b20gcG9pbnRlciB0YXJnZXQgdHlwZSBbLVdlcnJvcj1kaXNjYXJkZWQtcXVhbGlmaWVyc10KClRo aXMgY29tbWl0IHdhcyBwcm9kdWNlZCB3aXRoIHRoZSBpbmNsdWRlZCBDb2NjaW5lbGxlIHNjcmlw dApzY3JpcHRzL2NvY2NpbmVsbGUvZXhlY19yd19jb25zdC4KClNpZ25lZC1vZmYtYnk6IFBoaWxp cHBlIE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0tCiBzY3JpcHRzL2NvY2Np bmVsbGUvZXhlY19yd19jb25zdC5jb2NjaSB8IDE0ICsrKysrKysrKysrKysrCiBody9uZXQvZHA4 MzkzeC5jICAgICAgICAgICAgICAgICAgICAgICB8ICAzICstLQogaHcvbmV0L2k4MjU5Ni5jICAg ICAgICAgICAgICAgICAgICAgICAgfCAgNCArKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDE3IGluc2Vy dGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc2NyaXB0cy9jb2NjaW5lbGxl L2V4ZWNfcndfY29uc3QuY29jY2kgYi9zY3JpcHRzL2NvY2NpbmVsbGUvZXhlY19yd19jb25zdC5j b2NjaQppbmRleCBhMDA1NGYwMDlkLi40ZTQ1OWQ5MTViIDEwMDY0NAotLS0gYS9zY3JpcHRzL2Nv Y2NpbmVsbGUvZXhlY19yd19jb25zdC5jb2NjaQorKysgYi9zY3JpcHRzL2NvY2NpbmVsbGUvZXhl Y19yd19jb25zdC5jb2NjaQpAQCAtMSw2ICsxLDIwIEBACiAvLyBVc2FnZToKIC8vICBzcGF0Y2gg LS1zcC1maWxlIHNjcmlwdHMvY29jY2luZWxsZS9leGVjX3J3X2NvbnN0LmNvY2NpIC0tZGlyIC4g LS1pbi1wbGFjZQogCisvLyBVc2UgYWRkcmVzc19zcGFjZV93cml0ZSBpbnN0ZWFkIG9mIGNhc3Rp bmcgdG8gbm9uLWNvbnN0CitAQAordHlwZSBUOworY29uc3QgVCAqVjsKK2V4cHJlc3Npb24gRTEs IEUyLCBFMywgRTQ7CitAQAorKAorLSBhZGRyZXNzX3NwYWNlX3J3KEUxLCBFMiwgRTMsIChUICop ViwgRTQsIDEpCisrIGFkZHJlc3Nfc3BhY2Vfd3JpdGUoRTEsIEUyLCBFMywgViwgRTQpCit8Cist IGFkZHJlc3Nfc3BhY2VfcncoRTEsIEUyLCBFMywgKHZvaWQgKilWLCBFNCwgMSkKKysgYWRkcmVz c19zcGFjZV93cml0ZShFMSwgRTIsIEUzLCBWLCBFNCkKKykKKwogLy8gUmVtb3ZlIHVzZWxlc3Mg Y2FzdAogQEAKIGV4cHJlc3Npb24gRTEsIEUyLCBFMywgRTQ7CmRpZmYgLS1naXQgYS9ody9uZXQv ZHA4MzkzeC5jIGIvaHcvbmV0L2RwODM5M3guYwppbmRleCBhMTM0ZDQzMWFlLi41ODBhZTQ0Mzdl IDEwMDY0NAotLS0gYS9ody9uZXQvZHA4MzkzeC5jCisrKyBiL2h3L25ldC9kcDgzOTN4LmMKQEAg LTc4Nyw4ICs3ODcsNyBAQCBzdGF0aWMgc3NpemVfdCBkcDgzOTN4X3JlY2VpdmUoTmV0Q2xpZW50 U3RhdGUgKm5jLCBjb25zdCB1aW50OF90ICogYnVmLAogICAgIC8qIFB1dCBwYWNrZXQgaW50byBS QkEgKi8KICAgICBEUFJJTlRGKCJSZWNlaXZlIHBhY2tldCBhdCAlMDh4XG4iLCBkcDgzOTN4X2Ny YmEocykpOwogICAgIGFkZHJlc3MgPSBkcDgzOTN4X2NyYmEocyk7Ci0gICAgYWRkcmVzc19zcGFj ZV9ydygmcy0+YXMsIGFkZHJlc3MsCi0gICAgICAgIE1FTVRYQVRUUlNfVU5TUEVDSUZJRUQsICh1 aW50OF90ICopYnVmLCByeF9sZW4sIDEpOworICAgIGFkZHJlc3Nfc3BhY2Vfd3JpdGUoJnMtPmFz LCBhZGRyZXNzLCBNRU1UWEFUVFJTX1VOU1BFQ0lGSUVELCBidWYsIHJ4X2xlbik7CiAgICAgYWRk cmVzcyArPSByeF9sZW47CiAgICAgYWRkcmVzc19zcGFjZV9ydygmcy0+YXMsIGFkZHJlc3MsCiAg ICAgICAgIE1FTVRYQVRUUlNfVU5TUEVDSUZJRUQsICh1aW50OF90ICopJmNoZWNrc3VtLCA0LCAx KTsKZGlmZiAtLWdpdCBhL2h3L25ldC9pODI1OTYuYyBiL2h3L25ldC9pODI1OTYuYwppbmRleCAz YTBlMWVjNGMwLi5hMjkyOTg0ZTA2IDEwMDY0NAotLS0gYS9ody9uZXQvaTgyNTk2LmMKKysrIGIv aHcvbmV0L2k4MjU5Ni5jCkBAIC02NDAsOCArNjQwLDggQEAgc3NpemVfdCBpODI1OTZfcmVjZWl2 ZShOZXRDbGllbnRTdGF0ZSAqbmMsIGNvbnN0IHVpbnQ4X3QgKmJ1Ziwgc2l6ZV90IHN6KQogICAg ICAgICAgICAgfQogICAgICAgICAgICAgcmJhID0gZ2V0X3VpbnQzMihyYmQgKyA4KTsKICAgICAg ICAgICAgIC8qIHByaW50ZigicmJhIGlzIDB4JXhcbiIsIHJiYSk7ICovCi0gICAgICAgICAgICBh ZGRyZXNzX3NwYWNlX3J3KCZhZGRyZXNzX3NwYWNlX21lbW9yeSwgcmJhLAotICAgICAgICAgICAg ICAgIE1FTVRYQVRUUlNfVU5TUEVDSUZJRUQsICh2b2lkICopYnVmLCBudW0sIDEpOworICAgICAg ICAgICAgYWRkcmVzc19zcGFjZV93cml0ZSgmYWRkcmVzc19zcGFjZV9tZW1vcnksIHJiYSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTUVNVFhBVFRSU19VTlNQRUNJRklFRCwgYnVm LCBudW0pOwogICAgICAgICAgICAgcmJhICs9IG51bTsKICAgICAgICAgICAgIGJ1ZiArPSBudW07 CiAgICAgICAgICAgICBsZW4gLT0gbnVtOwotLSAKMi4yMS4xCgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4t ZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9t YWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D1D3C11D04 for ; Thu, 20 Feb 2020 13:14:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD5B8206ED for ; Thu, 20 Feb 2020 13:14:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="M6pP8130" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD5B8206ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lew-0002vw-VL for qemu-devel@archiver.kernel.org; Thu, 20 Feb 2020 08:14:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55875) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4lX7-0004sM-Er for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4lX6-00053A-5E for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:25 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41871 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4lX6-00052c-0G for qemu-devel@nongnu.org; Thu, 20 Feb 2020 08:06:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582203983; 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=EvIA11c99fe9jZjyk6Bhj+dUz8AZyW6zBDm4tJjkdl0=; b=M6pP8130TCNN20jOqy/yn8zC+zWl35M2q5d8128XA/WZCZNUGa7y2tEeiPi3qwlcK6sc5I MZbuAGtONIxUUxJUumaXJU1cFw+0BwNRS6WwRFl2Uhb10z4h8V8D3kK6d++/Y4/OWRgq8L mu6uFapgRXE0op2MDiyuI5a8b6mCxhk= 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-96-_IsJbITLORy3SMuZ_tY9Vg-1; Thu, 20 Feb 2020 08:06:21 -0500 X-MC-Unique: _IsJbITLORy3SMuZ_tY9Vg-1 Received: by mail-wm1-f69.google.com with SMTP id y7so578873wmd.4 for ; Thu, 20 Feb 2020 05:06:21 -0800 (PST) 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=pVKWVWwp9TVJU5qM7Beut+kG2DV5MFLYTF1Kx3cmH3A=; b=BBE8bw9yxRb1pHTbcelyXHYX7Vt5M72h3Jj+5fdr+hUE+NnqTL6eXh0m9lIt/7Fj8l vwUmVzD/3hfgrsi30kudUKOiKvG21eZSYgPkXRwsI/C8B0YsBPqve6z/jrt2PQpljLhK teRy5gWveedTcpuD9kFVH73TD2yFyF9Mq8yZ5TMHl+nA+Kq9qRx58Go0w+RTg3WCaNeS 65hTxN+FJTbA7Y7/1dZggoWC7Sk89xPeyWXUth8uiFIUgeaLWlC3fuocJGxl0laLrdgk x8MSSDboP5w9AZyIpgjjflsUkFl3z7y8Sw47W4BX+tHDFRoBgK/lPfmI3bpi3J5kjibH 3C4Q== X-Gm-Message-State: APjAAAUiRMdRflJrMdXJMVJ7OtPkHEzZGJL3AyUcwoW+LgMhY4avEOh/ wPrpFknxCgGgsgAfM2xD3/LwUzLOELwrUZeRqGx4tSFU3H3jaKTXCelYdoJ1X1zFjD6Ca3hQ6R3 rXFsxnzz/fBXIG/k= X-Received: by 2002:a5d:4687:: with SMTP id u7mr40881742wrq.176.1582203980253; Thu, 20 Feb 2020 05:06:20 -0800 (PST) X-Google-Smtp-Source: APXvYqwfQdFudKu/IvbI9dQMK95qUdVs2MjCpL2sBTVu5yezv4G1pdvxpKJvTb+aMe+m36JC5h7NRg== X-Received: by 2002:a5d:4687:: with SMTP id u7mr40881691wrq.176.1582203979939; Thu, 20 Feb 2020 05:06:19 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id b67sm4594690wmc.38.2020.02.20.05.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 05:06:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 07/20] hw/net: Avoid casting non-const pointer, use address_space_write() Date: Thu, 20 Feb 2020 14:05:35 +0100 Message-Id: <20200220130548.29974-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200220130548.29974-1-philmd@redhat.com> References: <20200220130548.29974-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Fam Zheng , Dmitry Fleytman , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Matthew Rosato , qemu-block@nongnu.org, David Hildenbrand , Halil Pasic , Christian Borntraeger , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Stefan Weil , Alistair Francis , Richard Henderson , Paul Durrant , Eric Auger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , David Gibson , Igor Mitsyanko , Cornelia Huck , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The NetReceive prototype gets a const buffer: typedef ssize_t (NetReceive)(NetClientState *, const uint8_t *, size_t); We already have the address_space_write() method to write a const buffer to an address space. Use it to avoid: hw/net/i82596.c: In function =E2=80=98i82596_receive=E2=80=99: hw/net/i82596.c:644:54: error: passing argument 4 of =E2=80=98address_spa= ce_rw=E2=80=99 discards =E2=80=98const=E2=80=99 qualifier from pointer targ= et type [-Werror=3Ddiscarded-qualifiers] This commit was produced with the included Coccinelle script scripts/coccinelle/exec_rw_const. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- scripts/coccinelle/exec_rw_const.cocci | 14 ++++++++++++++ hw/net/dp8393x.c | 3 +-- hw/net/i82596.c | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/ex= ec_rw_const.cocci index a0054f009d..4e459d915b 100644 --- a/scripts/coccinelle/exec_rw_const.cocci +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -1,6 +1,20 @@ // Usage: // spatch --sp-file scripts/coccinelle/exec_rw_const.cocci --dir . --in-p= lace =20 +// Use address_space_write instead of casting to non-const +@@ +type T; +const T *V; +expression E1, E2, E3, E4; +@@ +( +- address_space_rw(E1, E2, E3, (T *)V, E4, 1) ++ address_space_write(E1, E2, E3, V, E4) +| +- address_space_rw(E1, E2, E3, (void *)V, E4, 1) ++ address_space_write(E1, E2, E3, V, E4) +) + // Remove useless cast @@ expression E1, E2, E3, E4; diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index a134d431ae..580ae4437e 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -787,8 +787,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, /* Put packet into RBA */ DPRINTF("Receive packet at %08x\n", dp8393x_crba(s)); address =3D dp8393x_crba(s); - address_space_rw(&s->as, address, - MEMTXATTRS_UNSPECIFIED, (uint8_t *)buf, rx_len, 1); + address_space_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, buf, rx_l= en); address +=3D rx_len; address_space_rw(&s->as, address, MEMTXATTRS_UNSPECIFIED, (uint8_t *)&checksum, 4, 1); diff --git a/hw/net/i82596.c b/hw/net/i82596.c index 3a0e1ec4c0..a292984e06 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -640,8 +640,8 @@ ssize_t i82596_receive(NetClientState *nc, const uint8_= t *buf, size_t sz) } rba =3D get_uint32(rbd + 8); /* printf("rba is 0x%x\n", rba); */ - address_space_rw(&address_space_memory, rba, - MEMTXATTRS_UNSPECIFIED, (void *)buf, num, 1); + address_space_write(&address_space_memory, rba, + MEMTXATTRS_UNSPECIFIED, buf, num); rba +=3D num; buf +=3D num; len -=3D num; --=20 2.21.1