From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C43CBA04F5 for ; Wed, 11 Dec 2019 22:29:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B9FDD1D9E; Wed, 11 Dec 2019 22:29:21 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id BEEED1D9E for ; Wed, 11 Dec 2019 22:29:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099759; 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=4d/hDJi5LM1O9mH/jymK9HC21GXIJkCO4KvgDNFuvSI=; b=GVrkzxptwpUYOFv1lc82BmyAJlIbVbVDVTMhzovGdet5uZazdv5XPo095gR/+AJnxf8QsT 1078N0NXCCPCd+LdF++gQ9bQZ9dS8B4XUC9cGZ1XheQzLpDhBUguRBYtjaMIcNksj53xFC oC3cICT4UieWPZzQRPZ/SQI+egyP8YA= 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-83-yz6usMSGMduL92ZHef_pzg-1; Wed, 11 Dec 2019 16:29:15 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9910A800EC0; Wed, 11 Dec 2019 21:29:14 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3383E1001920; Wed, 11 Dec 2019 21:29:11 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Wed, 11 Dec 2019 21:26:52 +0000 Message-Id: <20191211212702.27851-60-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: yz6usMSGMduL92ZHef_pzg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/virtio-user: drop attribute unused for memory callback' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/17/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/c269e973f9325690af= 27676edf648341462eb024 Thanks. Kevin. --- >From c269e973f9325690af27676edf648341462eb024 Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Tue, 19 Nov 2019 15:12:24 +0800 Subject: [PATCH] net/virtio-user: drop attribute unused for memory callback [ upstream commit 2286291df1007a1447dd3fc854e12a790a8353ba ] The "addr" param has been used since the event callbacks are enabled for external memory. So the "__rte_unused" should be dropped. Besides, slightly refine the coding style by consistently assuming tabs are 8 characters. Fixes: f32c7c9de961 ("malloc: enable event callbacks for external memory") Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net= /virtio/virtio_user/virtio_user_dev.c index 8e8adf6bb..91536c667 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -307,7 +307,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *de= v) static void virtio_user_mem_event_cb(enum rte_mem_event type __rte_unused, -=09=09=09=09=09=09 const void *addr __rte_unused, -=09=09=09=09=09=09 size_t len __rte_unused, -=09=09=09=09=09=09 void *arg) +=09=09=09 const void *addr, +=09=09=09 size_t len __rte_unused, +=09=09=09 void *arg) { =09struct virtio_user_dev *dev =3D arg; --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:17.403903979 +0000 +++ 0060-net-virtio-user-drop-attribute-unused-for-memory-cal.patch=092019-= 12-11 21:24:12.724650039 +0000 @@ -1 +1 @@ -From 2286291df1007a1447dd3fc854e12a790a8353ba Mon Sep 17 00:00:00 2001 +From c269e973f9325690af27676edf648341462eb024 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2286291df1007a1447dd3fc854e12a790a8353ba ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index a4400e772..ea016e85d 100644 +index 8e8adf6bb..91536c667 100644 @@ -25 +26 @@ -@@ -316,7 +316,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *d= ev) +@@ -307,7 +307,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *d= ev)