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 63617A0093 for ; Tue, 19 May 2020 15:09:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5AC901D6A4; Tue, 19 May 2020 15:09:39 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id CB06E1D6A4 for ; Tue, 19 May 2020 15:09:38 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id m185so3486825wme.3 for ; Tue, 19 May 2020 06:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8X0qLNyJ97c0SlL8pFg+39T2hSkzC6q7Fchcvqng7b8=; b=rBQBXIk9q6FjGZLngA79Q6wIEFpbCmxlfF9NkMzOvaBHW3zUJrq177GHU1VPeb3Qc8 7TLd7EuWhubMLkSRhfvi7h7sP5KNbDCkKLl3YyGHrPIQ+Wn/ppdHLY6BdqFrh/GZgfFU dc1HRMmjrzNgJZ4oadHLEtKMkGmF/p6eI7Uktw4p8qXXJfrTkoT9Oc2pVkbI2tocbbGb vP/tRUjx96PG8QkIvMidM/xqKH1ryWDWHhH86QyetnQ0kayp7E59TSd8B0tUkUYorFBj trURajqWWt57AEs+WWdGbFPxiJzhWGDIfK9A5iBmRYetfX4LFZH8RT42ybnUozxH1B4W in/A== 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=8X0qLNyJ97c0SlL8pFg+39T2hSkzC6q7Fchcvqng7b8=; b=b0GeSG3cgI1N1dMobJcGrpfoc+8pKooMixm5HTKw+BYXz+B6VAcKHiDt8+BZRvdovC DwcDOsO28zKh35UvkkYOLonZaD0ymlosL4N8ungBUwedtcoN8OO1AA0jynfzfS+63RS2 dbPbl4psGK9f/t8xd1FfBU3qGBrhIdx04QokTu3IaJDtQvH4GtiZ06N1Z+Hd0Isf9ER/ AuOwfmlGkElCA4mJYeHEWEz9Jcljo0qpFP/nYkrZm2rRytqFWylzB/gLE3Ym+iEkoqH8 KUj3NJbt+j8FCjnfIMor883LLfboY5daWJtMWm4/cC07J5uoOFHN6t2ULpMFnOUZTSfp ERxA== X-Gm-Message-State: AOAM5313dcOlelDsdf9gsZX+m9JhRVkeqo3/lGJfdeY7V6jleD7VtIFq W804yh3+Jn5Xs3INM/gzXs4= X-Google-Smtp-Source: ABdhPJy6Wg9Ln8ZpeawEFwaedTiiIY1p+9keVFUmsZBC6/oZgLiwf77issAAEVByOZprpWJ4ebynyQ== X-Received: by 2002:a1c:31d6:: with SMTP id x205mr5341129wmx.105.1589893777675; Tue, 19 May 2020 06:09:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b7sm3770824wmj.29.2020.05.19.06.09.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:09:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaolong Ye Cc: Maxime Coquelin , dpdk stable Date: Tue, 19 May 2020 14:03:26 +0100 Message-Id: <20200519130549.112823-71-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio: fix outdated comment' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 871773f3ac2889e365f7483311b3814b9c54ffad Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Sat, 7 Mar 2020 21:22:34 +0800 Subject: [PATCH] net/virtio: fix outdated comment [ upstream commit f6ac14f13b040fb44db6ed4ab392865fb6648201 ] Fix comment that is no more correct as the code evolved. Fixes: 9470427c88e1 ("net/virtio: do not store PCI device pointer at shared memory") Signed-off-by: Xiaolong Ye Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index f9d0ea70db..35203940a7 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -466,7 +466,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx) } if (!vtpci_packed_queue(hw) && !rte_is_power_of_2(vq_size)) { - PMD_INIT_LOG(ERR, "split virtqueue size is not powerof 2"); + PMD_INIT_LOG(ERR, "split virtqueue size is not power of 2"); return -EINVAL; } @@ -588,8 +588,8 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx) hw->cvq = cvq; } - /* For virtio_user case (that is when hw->dev is NULL), we use - * virtual address. And we need properly set _offset_, please see + /* For virtio_user case (that is when hw->virtio_user_dev is not NULL), + * we use virtual address. And we need properly set _offset_, please see * VIRTIO_MBUF_DATA_DMA_ADDR in virtqueue.h for more information. */ if (!hw->virtio_user_dev) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:47.371982751 +0100 +++ 0071-net-virtio-fix-outdated-comment.patch 2020-05-19 14:04:44.232648662 +0100 @@ -1,12 +1,13 @@ -From f6ac14f13b040fb44db6ed4ab392865fb6648201 Mon Sep 17 00:00:00 2001 +From 871773f3ac2889e365f7483311b3814b9c54ffad Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Sat, 7 Mar 2020 21:22:34 +0800 Subject: [PATCH] net/virtio: fix outdated comment +[ upstream commit f6ac14f13b040fb44db6ed4ab392865fb6648201 ] + Fix comment that is no more correct as the code evolved. Fixes: 9470427c88e1 ("net/virtio: do not store PCI device pointer at shared memory") -Cc: stable@dpdk.org Signed-off-by: Xiaolong Ye Reviewed-by: Maxime Coquelin