From patchwork Mon Sep 28 09:15:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11803213 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 115CD112E for ; Mon, 28 Sep 2020 09:18:05 +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 8354221D7F for ; Mon, 28 Sep 2020 09:18:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8354221D7F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMpIJ-0005Xu-BO for patchwork-qemu-devel@patchwork.kernel.org; Mon, 28 Sep 2020 05:18:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGY-0003om-Ra; Mon, 28 Sep 2020 05:16:14 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:34017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGW-0002WX-Ke; Mon, 28 Sep 2020 05:16:14 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MV2Sk-1jy7Np0ROg-00S6t8; Mon, 28 Sep 2020 11:16:07 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/8] vhost-vdpa: fix indentation in vdpa_ops Date: Mon, 28 Sep 2020 11:15:55 +0200 Message-Id: <20200928091602.383870-2-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928091602.383870-1-laurent@vivier.eu> References: <20200928091602.383870-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:77b7UHhIOGlSHExCgtdoqDOYMOVylEBGVMeCX20yI9eIcnBjVpn nxAlv5HMRSFdLkffrBfk50EwFop2c8xkpsfJzq7UjfcrY39LcMVyAL6qzNJU4LjJSaH+oTv Aw2hMPf8y19ovABjDeNwFsH8D9dHOUrqmGxZHzCuNRlpJisLVLwqCXe4WIECIL1Dzd24m3V Q5ZM5xo3I4hepHhvqhJrQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:BZqoKIMwtQg=:Bq4UVQ5Cjj7yu8IqbOwdHy i2Jbj4zQGshLBCZpEq9JqW+4dCCOy1w8cQpv4z8K8vVyjYQT52hxUHycnKARI+qCpwM8WULcN GEPL/Noq7jOlvHRPR2uhUCVQf5dKWfWq2hmRl0qz1EyR9ik62bR/L/V+gCetAPFEZPmg3q8Ac LENZfloTGmF0vFb8YHUa+rTpfU7DoduJ2pc9GXE6emzOYkvDT5qjOf0Swrs91CTyZ2VsjaFC7 DVDUJXSiPpkZfWLIu0JgVvgg8e2Fo/4LxsdN2xyal3goqGDI7xmdw+1HMNSuWjEprwdmZBqXx 5UT+RMeJvQ8CQIMFgaxApCO/XL1OlDwup5KK/EpTwIJTXotAsGMgzxokHI1XcBMNZo4JRQxBk MVABTXzEZB4Fa4tEGw9QElbIi8kCl7mJt89clCY6iATUhXLsMS1MStCP59ZX1EVOczHkDRpON +7CuKsjItwMVCtRgm60bmixtDLZntGJfFF/6hncXhPcZZozo6WU3E2MDMuMq/7Lr2vH/S0y6q b9orJDf/30ggwQOUmJUBT/o/gOAL4/81rR+fEcH6PnYpldC8cLbIPY2GeiWYH1R+w2e39ld67 E3BXqe+7aCh77sLC6bGCZCVZinhNnTdBbhkEdqVBAi9XjriMUprkON1KuBZu3Lvg3UHlb3gKe f/N+IWq8bsEXa37rbwXfbVhKg5ZO+H4IWOt1W+5rkZU+UVgXS7e4lh17UXF6xWGz5+Sjh3ByG HMHeEsiVAYYAQ1rRL5flhOc9erJ12tDaP68gbPPf59PLD8Pq6kSgTtEEzfDRvozhOTT/G2BVU qPO39Z5YY88CvYiCtPNW3k084sY33HD0/XNaw9U8FieZAGNF8Muo0TMfhDXt6g10s2gI2Dj Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 05:16:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.462, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: qemu-trivial@nongnu.org, Li Qiang , Michael Tokarev , Laurent Vivier , Stefano Garzarella Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Stefano Garzarella This patch fixes wrong indentation of some vdpa_ops fields introduced with the initial commit 108a64818e ("vhost-vdpa: introduce vhost-vdpa backend") Signed-off-by: Stefano Garzarella Reviewed-by: Li Qiang Reviewed-by: Laurent Vivier Message-Id: <20200916152634.56917-1-sgarzare@redhat.com> Signed-off-by: Laurent Vivier --- hw/virtio/vhost-vdpa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 4580f3efd8a2..e123837a55de 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -469,6 +469,6 @@ const VhostOps vdpa_ops = { .vhost_send_device_iotlb_msg = NULL, .vhost_dev_start = vhost_vdpa_dev_start, .vhost_get_device_id = vhost_vdpa_get_device_id, - .vhost_vq_get_addr = vhost_vdpa_vq_get_addr, - .vhost_force_iommu = vhost_vdpa_force_iommu, + .vhost_vq_get_addr = vhost_vdpa_vq_get_addr, + .vhost_force_iommu = vhost_vdpa_force_iommu, }; From patchwork Mon Sep 28 09:15:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11803217 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4356F112E for ; Mon, 28 Sep 2020 09:18:26 +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 EEBB521D7F for ; Mon, 28 Sep 2020 09:18:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EEBB521D7F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:32968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMpIe-0005xh-RY for patchwork-qemu-devel@patchwork.kernel.org; Mon, 28 Sep 2020 05:18:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGc-0003pl-QG; Mon, 28 Sep 2020 05:16:19 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:51481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGX-0002Wo-6u; Mon, 28 Sep 2020 05:16:16 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MzkK9-1kZhFG3B7B-00vccX; Mon, 28 Sep 2020 11:16:07 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/8] meson: fix static flag summary Date: Mon, 28 Sep 2020 11:15:56 +0200 Message-Id: <20200928091602.383870-3-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928091602.383870-1-laurent@vivier.eu> References: <20200928091602.383870-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:B5fsLNp/y7OAU7H51raGoR5B1yImrNjHVJwdZRlVeQH02aeAEpR sWSvQyWDMNIwmHIjmzbVM95JP46uUb8QE1beSuMiv3ZShJ2lQMv6IprxKEA8UbFe3RGCNmx tCHpK9RSqG3IkjIHOMmlSWxZoUnBB6zURE61vnnWFQo90qPwLA9Wj3dSxcOBqecJYc+kQPM IS4QqsnobpDbwAHQh2vuQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:sZjCdlrUsoQ=:hkRsQD3uVSt6GVocDneRXL 5IxGDYCdJ2yE6lDAcSBfxpyTdsC4NKFIqBSFNF60BQHg/z+JqBvLSVQ/8g5sUFNXVOmLIc49l aHp4HgR6WI0pWpTaQk6YtkFg/Bdps23wLKv2jwMbLfKBWiDkaLWoPtH0hNdiEp4reNnzBIU0B XfQnwWHcewCdIP5Q8A7Fq+wIS9SdUVNwZX9J+eN71DdS3LMjdyOzaV5m582TqbGWhOdArQ/5s Yj3ShJPmZwMPVn+wlMOpDKDJcOj2etC8uANsSTNthg5TaN4l3r1ptcuZAETsnElKLlKdZ+CsX srjHAhe1wsEkAOCa1jzp1RqNKKdhZ/+mFkyp7RlZUaw0EhI90DcZZsToME1UQZM4JKyi73cP2 2PKaLwHpZ0lqUUph/tsBWfwA7xTSU/pROn1y/WodqBWO8ze6EhDW5ijUfUuVW6f9JV6vBJi3X xTQW8c0fQVYklKcSnoDlkXmdUPMrWQSzqFCQcP5yYR/HsSQq76Z1G0ZIXHszBcCGMQPYNSEF6 y6JLk73TyjNDKv2Hmq7qHkTeuzOOA2eSM5iwMnNNS7PsFZCiLVCrYZuO5bf8IX9RV51dgo0YL Q0o5LuUJnhsLr1xh+VNfkdyxR5SZtWqU4N2DUcwDg6Xfg0AAMAE3DdGtzDHiC9Ljk7YznrhOl ZdjqGbZS43f4p8hsdCbs/u+r10zmhkjM1DexK8/5frCIyIggPFxSFrxM+2QjjftFy5kITS+N2 F4h3PdPNXpE75qaFNInPrHUPRI2vhbqpJzNdliqOPyCWOYhxPg0qD24XWWp86uF8pbayLnw6f 107HTS90vB/uBoFgouyVbfYGv5VX/wF90Hr66A8rI9uNO8m1TCSBnaZrdWuWdMeZ2XMwZWa Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 05:16:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.462, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: qemu-trivial@nongnu.org, Laurent Vivier , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier 'static build:' must display value of CONFIG_STATIC rather than value of CONFIG_TOOLS. Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200917140700.673171-1-lvivier@redhat.com> Signed-off-by: Laurent Vivier --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f4d1ab109680..b26c8bffc6fe 100644 --- a/meson.build +++ b/meson.build @@ -1368,7 +1368,7 @@ summary_info += {'gprof enabled': config_host.has_key('CONFIG_GPROF')} summary_info += {'sparse enabled': meson.get_compiler('c').cmd_array().contains('cgcc')} summary_info += {'strip binaries': get_option('strip')} summary_info += {'profiler': config_host.has_key('CONFIG_PROFILER')} -summary_info += {'static build': config_host.has_key('CONFIG_TOOLS')} +summary_info += {'static build': config_host.has_key('CONFIG_STATIC')} if targetos == 'darwin' summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')} endif From patchwork Mon Sep 28 09:15:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11803227 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3D746CA for ; Mon, 28 Sep 2020 09:23:20 +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 39FF321D95 for ; Mon, 28 Sep 2020 09:23:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39FF321D95 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMpNO-0003U2-UY for patchwork-qemu-devel@patchwork.kernel.org; Mon, 28 Sep 2020 05:23:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGg-0003rZ-Fx; Mon, 28 Sep 2020 05:16:24 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:48021) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGc-0002YB-RE; Mon, 28 Sep 2020 05:16:22 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M2Plu-1kQfoc3G7q-003wD4; Mon, 28 Sep 2020 11:16:08 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/8] virtio: vdpa: omit check return of g_malloc Date: Mon, 28 Sep 2020 11:15:57 +0200 Message-Id: <20200928091602.383870-4-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928091602.383870-1-laurent@vivier.eu> References: <20200928091602.383870-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:prN8HB6UaU6hDQgdKIbe3aQiPbzmL42/lAKCeIa+G9BG00vDvGC N2fTIQz9ux5+8biCr2NGF6pWEL89qCf12kcAwvZiKXIZQVrm8XRPLxN2My5iAgyxtFr9iFC vJKtw6jBV6N2VgCMyDHsqj9ktMjMiKcNiYV4IHrpNUzOY6QHM5Q9GvCfQt639qBk82NJExH /ymZxiYIybLDEJhKS8wuQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:LEvot/+3Nb8=:/M7mXZzHudAZgOi9PEvtPN 50zMSNrglY9ZXofj8vZFmYHp+Eo932LtH6d0dsYcmqd7ftR6PKlgxDxLqup2g4bjxGmPpXlsm LhC7ktvm7sFDBYE2hiiCM6zes95WU3ThgE43i3SJHzAi/XWgev9xzsQl5GPaFxsXoT8yL0+ke 26adkRAxnqAxTJ66MEvAJ18ulE09Min8FZ2v17cygKnbfnNTWG17yp1PvXXqzDF97q4rOKEHx 9nwb8YE95fqr7PEbzovV1YdHFpkYYoC0E+x+eviFN14233eI0CrQk7UZNv8tNlHK6kCYlinI1 U/CxQOUEa9yEhV5aYQjm7jAv4WygKiDxU3nC9CTTHFLgwDKFhMOVXDyOPmC29U9pkdSkZjmaz EEdGjNeSyyP3KuH2EsBlRYircasCQ8G8/CUPBGfwPa7EHUuXpmSBVRrEp5hhb3HxANaOABj4D zEGojHhqqEr5y+m235vzroOw3gpzGaTe5VuB4+O7bfNT5be7yEjCCtbzMRF7jVVvIa7P6WsZK irflZxLHgcSvpwQreDMhy0w5q2t5WqmBj5i5XfMHoh7XOzSRhD7B24DFeihY3pDeXVS8JYOBs qw6/8LysoXlYZmrFbg5ZI0H1rAp/dO6uBz5kp4Kh6ZokxHvjc6lDMC0g2aLg8PaeUakkKgeFA 5DZ6EkEphcz9+JD1ldwdDFHDc+RFHKCuQwfeiVdQPAltAQ6lFoPJTmbg6HQLHZ8glYwS/MxcP LD+aH33l+1na+1T4zZzMdzM3awiIKAPTonbYhASysmklcxLhxCCLuG857bhJjGShEYAypKkUH msKFMAGbwdmMCq790AZKK0Bt3gRv1CKm3bgPcl5eo9zplvrhe7bTIp9I2ySyMhevxiFh2iM Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 05:16:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.462, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , qemu-trivial@nongnu.org, Michael Tokarev , Li Qiang , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang If g_malloc fails, the application will be terminated. No need to check the return value of g_malloc. Signed-off-by: Li Qiang Reviewed-by: Laurent Vivier Reviewed-by: Alex Bennée Message-Id: <20200819144309.67579-1-liq3ea@163.com> Signed-off-by: Laurent Vivier --- hw/virtio/vhost-vdpa.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index e123837a55de..97f4b2e353ab 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -320,10 +320,8 @@ static int vhost_vdpa_set_config(struct vhost_dev *dev, const uint8_t *data, struct vhost_vdpa_config *config; int ret; unsigned long config_size = offsetof(struct vhost_vdpa_config, buf); + config = g_malloc(size + config_size); - if (config == NULL) { - return -1; - } config->off = offset; config->len = size; memcpy(config->buf, data, size); @@ -340,9 +338,6 @@ static int vhost_vdpa_get_config(struct vhost_dev *dev, uint8_t *config, int ret; v_config = g_malloc(config_len + config_size); - if (v_config == NULL) { - return -1; - } v_config->len = config_len; v_config->off = 0; ret = vhost_vdpa_call(dev, VHOST_VDPA_GET_CONFIG, v_config); From patchwork Mon Sep 28 09:15:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11803223 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B06DE112E for ; Mon, 28 Sep 2020 09:20:58 +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 73D7A206F4 for ; Mon, 28 Sep 2020 09:20:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 73D7A206F4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMpL7-00017W-Ij for patchwork-qemu-devel@patchwork.kernel.org; Mon, 28 Sep 2020 05:20:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGe-0003r2-Ni; Mon, 28 Sep 2020 05:16:22 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:41627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGZ-0002XI-Pj; Mon, 28 Sep 2020 05:16:20 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MHVWT-1k9Kjw3AXZ-00Dahp; Mon, 28 Sep 2020 11:16:09 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/8] Add *.pyc back to the .gitignore file Date: Mon, 28 Sep 2020 11:15:58 +0200 Message-Id: <20200928091602.383870-5-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928091602.383870-1-laurent@vivier.eu> References: <20200928091602.383870-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ZJYK1rFyvYfcc1RY9shQRugdD/I2fgxXiA5GSPXHDWik7DtpDjJ o4naIrgY093fD8n/YDr8+FdVkdYd0sLGeFzzXvGKhtj8C1Tf6Jhwl6W1zxVTI6H6oAYCXF7 YwSrdhBC8Ge3dMaL7US6KJhbtFyimqf0VC7KConAmbVzvdt9csL34qrEeIJyiUHDmgOzFoO M4zjSD7MUsQqAcN4OH30g== X-UI-Out-Filterresults: notjunk:1;V03:K0:sHi8vO6LAyw=:b5I++VPdeCqL1djMULZwhH zeNdBpBsGL4XtKnjqnvvR3c1huKZ2Ljlkoj13TIf/MIGziBKfRdI1dYSKGNWSa07NmXeP2sSx YeyBZl/4JBOBHCkIt5r4ocSrflqmrIdbqeJ3vtwmlpWqacTs/9zJysEmVCE9gMBFYQfyd42v9 mY0h0M1yJt9cor8EyMDqYyXpd+nPQ3eHTBI3fR0Q98opCFSCaIlwZQFh51swmqvhye3ugob9Y AoxqriFaJML8wJ/Hn4ul3paDF7kf9n1P//ZGH0ySYG5NSuuswTGsiZZnPyu7fnv3Z8lyVTUlk HVTa4KAH2BoisufgWchRJlMoceh2jS7g+OXZhwrQ64ysGjBtAPeqJp+EkdLweTZRuJ4bEF4/C KrTPL2VKUDR18QFd/aTAe55ybKaaQ4mewsssFVWNsHqdbWJeVG/7IEd/N70sS7aosLTm8a6ER vrs3Sdx2+/2W57JwKyHT8z4taBgJDfYsX+3mpmUvM0ojryXAR6AQlFcqbU1yWe1DYb5WrRvam yNJAPidMibtU3Td4OAgNIqf2LhM9iZ1SvWHy9vGW/WUNaU3yMRG4XsGkUZEtWmr6So8bR2Wir P6ydG2Oliw0yg3d4oKvHF08xKEPpfSXbIhheuFqABIP60uIJhgu02LTJNz5ykNW59zIM/1wGx m0ZQeFJf5Xy/0/2ojJctHm5YOBi8n6yU5tohWEKUdtXG6HmC7nJTO6Fq0xsRzzT58U/gUocoJ Erszr3nJ7/9BpGOaMRVJ9XmIssTE8kiwbaYC3rv2MA7wcpMqn/kck8Fg0YlNQ6sk2dAYQOuyV YsaWaChNhaWjXA0/lkfRDeMK04q9icFMQXk0rmDR3KnE/0QDF5hX7hlBvRsinJ2wpdZCuYu Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 05:16:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.462, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Thomas Huth , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Python still dumps its bytecode into the source directory, so we should continue to ignore the *.pyc files. Fixes: 0e72b7df4d ("Simplify the .gitignore file") Reported-by: Peter Maydell Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200919101859.28739-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5515f595e67c..b32bca1315e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /GNUmakefile /build/ +*.pyc .sdk .stgit-* .git-submodule-status From patchwork Mon Sep 28 09:15:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11803215 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4A766CA for ; Mon, 28 Sep 2020 09:18:11 +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 786AC21D7F for ; Mon, 28 Sep 2020 09:18:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 786AC21D7F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMpIQ-0005o8-Gd for patchwork-qemu-devel@patchwork.kernel.org; Mon, 28 Sep 2020 05:18:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGg-0003rG-Cd; Mon, 28 Sep 2020 05:16:22 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:44089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGc-0002Xr-Oz; Mon, 28 Sep 2020 05:16:21 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Movrq-1kmW6m2GR4-00qUMU; Mon, 28 Sep 2020 11:16:11 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 5/8] vhost-vdpa: remove useless variable Date: Mon, 28 Sep 2020 11:15:59 +0200 Message-Id: <20200928091602.383870-6-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928091602.383870-1-laurent@vivier.eu> References: <20200928091602.383870-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:wJWrYVUu+QB9tF1t59MC8P8/2ARDgjDwbNMCs86f4jAoT24lCAv pFx6JizTH4bdFpvoY22YpxEXfhsv/2MKtbHjJ52HFsSCY7H/p+a2BnHbSzqvfuF0hPgJLD8 rtLQzNrBEmpKA5DX7ZQ65oKNfSOowUrfnukRwJJ4TXs38mhgznWiAJIOvg68SXTRJ6Wv2BK MY3K9iSYPau5FRdlet2KA== X-UI-Out-Filterresults: notjunk:1;V03:K0:KJJI/RSHP88=:aQ6dnUa2BA68BEthZ2ZHQX 79BmE2Uk6LOdoyKcD5ipvXrGWr72ubwY24YGy0dL5JQVykxcsefn0HFSDKPCd59WWgiVCsXdh pel1WM/ErdG3JED8xkZuIihmcR1T0brnTrTg1DZHyqwDETTiDJQegT/JE+R1GtjIm3GkaYHRv RaJw0KCG+icEg/GQyK2riYZkFwnjjt2uAoWQZu9OozMf7TH08Ab8qkOtgTXLrB5bd59qJVGzN /Xa7SQqNAmOMNKkT8br0BTsgU8SPXtQeeadpyiy6hgwF4n1J0ZrJ0A7pDRZhrJzXs2mv0iL8z cjLiqivYkvxvKlvZJU7bhx2suOzpUCTAyaGksWgB9qNa7T9QFX5ZqWEsiLpWlFyERjJZlsT2J t9D7RSedGCXjK0EFBZUoFflxxVnF26n7czUySjLmXpeRDcG3l9kPGgdi2Gre28fvoaqFbYidK FVF7pjbqBl3IFLxCNR2dL+62E1ewNUQBr06g4aEne4XMavNZdpDScTlh5Kh6c27WMtSt5mF/N gQT46GPQLZLALmn/6MZsfOXgnywlwSKatk10lBh0wVVyP+28mqNm9opmQ6ByDnjZK3bp2Ycu6 8fbE/tJ1Y7vGiyX0QYgU+oogSAkH2myoHpWow7n0VRHtRLzG2SoA5/80IElAxImZlecXdJez/ z0GDcsx4SkBSGmBHnS0K9DEFDg6bbFm8UFOPor6f0KLVsvKvyaCebwVEyoGAFCixQrO5N4cBI ZRfVUl8UdPHWdqSCO4WwO1GIVDxKzOjLXMMYaEp6pK1ROvfcgWi42Q4p/OpWq7JHvMI58NgFy Mhxr8NlsCoesp7HbI6DaZNYOzuYi75+5gUfm7nW61AD7SXsDa21yh+zcGFsMTHdfwKVVmWb Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 05:16:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.462, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , qemu-trivial@nongnu.org, Michael Tokarev , Li Qiang , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier in vhost_vdpa_listener_region_del(), try_unmap is always true and so, vhost_vdpa_dma_unmap() is always called. We can remove the variable Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Li Qiang Message-Id: <20200920152024.860172-1-lvivier@redhat.com> Signed-off-by: Laurent Vivier --- hw/virtio/vhost-vdpa.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 97f4b2e353ab..aedc52c4d791 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -153,7 +153,6 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, hwaddr iova; Int128 llend, llsize; int ret; - bool try_unmap = true; if (vhost_vdpa_listener_skipped_section(section)) { return; @@ -176,11 +175,9 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, llsize = int128_sub(llend, int128_make64(iova)); - if (try_unmap) { - ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); - if (ret) { - error_report("vhost_vdpa dma unmap error!"); - } + ret = vhost_vdpa_dma_unmap(v, iova, int128_get64(llsize)); + if (ret) { + error_report("vhost_vdpa dma unmap error!"); } memory_region_unref(section->mr); From patchwork Mon Sep 28 09:16:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11803219 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 33A89112E for ; Mon, 28 Sep 2020 09:18:30 +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 B437921D7F for ; Mon, 28 Sep 2020 09:18:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B437921D7F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMpIg-0005yk-Pu for patchwork-qemu-devel@patchwork.kernel.org; Mon, 28 Sep 2020 05:18:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGc-0003pp-U9; Mon, 28 Sep 2020 05:16:19 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:47113) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGZ-0002XF-CL; Mon, 28 Sep 2020 05:16:18 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mcpz0-1kwRCL33li-00ZzAk; Mon, 28 Sep 2020 11:16:11 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 6/8] timer: Fix timer_mod_anticipate() documentation Date: Mon, 28 Sep 2020 11:16:00 +0200 Message-Id: <20200928091602.383870-7-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928091602.383870-1-laurent@vivier.eu> References: <20200928091602.383870-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:E9M87k8ilxga7J2Kbq+H6vVR+koCd8hGomfw+KeNjO2JHx2wwEe ygudZXPk3dcCs8FQdw41GFQ8Ir+pn+Br7BZ/i2kMoNqxV7r/GNp9m9wklpgevU6NqDU2WCJ HkjPXRIADnWOVByx2aWzoJ7pezmC0VlCNN+pWgS07RDSjim+10ndEc32gw0+NGKaEU5E48p YZ5Vecso7HUksaI0dEV9w== X-UI-Out-Filterresults: notjunk:1;V03:K0:J0DpAWLij7g=:9mtf+MbMYOo6TtETCJ+pdJ 40C7SkWltLLtfMsd4rzCGt4zT3k84OCmwIAocHD79Qnaa6xg0EkvkoOCb3ffIp7MjduqPJrhU 3T6ar8BHeLHnQ7SF67ljcSsEoHaZpnn8IKwySg4Ko71ris2UL8pbzPVy1wPXDH1KV++RJC6G1 7wCFiyMJdEuk65BJgBW4op8idmqeW4YyGEhbqq6SNgFmMFbFObOynyKCy0P+Ov+Dg/b5hzHXY j10IXvXEFcjAHD4E6WCde8l7Zs/5rhC71mtUs1NvHJVASa5x9u8JITmxGyY4fXfCRlJofS/D/ fNwUAKtsH5J/79uW+0IUBEkYI/JAeq543KsTcCuXX5i5PoJf24/QWdA8bhKno3523EZGPf/wb oNM+XqyE+KUwfnpB60ujzXJ0cRerrWRZIMniKPRb5XQ6EKR4NGkAFApcH3M8oFkwCS2tpn0JR lFIvHTE2JrVjvSLJgkhr2ah77fkTNA6SvYpPHD6lb/FVuxMpAMk/CdmwGEHfTT51PfO+Q4gRr ravZ05angkc+W5OIUcZkpUMyYs1HZMxQHkxUBeXme01ukrJFWR5XMygkBj5+Sfu6WmZgDKVRg EyL8xyxdDVdLkr6EFHrJVdzFUJSTkVd0HPw9rn4potCkVAoq6oh4Py0kZ8J0TmU8B9/ehfiS1 ZWtfItzEs1RfR7t6bcg2qcYW3DNQAbhbeMV/dBBUREcy07fWM2iMksUKkjCMkaM2o0sW2Jq6m n6EA/Biqwp5ThfJqE5ccSoRC5BEIsJUQuGqY9PxOwXL2bnFUHlmBEhnIE9a+8yMYRcx3Zx+5t wJijkt6B+9WjfTpfczv6kR1Gf6uDhv4X//LLoUZG3xjIR1mI9AHafNXMbU3E1ZfmHnlAtBn Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 05:16:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.462, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: qemu-trivial@nongnu.org, Richard Henderson , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé timer_mod_anticipate() will be scaled to the timer unit, which is not always nanosecond. Fix the documentation. Fixes: add40e9777d ("timer: add timer_mod_anticipate*") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200920155042.400737-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- include/qemu/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 6a8b48b5a9d8..1dc880e94e76 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -679,7 +679,7 @@ void timer_mod(QEMUTimer *ts, int64_t expire_timer); /** * timer_mod_anticipate: * @ts: the timer - * @expire_time: the expiry time in nanoseconds + * @expire_time: the expire time in the units associated with the timer * * Modify a timer to expire at @expire_time or the current time, whichever * comes earlier, taking into account the scale associated with the timer. From patchwork Mon Sep 28 09:16:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11803225 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 45F1C139A for ; Mon, 28 Sep 2020 09:20:59 +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 0ADA7206F4 for ; Mon, 28 Sep 2020 09:20:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0ADA7206F4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMpL7-00018G-Po for patchwork-qemu-devel@patchwork.kernel.org; Mon, 28 Sep 2020 05:20:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGi-0003t3-KK; Mon, 28 Sep 2020 05:16:24 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:46023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGZ-0002XL-T6; Mon, 28 Sep 2020 05:16:24 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MxHLs-1kcADc1asy-00xXMi; Mon, 28 Sep 2020 11:16:12 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 7/8] migration/multifd: Remove superfluous semicolons Date: Mon, 28 Sep 2020 11:16:01 +0200 Message-Id: <20200928091602.383870-8-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928091602.383870-1-laurent@vivier.eu> References: <20200928091602.383870-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:TDv8xBk1ThJ7knLw+EZGmeA0WjIMds6uExppLuBUybg5NiLUPul BZ3GoLl8ROIvSO34Dxz15rlVBT2NMUY1kSKD8oFp1FGiuZrI6HXWWSs1KxKG2lVkqhfqkmZ YwYonHlWXMV0P9pneRyETtcnjdRxinPDOGQdXnQv4wnM3lEZulSNBcevOEoAjkjsCIRrUbS vC+6Ysws2MSAxnWIZdYyA== X-UI-Out-Filterresults: notjunk:1;V03:K0:JAWtdgVEnlU=:ZSLNwbrpxEAI6B3TkxQkV5 As1vfzDuYkdAS94JZQehSzuX86k46IBz7KDavzMxlrUFC4EcpXMeQI+0BCwO85QO/DnwyABkr zktP/oJe2dRrCdaNEyJqQ7EM/JCGmh2SfqYquuQ02Hq6oEkqTwn+MNJoJapUkxA+qGybtMVaD Nz5tddzYC9/3oWq/NWcE2YrF90xI+l7uTba3ZcZb4TL1bSh+kED3XEkdGbevVFKDvaR7QwXbU Lt4NG9F7nf3tzkxfUZN61y4Rx7ScYNAQOTWDb3uCnJWLslpRcu406lpOKJhypi2CZAzsGg03L Ncqb/GMxz0scJN7hJmb0suFi5r2h5McvOEx8Rgh1nw6faWASSofBZ1WXpHaKPqXpaCMtGNe6u wocEsyALefKA/Gg9lKzaz2u7ncCD9E0iby3U+exNgropy80wAZvYikObd2zq6h9PgyBfmfTm8 huLTTLWsRwhtjyGDIY8zbl176Ocye30OfI2xOV9nS+LI7Z6wAWpEMfImh2eSR8GLb0X9/7vU4 Ese1CAhu8EX/Kkd9FMb03HeS3AZkMR/E4EQlqmbf2cIC43z4VTqD0ZmV1hvlGxHNAoe3JcR2a lvOXpR2ONvVKZ+BuVQ/YCAXIVqIp/GPQSIxZoexYFfbtr8275DlMBWxwJb78bl/MERghM7me0 6e2WWoOKAzQISjMZIT58C90eJkZgZQu6I64j0La9n5lxNPu1V29QVVso6290UtLbrvR8Oe/x0 R5S54nnL7Q6mo7+cCqnOOOJiEslOvf6hnKPGuEfg563It8fC9IgEdZd7Ela1stNjg1SZKUBIX 1Qyca7SCL4grxa1rz8K2PmrRswKXnKO9SZI7bLKpZR7liHfkNmIvOJednSMhsgxROLqvjxn Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 05:16:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.462, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: qemu-trivial@nongnu.org, Li Qiang , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé checkpatch.pl report superfluous semicolons since commit ee0f3c09e01, but this one was missed: scripts/checkpatch.pl d32ca5ad798~..d32ca5ad798 ERROR: superfluous trailing semicolon #498: FILE: migration/multifd.c:308: + ram_counters.transferred += transferred;; total: 1 errors, 1 warnings, 2073 lines checked Fixes: d32ca5ad798 ("multifd: Split multifd code into its own file") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Li Qiang Message-Id: <20200921040231.437653-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- migration/multifd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/multifd.c b/migration/multifd.c index ac84a61797f3..2de5263c3263 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -447,7 +447,7 @@ static int multifd_send_pages(QEMUFile *f) + p->packet_len; qemu_file_update_transfer(f, transferred); ram_counters.multifd_bytes += transferred; - ram_counters.transferred += transferred;; + ram_counters.transferred += transferred; qemu_mutex_unlock(&p->mutex); qemu_sem_post(&p->sem); From patchwork Mon Sep 28 09:16:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11803229 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 48620112E for ; Mon, 28 Sep 2020 09:23:21 +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 0AEB521D95 for ; Mon, 28 Sep 2020 09:23:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0AEB521D95 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMpNQ-0003WQ-24 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 28 Sep 2020 05:23:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGi-0003se-F9; Mon, 28 Sep 2020 05:16:24 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:55429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpGc-0002YH-TG; Mon, 28 Sep 2020 05:16:22 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MW9zm-1jup3n02pO-00XaX8; Mon, 28 Sep 2020 11:16:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 8/8] docs/system/deprecated: Move lm32 and unicore32 to the right section Date: Mon, 28 Sep 2020 11:16:02 +0200 Message-Id: <20200928091602.383870-9-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928091602.383870-1-laurent@vivier.eu> References: <20200928091602.383870-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:+3XyjQWo7hbvEPBru/BIEmw8goeduKyoLSR4CTlx92oDFQVw2ml NR1gX7hzergWncNMRveL2CACFimtJUX6fzYWn2U0dGw/nJHOqVL4AtvvruHLqPxvJekReOu GxihtdHsM9+cC/B367MLBa4HZaH8cxeVv7rRiuBrI4J3GAIIhM4uSCqRM16GcyRiRnVUF0D 0Dqxj6d2fzXDuggDNad5A== X-UI-Out-Filterresults: notjunk:1;V03:K0:RWQxJRov2v8=:5s51v1Dha6ArO2nVmmD7RU 86pX49GSKqthT26sVblwYHfLXW1c0WfvT/8tYm2MseBvWJzcn019LjUeX2/a3oX6eRU+ENcaG 8WUPvx3UmDcgf4zZKoHBJQOLuMLTGzfKbgSf78nj3ViJneAWMA2LsNJT1dBy/kL8kd1g6K+2p cYH6rCLCRB+2MK+KAKUIu8Y1seagQnsnADm6Pyb+8mwEctaAddRlaHYBs0kfmQoAV6w/CNM79 ddretTxNNkbEUa4v8LGTG+lI/jZMMK1/p9P0kHj+x0Q+icTlh97RTIUbTYvEl4InmZR0wo0g0 /8HmYn33tbuIyw7pcHALeSClcquW9d1Bj86f/qF/SBo0GDf+AV4ZiumuviFsbBMRIjMfdyShC z9y6IkHTYhQVljCKyBK8pcV55B8mxUzW8t5rfSgJFGpC7Gnr8cgDBonbF7Z9D1WmN6qI02HCv UVf7varNDdbkuVBIP/55tOVCF1NU29LqO9qzGcbCYxpHe1RAnkYpH8iRod4QjF7Uq+s9L8SB/ qip2nispfkg0DPrwvvY2GXqWnXV54o4h4gGJ9WJKFsJcUEtk5qYOTZ+/7laj6g/9WzmD+W1fj 4RbS51g/BE4Mt8iCyIR2wMu9cGd8VwvDvR0zFhjOoWG/41jm15SJiYJzhmJkcjnU0r/Fkp/qP KnmJ62clwMBpnarhBhBDfDVt6YmjncvwWco453uBy6gQjKU5wmif3Gkee5TFrwsy+BeFjsbwj M+l2SUtTPnKJNdH3mzJE2xzc/GFRZwZ67J7JQ9IoiN2q+qAW7OqT15sfKbHT3w1yvC/HP1WxI TLstW3SMjDQB9DDlMA9JBOp/zzHUBC7sF2myZzixzOiOsrHnXMTk4dQitOX3I8SvtFcIU45 Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 05:16:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.462, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth lm32 and unicore32 are softmmut targets, and not linux-user targets. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200923080015.77373-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- docs/system/deprecated.rst | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 808c334fe74d..b2f383ce52e4 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -329,6 +329,22 @@ The ``compat`` property used to set backwards compatibility modes for the processor has been deprecated. The ``max-cpu-compat`` property of the ``pseries`` machine type should be used instead. +``lm32`` CPUs (since 5.2.0) +''''''''''''''''''''''''''' + +The ``lm32`` guest CPU support is deprecated and will be removed in +a future version of QEMU. The only public user of this architecture +was the milkymist project, which has been dead for years; there was +never an upstream Linux port. + +``unicore32`` CPUs (since 5.2.0) +'''''''''''''''''''''''''''''''' + +The ``unicore32`` guest CPU support is deprecated and will be removed in +a future version of QEMU. Support for this CPU was removed from the +upstream Linux kernel, and there is no available upstream toolchain +to build binaries for it. + System emulator devices ----------------------- @@ -408,22 +424,6 @@ The above, converted to the current supported format:: linux-user mode CPUs -------------------- -``lm32`` CPUs (since 5.2.0) -''''''''''''''''''''''''''' - -The ``lm32`` guest CPU support is deprecated and will be removed in -a future version of QEMU. The only public user of this architecture -was the milkymist project, which has been dead for years; there was -never an upstream Linux port. - -``unicore32`` CPUs (since 5.2.0) -'''''''''''''''''''''''''''''''' - -The ``unicore32`` guest CPU support is deprecated and will be removed in -a future version of QEMU. Support for this CPU was removed from the -upstream Linux kernel, and there is no available upstream toolchain -to build binaries for it. - ``tilegx`` CPUs (since 5.1.0) '''''''''''''''''''''''''''''