From patchwork Wed Mar 6 11:05:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 159743 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp6030009jad; Wed, 6 Mar 2019 03:06:16 -0800 (PST) X-Google-Smtp-Source: APXvYqxmVYfYfld0CxXmviIn4lUiuQRQzpyMlTf1MMdJcHA5wTKEwb1rYOhGZCyp0aN9Zo/6gyAa X-Received: by 2002:a62:29c6:: with SMTP id p189mr6854394pfp.194.1551870376665; Wed, 06 Mar 2019 03:06:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551870376; cv=none; d=google.com; s=arc-20160816; b=zyUnhTC6qaXgICPzFICTqucOggLduP1wJBDhwhvxsGC1dgRgt2MksUKdWMTfwj2Kvz u4a6D8oDUEabrn7DkZB78XC1B9b0BpVgu+HLWFOwGcidmaBkKQTQxfPiIN0LzUeUUNdh tt10CDDE0wU6n12TDkiUSlHEIpQw92c628dmip+SrmfZKbZavMsT/hRFTnzSHtxwHHNT 57hSr+SEHqdOdkP/iR7IZjkdEqY85GCiNWx6grLu302mkM/3IQpltJ2pw8VsrTsOinse 8YQYocFdVRm6BH6OiSAFxz09/vfEG7i9H5AFGlzCBvjOYljdTFTHKeeDZ0bztzbKlwkB ojoA== 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 :message-id:date:subject:cc:to:from; bh=d4f7YwlvdiWh1AwX+YnjMh8c3WppyFYRCUHuK/ZoxNo=; b=yWCu9J23FGzTou8Ue++SbU/fRnKdHrLxqDK7SapEmwS9wLFwe6s27aBfRfog+krm62 U5Ab2PcQjUSK6vTafz/Ix8Z7u+MHRUqDO9dNiqKZbIES65f61o6FIr5WVLSNEh9Ww7FL XCmSi2Cs39O1HmgezVgTlq+KN6Rm7UYFsLc5rV1Ltfrd56MnmMWsAT9gbE0bcasIh44m QkjyVorRzW5VQbP69RNqO97+JQhSnQI2OFBnLDG5hSiGRPa76rf1vuaDzHQkpNDGOg+E AsDwiqNBo9BrE3cpJzHjkZIVjSXHBoriAccjQJgvkpF9knD/fJS6c+nTOrQfTsHsnPXH FNjA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z190si1164981pgd.238.2019.03.06.03.06.15; Wed, 06 Mar 2019 03:06:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730331AbfCFLGO (ORCPT + 31 others); Wed, 6 Mar 2019 06:06:14 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:46255 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729762AbfCFLGN (ORCPT ); Wed, 6 Mar 2019 06:06:13 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mhl0I-1hWAM01cKe-00dnQT; Wed, 06 Mar 2019 12:06:04 +0100 From: Arnd Bergmann To: "Michael S. Tsirkin" , Jason Wang Cc: Arnd Bergmann , "David S. Miller" , Stefan Hajnoczi , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] vhost: silence an unused-variable warning Date: Wed, 6 Mar 2019 12:05:49 +0100 Message-Id: <20190306110602.2529137-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:00mDL8GvVd7KPBcJIzQn94nsSHWgxbvnaLDlVUbH50FOrZMdvRO QBEa+Zznpu/jFO2HI0BU2n5H0FcCtZ/xjFGPHcAJkwvBQkD4oQFx1skRY1E9sHMKlVLOEkn IflLyAsOEH0qyylRUx2yVvUM+b7oQ+bzH6hXmVTkDqISfXn2m4N4pNffR/4LRBrdLgVHbXC JrwkOdnAuTwxXAGejKzjw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ouIxrelqti4=:zDF4itJL8Nvj2UbKQ0R/Me y+O/+E9CHpZ0IBFG2dl8uhyF0oEF7rK+9jIVR+4BRFKWiVu5aRmPB/Bcff4BLDUn19j1sJZhq XEWXlD311J6EeTSwwj691chpwdVkFdH5DmwQ35CBOUnmEfHILdagn62PlcLnaB6/MY4r8Cdfg uZLfjVI9k4+CH8hgnlxjvzkVnIUomQ8CrK7O8ZDYnLxUW3ODYkb1hfJY8A4062HRL5hLjGvjO dJ8AdqMzVEvDwzr7cY8UmqpCO+CR66dlejh24YB83IxiIugUTmhAcNiPUK94VsV6oG7Pw6Dy5 VL/9pb2BzOeNAtwT0Oks5drBD7xNyLOgbhz5UFeBFVdo5Nm3kI754rV5zUpK7X9csgfW+Ep9e pFBKcPkNh+a13HIrLNg2cGnrMAV/prV3fGvO4wa/B09Ilvm7EevAV1i/kOcFlOtgDcoHznuWA tjGGSHsttLvN4V6bp2U+b26M84DKTKUqEQKSqWasxtfc3HcaBn8UMLPsNWvFl2vuj29BxsesI ISnCckM6Wg/r6Ty2uSIgoITXj0fjNQri0J7s1/zcK5p8MNtc5eKA6HrX9E2BW/HvcpllQ6efu +ZnkYrvQiPzAi3u8+KPU815uwzX0UQebLisLyeOxmYITqJKm91aPYIQpdPDgibx46e3PS3W+L GiSNYDt3buZWBJhPBLE2pah9xPP3kxn+79QK68ZuoQGW534yds9GmtzU1af/93fWrORz9FkhR 8E08DArZ0bjWjy6W1lb6LT07jcpKzJqUkgiHYA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On some architectures, the MMU can be disabled, leading to access_ok() becoming an empty macro that does not evaluate its size argument, which in turn produces an unused-variable warning: drivers/vhost/vhost.c:1191:9: error: unused variable 's' [-Werror,-Wunused-variable] size_t s = vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0; Mark the variable as __maybe_unused to shut up that warning. Signed-off-by: Arnd Bergmann --- drivers/vhost/vhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0 Acked-by: Jason Wang diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index a2e5dc7716e2..5ace833de746 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1188,7 +1188,7 @@ static bool vq_access_ok(struct vhost_virtqueue *vq, unsigned int num, struct vring_used __user *used) { - size_t s = vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0; + size_t s __maybe_unused = vhost_has_feature(vq, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0; return access_ok(desc, num * sizeof *desc) && access_ok(avail,