From nobody Sun Feb 8 10:43:37 2026 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1533818359608902.4646846962805; Thu, 9 Aug 2018 05:39:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8BE33E2B7; Thu, 9 Aug 2018 12:39:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A5E3460C4C; Thu, 9 Aug 2018 12:39:16 +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 54CF2181ABF0; Thu, 9 Aug 2018 12:39:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w79CcufY002818 for ; Thu, 9 Aug 2018 08:38:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id DA9CA2166BA8; Thu, 9 Aug 2018 12:38:56 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78A222166BA2 for ; Thu, 9 Aug 2018 12:38:56 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Aug 2018 14:38:37 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 05/20] tests: extract pages-discard out of hugepages-pages 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 09 Aug 2018 12:39:18 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" >From the args output you can see that the 'discard' feature is not honored if you don't use hugepages, that is a bug, following patche will fix it. Signed-off-by: Pavel Hrdina --- tests/qemuxml2argvdata/hugepages-pages.args | 12 +++---- tests/qemuxml2argvdata/hugepages-pages.xml | 3 +- tests/qemuxml2argvdata/pages-discard.args | 28 +++++++++++++++ tests/qemuxml2argvdata/pages-discard.xml | 36 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++-- tests/qemuxml2xmloutdata/hugepages-pages.xml | 3 +- tests/qemuxml2xmloutdata/pages-discard.xml | 1 + tests/qemuxml2xmltest.c | 1 + 8 files changed, 78 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/pages-discard.args create mode 100644 tests/qemuxml2argvdata/pages-discard.xml create mode 120000 tests/qemuxml2xmloutdata/pages-discard.xml diff --git a/tests/qemuxml2argvdata/hugepages-pages.args b/tests/qemuxml2ar= gvdata/hugepages-pages.args index b52cd581d5..7ece0272a0 100644 --- a/tests/qemuxml2argvdata/hugepages-pages.args +++ b/tests/qemuxml2argvdata/hugepages-pages.args @@ -11,20 +11,20 @@ QEMU_AUDIO_DRV=3Dnone \ -m 4096 \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,prealloc=3Dyes,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,discard-data=3Dyes,\ -size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=3D1073741824,\ +host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,prealloc=3Dyes,\ mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,size=3D1073741824,\ host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -object memory-backend-file,id=3Dram-node2,prealloc=3Dyes,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,discard-data=3Dyes,\ -size=3D1073741824,host-nodes=3D0-3,policy=3Dbind \ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=3D1073741824,\ +host-nodes=3D0-3,policy=3Dbind \ -numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ -object memory-backend-file,id=3Dram-node3,prealloc=3Dyes,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,discard-data=3Dyes,\ -size=3D1073741824,host-nodes=3D3,policy=3Dbind \ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=3D1073741824,\ +host-nodes=3D3,policy=3Dbind \ -numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/hugepages-pages.xml b/tests/qemuxml2arg= vdata/hugepages-pages.xml index cba83e754c..f9270782d4 100644 --- a/tests/qemuxml2argvdata/hugepages-pages.xml +++ b/tests/qemuxml2argvdata/hugepages-pages.xml @@ -8,7 +8,6 @@ - 4 @@ -22,7 +21,7 @@ - + diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argv= data/pages-discard.args new file mode 100644 index 0000000000..9db8c72a22 --- /dev/null +++ b/tests/qemuxml2argvdata/pages-discard.args @@ -0,0 +1,28 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 4096 \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-numa node,nodeid=3D0,cpus=3D0,mem=3D1024 \ +-numa node,nodeid=3D1,cpus=3D1,mem=3D1024 \ +-numa node,nodeid=3D2,cpus=3D2,mem=3D1024 \ +-numa node,nodeid=3D3,cpus=3D3,mem=3D1024 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ +server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot c \ +-usb diff --git a/tests/qemuxml2argvdata/pages-discard.xml b/tests/qemuxml2argvd= ata/pages-discard.xml new file mode 100644 index 0000000000..a8c6b74d95 --- /dev/null +++ b/tests/qemuxml2argvdata/pages-discard.xml @@ -0,0 +1,36 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 4194304 + 4194304 + + + + 4 + + hvm + + + + + + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-i686 + +
+ + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f36058272f..b72d4217ea 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -960,6 +960,9 @@ mymain(void) DO_TEST("pmu-feature", NONE); DO_TEST("pmu-feature-off", NONE); =20 + DO_TEST("pages-discard", + QEMU_CAPS_OBJECT_MEMORY_FILE, + QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); DO_TEST("hugepages-default", NONE); DO_TEST("hugepages-numa-default", QEMU_CAPS_OBJECT_MEMORY_FILE); @@ -968,8 +971,7 @@ mymain(void) QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-pages", QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); + QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-pages2", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM, diff --git a/tests/qemuxml2xmloutdata/hugepages-pages.xml b/tests/qemuxml2x= mloutdata/hugepages-pages.xml index 292454588e..498610a217 100644 --- a/tests/qemuxml2xmloutdata/hugepages-pages.xml +++ b/tests/qemuxml2xmloutdata/hugepages-pages.xml @@ -8,7 +8,6 @@ - 4 @@ -22,7 +21,7 @@ - + diff --git a/tests/qemuxml2xmloutdata/pages-discard.xml b/tests/qemuxml2xml= outdata/pages-discard.xml new file mode 120000 index 0000000000..4d22fef81f --- /dev/null +++ b/tests/qemuxml2xmloutdata/pages-discard.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/pages-discard.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a943975ada..2d85084d4a 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -329,6 +329,7 @@ mymain(void) DO_TEST("pmu-feature", NONE); DO_TEST("pmu-feature-off", NONE); =20 + DO_TEST("pages-discard", NONE); DO_TEST("hugepages-default", NONE); DO_TEST("hugepages-numa-default-dimm", NONE); DO_TEST("hugepages-pages", NONE); --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list