From nobody Sun Apr 28 23:25:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1527079267862219.34105597724533; Wed, 23 May 2018 05:41:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9014A2C96DC; Wed, 23 May 2018 12:41:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8D28601A3; Wed, 23 May 2018 12:41:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 07AA04CA80; Wed, 23 May 2018 12:41:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4NCexKO010223 for ; Wed, 23 May 2018 08:40:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id BF85D610C9; Wed, 23 May 2018 12:40:59 +0000 (UTC) Received: from mx1.redhat.com (ext-mx17.extmail.prod.ext.phx2.redhat.com [10.5.110.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5481610C8 for ; Wed, 23 May 2018 12:40:56 +0000 (UTC) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 09A8130BBBD4 for ; Wed, 23 May 2018 12:40:45 +0000 (UTC) Received: by mail-wm0-f49.google.com with SMTP id f8-v6so8794497wmc.4 for ; Wed, 23 May 2018 05:40:44 -0700 (PDT) Received: from rolandPC.redhat.com ([213.175.37.12]) by smtp.gmail.com with ESMTPSA id o2-v6sm1609175wmo.24.2018.05.23.05.40.42 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 05:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=YqaPZ3lyGPUk8uada6I03faItY+r/i79ZA7rIS4MQec=; b=TnzN8ny9qQ7m0+ijA2BEUy6KMlsHKSzJNtImxirBuzDY8VKhil9HfczsfqZwDMCq9w DEYZmxjG712SajFkV2cNn7jBpVspzzGQVH65UIOmspglM+hTLk26t+kclo2IP4Imt0xj WutMVq+dxfI98ndwBROWUAsZZFmXKcVAGfXGC+zk4mlTVyMvzooPJNXo3Oh7YuolykpU IsGLI79znfUxmHUGPA10K2SWZczsUn6B2wYSBuTdhq1/I+xNPKzO1YRWMRfwh6bzzwCu LFIW0+R91A8K6yXgV368bT8EmcsT5fXSvk/G1OzRpEXFnbM7Y+60fLPJFGCN3JvpqY5I eLhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=YqaPZ3lyGPUk8uada6I03faItY+r/i79ZA7rIS4MQec=; b=iWC/0K4noV7t3UC+9Jd3RsypZoWMoDwseVzlyUkhNe3BF8ni+wy9kV1i+3FZ47oXOQ RpZ9Sw+N3GTU2VwTdrM2LX70idBd03HRI8YWHFmkDibP0RW66wwidlAISSvBZYJoHz+t Ldm5d/4jRoMFZ7I0/P46o21yawCzE6OsaaCKOEIKORB51pEpR5MNZal082wOQGttY/++ k+jEWo24A/imoMC8dbqr/+R1XgZdu7o47h3ParIcUiDCR8WWJ/Ou84Vsob+piXcPzKoM K4umYIVnB+figPXx+GErVmGUolnZecehMfK+9J7XJ62JlUoij8dsI+RWJ/yZT8NVf0K4 DDmQ== X-Gm-Message-State: ALKqPwdfNb0Xhrfhkz41T6tPwrqLj4o5s0saYx3XQGTpwsbBCXHSD1Xb 4KNpzhp4uUkiLLzoJJa4Zo2Zww== X-Google-Smtp-Source: AB8JxZoXMlhbRqqaQXKYoVh2whFwe2/Ty0uJ+EQlTV+MgQSWaW96KK3D6ecSr0UVW0laJqhjsgEnMA== X-Received: by 2002:a1c:170f:: with SMTP id 15-v6mr4146043wmx.90.1527079243546; Wed, 23 May 2018 05:40:43 -0700 (PDT) From: Roland Schulz To: libvir-list@redhat.com Date: Wed, 23 May 2018 14:40:40 +0200 Message-Id: <20180523124041.15108-1-schullzroll@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 23 May 2018 12:40:45 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 23 May 2018 12:40:45 +0000 (UTC) for IP:'74.125.82.49' DOMAIN:'mail-wm0-f49.google.com' HELO:'mail-wm0-f49.google.com' FROM:'schullzroll@gmail.com' RCPT:'' X-RedHat-Spam-Score: 1.281 * (DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NML_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS, T_DKIM_INVALID) 74.125.82.49 mail-wm0-f49.google.com 74.125.82.49 mail-wm0-f49.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.46 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2] Edit test capabilities to contain different cell pagesizes. X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 23 May 2018 12:41:06 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Roland Schulz --- src/test/test_driver.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 467587b19..3fe0c2831 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -322,30 +322,34 @@ testBuildCapabilities(virConnectPtr conn) if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) goto error; =20 - if (VIR_ALLOC_N(caps->host.pagesSize, 2) < 0) + if (VIR_ALLOC_N(caps->host.pagesSize, 4) < 0) goto error; =20 caps->host.pagesSize[caps->host.nPagesSize++] =3D 4; + caps->host.pagesSize[caps->host.nPagesSize++] =3D 8; caps->host.pagesSize[caps->host.nPagesSize++] =3D 2048; + caps->host.pagesSize[caps->host.nPagesSize++] =3D 1024 * 1024; =20 for (i =3D 0; i < privconn->numCells; i++) { virCapsHostNUMACellCPUPtr cpu_cells; virCapsHostNUMACellPageInfoPtr pages; - size_t nPages; + size_t nPages =3D caps->host.nPagesSize - 1; =20 if (VIR_ALLOC_N(cpu_cells, privconn->cells[i].numCpus) < 0 || - VIR_ALLOC_N(pages, caps->host.nPagesSize) < 0) { + VIR_ALLOC_N(pages, caps->host.nPagesSize - 1) < 0) { VIR_FREE(cpu_cells); goto error; } - - nPages =3D caps->host.nPagesSize; + if (i =3D=3D 1) + pages[0].size =3D caps->host.pagesSize[0]; + else + pages[0].size =3D caps->host.pagesSize[1]; =20 memcpy(cpu_cells, privconn->cells[i].cpus, sizeof(*cpu_cells) * privconn->cells[i].numCpus); =20 - for (j =3D 0; j < nPages; j++) - pages[j].size =3D caps->host.pagesSize[j]; + for (j =3D 1; j < nPages; j++) + pages[j].size =3D caps->host.pagesSize[j+1]; =20 pages[0].avail =3D privconn->cells[i].mem / pages[0].size; =20 --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list