Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3697686pxv; Mon, 28 Jun 2021 10:32:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy50jy0NcsTegLTi1Hrsuyr3NKrTLEYWRtI4orVV3m7f0BCZyi5oiw3+Yg2n2owD7T35H4T X-Received: by 2002:a17:906:9d12:: with SMTP id fn18mr25171564ejc.3.1624901548776; Mon, 28 Jun 2021 10:32:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624901548; cv=none; d=google.com; s=arc-20160816; b=ptTF6qewABJWWf6aDcR4A+kDAPUhQtA0uo5mLwII01CQWlMp53WWUE6BKlshlBsPTY PM4qgi7bkbwNikG0hQniIxLhhYfaG8KADw2UNAcjy1Qb69dNTYHR66hRN0tPpZOdfS8L XRCvGntgfBT+wH+g0TALDNHDKdCqTkH+nap9s6h6AHWK0XJnOTADhTuNP/zDlNl/yOxW +/1PB7Jo8CKHdZBgaNlHoFotfUyOuSIMGnBDGL9fEVKCWIauCnIl9k2kNlZ9mjvh+gMg pH0AzjoK+8+q6lj9cE91NRi50QLBUxzV8lLXZTQrmWQ0DmmRfX0YYWdSBK38IXMKlrdb WFpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TDqDkE/39mZvHfjbLswfbT9CqQD9miRsFUrpH+8Cis0=; b=fDnlWRFT4UHn2kygR8n/Aj4LkJ7wQmQfEmZWX8h2czSvub2YL/R9xI0+TXWXjWBIbD RiSVBd5A46iEYPLJKZ94Zs1FMmhuL+ofzdaxtxu0cPwAacvgwLXLJvyr7CwSu6px0Bqc COco5j7pSqUjxLaVVh+Kqfl96zJxgZCq8OgqXjap/dsOA7Id71Duzqr3j1ztjB+LCXu1 UGz3NDGBnbJOayMODCS28yUjwLLCu3vo/+ZzCYjZwpZS5wcVWbrxosTtJ9M76ODV8kL+ /n4f+zMRxuCQ1sppqQkRCglfkUO8lHTbyGbEm6laG0aH3AN7k3u6pJ4s8tIcwzZnfvwG gWIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jPzHivwG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m18si14486173ejn.430.2021.06.28.10.32.04; Mon, 28 Jun 2021 10:32:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jPzHivwG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233656AbhF1OZR (ORCPT + 99 others); Mon, 28 Jun 2021 10:25:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:54500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233221AbhF1OVj (ORCPT ); Mon, 28 Jun 2021 10:21:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A380361C7F; Mon, 28 Jun 2021 14:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624889954; bh=j7cyp7H6Pq15LCDwLtRaQL0/mItbUSCDUqwruUQOUhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jPzHivwGDQ6zxUipYtPs3Q6h1jz/bgIez6NV90+rTu7M/ZEauvy5tyvin18LosMqe eYg9LvpOw/LmKYMTKfw0DYVFwN38r7N/gRQQP5iw6Qd2YcnwCPX1hEtX5gizWBCHdg Ztjw+UAgnq6CHlLfvRxxS+KvayMJVZ5kF7c2NuX+8b8SeAnrYPiJTNV3kPd44WCZ38 QhgQmbxvlO68ytv/JmrDwjS158rgSYkzSJLtJn5LkKwd/xxbuQNdGqI/G/jiZnwVgk 6cXENA5ZxK6x0gLKzk0EjmwcGPXJ+iPa4C1VTouCczsAGGmY/LUPccjO9K6nzhEopb JKg2/RRKvjc1A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fuad Tabba , Paolo Bonzini , Sasha Levin Subject: [PATCH 5.12 052/110] KVM: selftests: Fix kvm_check_cap() assertion Date: Mon, 28 Jun 2021 10:17:30 -0400 Message-Id: <20210628141828.31757-53-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210628141828.31757-1-sashal@kernel.org> References: <20210628141828.31757-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.14-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.12.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.12.14-rc1 X-KernelTest-Deadline: 2021-06-30T14:18+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fuad Tabba [ Upstream commit d8ac05ea13d789d5491a5920d70a05659015441d ] KVM_CHECK_EXTENSION ioctl can return any negative value on error, and not necessarily -1. Change the assertion to reflect that. Signed-off-by: Fuad Tabba Message-Id: <20210615150443.1183365-1-tabba@google.com> Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 2f0e4365f61b..8b90256bca96 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -58,7 +58,7 @@ int kvm_check_cap(long cap) exit(KSFT_SKIP); ret = ioctl(kvm_fd, KVM_CHECK_EXTENSION, cap); - TEST_ASSERT(ret != -1, "KVM_CHECK_EXTENSION IOCTL failed,\n" + TEST_ASSERT(ret >= 0, "KVM_CHECK_EXTENSION IOCTL failed,\n" " rc: %i errno: %i", ret, errno); close(kvm_fd); -- 2.30.2