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;
IronPort-SDR: oqegSr6O5xLLFpG3vWWrtCVxKgf/hxx6NV51envw5XxHtgdOBNA96jGlx3V6UX5CioEE9yQ83C
 Gwhdq+WSZf6g==
IronPort-SDR: ESQDn1oVUUnLsgYy9uO23b2a++xALaKlQQlfVrk5E3znsCBt3c25rOOsv3KbXondN/waqnJQXk
 RdGdG3dqLANw==
From:   Zhenzhong Duan <zhenzhong.duan@intel.com>
To:     linux-kernel@vger.kernel.org
Cc:     linux-kselftest@vger.kernel.org, kvm@vger.kernel.org,
        maciej.szmigiero@oracle.com, drjones@redhat.com,
        pbonzini@redhat.com, shuah@kernel.org,
        Zhenzhong Duan <zhenzhong.duan@intel.com>
Subject: [PATCH 2/3] Revert "selftests: kvm: fix overlapping addresses in memslot_perf_test"
Date:   Wed,  9 Jun 2021 07:38:15 +0800
Message-Id: <20210608233816.423958-3-zhenzhong.duan@intel.com>
In-Reply-To: <20210608233816.423958-1-zhenzhong.duan@intel.com>
References: <20210608233816.423958-1-zhenzhong.duan@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

This reverts commit 000ac42953395a4f0a63d5db640c5e4c88a548c5.

As (39fe2fc96694 "selftests: kvm: make allocation of extra memory take
effect") is reverted, this relevant commit should be reverted too.

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
 tools/testing/selftests/kvm/memslot_perf_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kvm/memslot_perf_test.c b/tools/testing/selftests/kvm/memslot_perf_test.c
index 9307f25d8130..11239652d805 100644
--- a/tools/testing/selftests/kvm/memslot_perf_test.c
+++ b/tools/testing/selftests/kvm/memslot_perf_test.c
@@ -267,7 +267,7 @@ static bool prepare_vm(struct vm_data *data, int nslots, uint64_t *maxslots,
 	data->hva_slots = malloc(sizeof(*data->hva_slots) * data->nslots);
 	TEST_ASSERT(data->hva_slots, "malloc() fail");
 
-	data->vm = vm_create_default(VCPU_ID, 1024, guest_code);
+	data->vm = vm_create_default(VCPU_ID, mempages, guest_code);
 
 	pr_info_v("Adding slots 1..%i, each slot with %"PRIu64" pages + %"PRIu64" extra pages last\n",
 		max_mem_slots - 1, data->pages_per_slot, rempages);
-- 
2.25.1