From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDA3DCCA47B for ; Mon, 13 Jun 2022 19:01:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345445AbiFMTA5 (ORCPT ); Mon, 13 Jun 2022 15:00:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241927AbiFMTAV (ORCPT ); Mon, 13 Jun 2022 15:00:21 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 408819969E for ; Mon, 13 Jun 2022 09:19:51 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id c10-20020a170903234a00b00168b5f7661bso3305593plh.6 for ; Mon, 13 Jun 2022 09:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=TaFkEEYysed0ZjHcXQwF9Zz5rGBFJVxcbzKnAkD2bLE=; b=BdyUyuAnmo6m8r1koxsfiOlsc5iBNlYySi3Y71QAYuY10veGPQMdUfMGhTfXRAD/jp SaugyRrAgCkYojFlfApB5/etcSDN8V3lOYeZbFaLsfFxquOJpuM7LqW1zpASrDwckUmz j/Z0XFHKi+sAiqu+/S7/+sdCMNhh5cz6On2RgMVy/6TzrZUxACT1WPSaoKueO5gbBNRL VT73mZjb7UOAZvch0+ny+tV5U7YNfmQEetOqihOu6tPpGN7lA/4r99PVFyO1KI8OSaLT 8ZVdkz4NMXRaVxReAL6jLw2J0RfErikAiKKvUu4FY26zUvFXv2WHfvkqNJhwloC9P74f QIKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=TaFkEEYysed0ZjHcXQwF9Zz5rGBFJVxcbzKnAkD2bLE=; b=12X6gJw7nd6nil3pP0cJWvS5q239WXTtCy2Cit7KSBS9ptTuJlC71SOvtnjFSA0T5W g1OGXuZpC7UlSVr4HPDOimXQ3kOuTZsjMpETQ5O5oPJaPvMtQRhY0zNHKu7wdPSjLN+I Km4MHHCpfC/nVj8Fogjql9xo6LSia5qOO2cd3jylljhF5FUVABQEO9x5GP5bn72HHfMK RClDxTbpoo8Yls220z7oZh9xey2LzUoIZglOCJZ5DWjPdR86lV6OlndqHzvDKLZhbN5W 2B+7NbvZwcQQf1nBiAZmmNQLM1WrhCTAS+BPFYjvYfTD9UdGGTqFHRuciCeBoIbE26xu zWEQ== X-Gm-Message-State: AJIora+5hV8eKQt60u2UUSMSoCIaBhJORropVKGhk/DV9iznFNMVQB0S yjor14OOipH6Kz+zTNC52tHj2kXzf5I= X-Google-Smtp-Source: AGRyM1uSISy6bunfnR8Yit2TWacf4gJnLWhGMnEplJRMVeWD2oqBzx69YnLQTZsKrF295eR0wT9fMyUouO8= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a17:902:ead4:b0:161:c85a:8fff with SMTP id p20-20020a170902ead400b00161c85a8fffmr390270pld.97.1655137190747; Mon, 13 Jun 2022 09:19:50 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 13 Jun 2022 16:19:41 +0000 In-Reply-To: <20220613161942.1586791-1-seanjc@google.com> Message-Id: <20220613161942.1586791-4-seanjc@google.com> Mime-Version: 1.0 References: <20220613161942.1586791-1-seanjc@google.com> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [PATCH 3/4] KVM: selftests: Drop a duplicate TEST_ASSERT() in vm_nr_pages_required() From: Sean Christopherson To: Paolo Bonzini Cc: Andrew Jones , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: 6e1d13bf3815 ("KVM: selftests: Move per-VM/per-vCPU nr pages calculation to __vm_create()") Signed-off-by: Sean Christopherson --- 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