[libvirt] [PATCH 2/2] Edit test capabilities to contain different cell pagesizes.

Roland Schulz schullzroll at gmail.com
Tue May 22 09:54:45 UTC 2018


Signed-off-by: Roland Schulz <schullzroll at gmail.com>
---
 src/test/test_driver.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 467587b19..40c366cb8 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -322,24 +322,27 @@ testBuildCapabilities(virConnectPtr conn)
     if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0)
         goto error;
 
-    if (VIR_ALLOC_N(caps->host.pagesSize, 2) < 0)
+    if (VIR_ALLOC_N(caps->host.pagesSize, 3) < 0)
         goto error;
 
     caps->host.pagesSize[caps->host.nPagesSize++] = 4;
     caps->host.pagesSize[caps->host.nPagesSize++] = 2048;
+    caps->host.pagesSize[caps->host.nPagesSize++] = 1024 * 1024;
 
     for (i = 0; i < privconn->numCells; i++) {
         virCapsHostNUMACellCPUPtr cpu_cells;
         virCapsHostNUMACellPageInfoPtr pages;
-        size_t nPages;
+        size_t nPages = caps->host.nPagesSize;
 
         if (VIR_ALLOC_N(cpu_cells, privconn->cells[i].numCpus) < 0 ||
             VIR_ALLOC_N(pages, caps->host.nPagesSize) < 0) {
                 VIR_FREE(cpu_cells);
                 goto error;
             }
-
-        nPages = caps->host.nPagesSize;
+        if (i == 1) {
+            nPages--;
+            caps->host.pagesSize[caps->host.nPagesSize - 3] = 8;
+        }
 
         memcpy(cpu_cells, privconn->cells[i].cpus,
                sizeof(*cpu_cells) * privconn->cells[i].numCpus);
-- 
2.17.0




More information about the libvir-list mailing list