From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Andrew Jones <drjones@redhat.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] KVM: selftests: Drop a duplicate TEST_ASSERT() in vm_nr_pages_required()
Date: Mon, 13 Jun 2022 16:19:41 +0000 [thread overview]
Message-ID: <20220613161942.1586791-4-seanjc@google.com> (raw)
In-Reply-To: <20220613161942.1586791-1-seanjc@google.com>
Remove a duplicate TEST_ASSERT() on the number of runnable vCPUs in
vm_nr_pages_required() that snuck in during a rebase gone bad.
Reported-by: Andrew Jones <drjones@redhat.com>
Fixes: 6e1d13bf3815 ("KVM: selftests: Move per-VM/per-vCPU nr pages calculation to __vm_create()")
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
tools/testing/selftests/kvm/lib/kvm_util.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 0c550fb0dab2..bceb668f2627 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -284,10 +284,6 @@ static uint64_t vm_nr_pages_required(enum vm_guest_mode mode,
*/
nr_pages += (nr_pages + extra_mem_pages) / PTES_PER_MIN_PAGE * 2;
- TEST_ASSERT(nr_runnable_vcpus <= kvm_check_cap(KVM_CAP_MAX_VCPUS),
- "Host doesn't support %d vCPUs, max-vcpus = %d",
- nr_runnable_vcpus, kvm_check_cap(KVM_CAP_MAX_VCPUS));
-
return vm_adjust_num_guest_pages(mode, nr_pages);
}
--
2.36.1.476.g0c4daa206d-goog
next prev parent reply other threads:[~2022-06-13 19:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-13 16:19 [PATCH 0/4] KVM: selftests: Fixups for overhaul Sean Christopherson
2022-06-13 16:19 ` [PATCH 1/4] KVM: selftests: Add a missing apostrophe in comment to show ownership Sean Christopherson
2022-06-13 19:13 ` Jim Mattson
2022-06-13 19:32 ` Sean Christopherson
2022-06-13 19:35 ` Jim Mattson
2022-06-13 16:19 ` [PATCH 2/4] KVM: selftests: Call a dummy helper in VM/vCPU ioctls() to enforce type Sean Christopherson
2022-06-13 16:19 ` Sean Christopherson [this message]
2022-06-13 16:19 ` [PATCH 4/4] KVM: selftests: Use kvm_has_cap(), not kvm_check_cap(), where possible Sean Christopherson
2022-06-14 7:51 ` [PATCH 0/4] KVM: selftests: Fixups for overhaul Andrew Jones
2022-06-14 7:52 ` Andrew Jones
2022-06-14 16:44 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220613161942.1586791-4-seanjc@google.com \
--to=seanjc@google.com \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox