From nobody Wed May 1 23:09:49 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; 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 1533818339160438.9560210120121; Thu, 9 Aug 2018 05:38:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C560887624; Thu, 9 Aug 2018 12:38:56 +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 7F6085D9CA; Thu, 9 Aug 2018 12:38:56 +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 1CEE9181A891; Thu, 9 Aug 2018 12:38:56 +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 w79CcsMK002755 for ; Thu, 9 Aug 2018 08:38:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3A9F52166BA8; Thu, 9 Aug 2018 12:38:54 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBBE52166BA2 for ; Thu, 9 Aug 2018 12:38:53 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Aug 2018 14:38:33 +0200 Message-Id: <6434295838dc12c1614703c4e861ae8b52c97dfb.1533818183.git.phrdina@redhat.com> 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 01/20] tests: rename hugepages to hugepages-default 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 09 Aug 2018 12:38:57 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Remove unnecessary XML elements as well. Signed-off-by: Pavel Hrdina --- .../{hugepages.args =3D> hugepages-default.args} | 2 -- .../{hugepages.xml =3D> hugepages-default.xml} | 5 ----- tests/qemuxml2argvtest.c | 2 +- .../{hugepages.xml =3D> hugepages-default.xml} | 6 ------ tests/qemuxml2xmltest.c | 2 +- 5 files changed, 2 insertions(+), 15 deletions(-) rename tests/qemuxml2argvdata/{hugepages.args =3D> hugepages-default.args}= (82%) rename tests/qemuxml2argvdata/{hugepages.xml =3D> hugepages-default.xml} (= 79%) rename tests/qemuxml2xmloutdata/{hugepages.xml =3D> hugepages-default.xml}= (82%) diff --git a/tests/qemuxml2argvdata/hugepages.args b/tests/qemuxml2argvdata= /hugepages-default.args similarity index 82% rename from tests/qemuxml2argvdata/hugepages.args rename to tests/qemuxml2argvdata/hugepages-default.args index ea61ba930e..115da3ea35 100644 --- a/tests/qemuxml2argvdata/hugepages.args +++ b/tests/qemuxml2argvdata/hugepages-default.args @@ -24,6 +24,4 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/hugepages.xml b/tests/qemuxml2argvdata/= hugepages-default.xml similarity index 79% rename from tests/qemuxml2argvdata/hugepages.xml rename to tests/qemuxml2argvdata/hugepages-default.xml index 2e65902f1c..99f53828fe 100644 --- a/tests/qemuxml2argvdata/hugepages.xml +++ b/tests/qemuxml2argvdata/hugepages-default.xml @@ -17,11 +17,6 @@ destroy /usr/bin/qemu-system-i686 - - - -
- diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 16000ca59d..cfebf364fb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -960,7 +960,7 @@ mymain(void) DO_TEST("pmu-feature", NONE); DO_TEST("pmu-feature-off", NONE); =20 - DO_TEST("hugepages", NONE); + DO_TEST("hugepages-default", NONE); DO_TEST("hugepages-numa", QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_VIRTIO_SCSI, diff --git a/tests/qemuxml2xmloutdata/hugepages.xml b/tests/qemuxml2xmloutd= ata/hugepages-default.xml similarity index 82% rename from tests/qemuxml2xmloutdata/hugepages.xml rename to tests/qemuxml2xmloutdata/hugepages-default.xml index f78ca95c1b..40043434ee 100644 --- a/tests/qemuxml2xmloutdata/hugepages.xml +++ b/tests/qemuxml2xmloutdata/hugepages-default.xml @@ -17,12 +17,6 @@ destroy /usr/bin/qemu-system-i686 - - - - -
-
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 6c4f96e505..ff6e611421 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -329,7 +329,7 @@ mymain(void) DO_TEST("pmu-feature", NONE); DO_TEST("pmu-feature-off", NONE); =20 - DO_TEST("hugepages", NONE); + DO_TEST("hugepages-default", NONE); DO_TEST("hugepages-pages", NONE); DO_TEST("hugepages-pages2", NONE); DO_TEST("hugepages-pages3", NONE); --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed May 1 23:09:49 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; 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 153381834597311.299139202645733; Thu, 9 Aug 2018 05:39:05 -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 1300B3082A48; Thu, 9 Aug 2018 12:39:04 +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 CB50E60C11; Thu, 9 Aug 2018 12:39: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 77048181ABCE; Thu, 9 Aug 2018 12:39:03 +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 w79CcsZR002775 for ; Thu, 9 Aug 2018 08:38:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id DBED72166BA8; Thu, 9 Aug 2018 12:38:54 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A73D2166BA2 for ; Thu, 9 Aug 2018 12:38:54 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Aug 2018 14:38:34 +0200 Message-Id: <6971c87595e912809be082fb2ea504a34c1a42d1.1533818183.git.phrdina@redhat.com> 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 02/20] tests: extract hugepages-numa-default-dimm out of hugepages-numa 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.45]); Thu, 09 Aug 2018 12:39:04 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- .../hugepages-numa-default-dimm.args | 31 +++++++++++++ .../hugepages-numa-default-dimm.xml | 45 +++++++++++++++++++ tests/qemuxml2argvdata/hugepages-numa.args | 6 +-- tests/qemuxml2argvdata/hugepages-numa.xml | 11 ----- tests/qemuxml2argvtest.c | 2 + .../hugepages-numa-default-dimm.xml | 1 + tests/qemuxml2xmltest.c | 1 + 7 files changed, 81 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/hugepages-numa-default-dimm.args create mode 100644 tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml create mode 120000 tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/test= s/qemuxml2argvdata/hugepages-numa-default-dimm.args new file mode 100644 index 0000000000..855966a137 --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args @@ -0,0 +1,31 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name fedora \ +-S \ +-machine pc-i440fx-2.3,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ +-smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-mem-prealloc \ +-mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ +-numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \ +-object memory-backend-file,id=3Dmemdimm0,prealloc=3Dyes,\ +mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-fedora,size=3D1073741824,\ +host-nodes=3D1-3,policy=3Dbind \ +-device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-fedora/monitor.= 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/hugepages-numa-default-dimm.xml b/tests= /qemuxml2argvdata/hugepages-numa-default-dimm.xml new file mode 100644 index 0000000000..14a3368678 --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml @@ -0,0 +1,45 @@ + + fedora + 63840878-0deb-4095-97e6-fc444d9bc9fa + 1099511627776 + 1572863 + 1048576 + + + + 2 + + hvm + + + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + + + + + + 1-3 + 1048576 + + + 1048576 + 0 + +
+ + + diff --git a/tests/qemuxml2argvdata/hugepages-numa.args b/tests/qemuxml2arg= vdata/hugepages-numa.args index aa834f5511..20c7802fd8 100644 --- a/tests/qemuxml2argvdata/hugepages-numa.args +++ b/tests/qemuxml2argvdata/hugepages-numa.args @@ -8,15 +8,11 @@ QEMU_AUDIO_DRV=3Dspice \ -name fedora \ -S \ -machine pc-i440fx-2.3,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ +-m 1024 \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -mem-prealloc \ -mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ -numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \ --object memory-backend-file,id=3Dmemdimm0,prealloc=3Dyes,\ -mem-path=3D/dev/hugepages1G/libvirt/qemu/-1-fedora,size=3D1073741824,\ -host-nodes=3D1-3,policy=3Dbind \ --device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -no-user-config \ -nodefaults \ diff --git a/tests/qemuxml2argvdata/hugepages-numa.xml b/tests/qemuxml2argv= data/hugepages-numa.xml index eef471b4ec..d3c6308be0 100644 --- a/tests/qemuxml2argvdata/hugepages-numa.xml +++ b/tests/qemuxml2argvdata/hugepages-numa.xml @@ -1,7 +1,6 @@ fedora 63840878-0deb-4095-97e6-fc444d9bc9fa - 1099511627776 1572863 1048576 @@ -97,15 +96,5 @@
- - - 1-3 - 1048576 - - - 1048576 - 0 - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cfebf364fb..1631663bc6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -968,6 +968,8 @@ mymain(void) QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_REDIR, + QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST("hugepages-numa-default-dimm", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-pages", diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml b/tes= ts/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml new file mode 120000 index 0000000000..8fa2b323aa --- /dev/null +++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/hugepages-numa-default-dimm.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ff6e611421..a943975ada 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -330,6 +330,7 @@ mymain(void) DO_TEST("pmu-feature-off", NONE); =20 DO_TEST("hugepages-default", NONE); + DO_TEST("hugepages-numa-default-dimm", NONE); DO_TEST("hugepages-pages", NONE); DO_TEST("hugepages-pages2", NONE); DO_TEST("hugepages-pages3", NONE); --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed May 1 23:09:49 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; 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 1533818350799979.4963368120688; Thu, 9 Aug 2018 05:39:10 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B7B0FECD; Thu, 9 Aug 2018 12:39:08 +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 3D71C2010CC1; Thu, 9 Aug 2018 12:39:08 +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 CA2B0181ABDF; Thu, 9 Aug 2018 12:39:07 +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 w79CctZA002798 for ; Thu, 9 Aug 2018 08:38:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8A1EC2166BA8; Thu, 9 Aug 2018 12:38:55 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 281AF2166BA2 for ; Thu, 9 Aug 2018 12:38:55 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Aug 2018 14:38:35 +0200 Message-Id: <73e9cea1c5c602df6c3f0107d85f3950aa5b5b7f.1533818183.git.phrdina@redhat.com> 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 03/20] tests: rename hugepages-numa into hugepages-numa-default 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.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 09 Aug 2018 12:39:09 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- .../{hugepages-numa.args =3D> hugepages-numa-default.args} | 0 .../{hugepages-numa.xml =3D> hugepages-numa-default.xml} | 0 tests/qemuxml2argvtest.c | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename tests/qemuxml2argvdata/{hugepages-numa.args =3D> hugepages-numa-def= ault.args} (100%) rename tests/qemuxml2argvdata/{hugepages-numa.xml =3D> hugepages-numa-defa= ult.xml} (100%) diff --git a/tests/qemuxml2argvdata/hugepages-numa.args b/tests/qemuxml2arg= vdata/hugepages-numa-default.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa.args rename to tests/qemuxml2argvdata/hugepages-numa-default.args diff --git a/tests/qemuxml2argvdata/hugepages-numa.xml b/tests/qemuxml2argv= data/hugepages-numa-default.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa.xml rename to tests/qemuxml2argvdata/hugepages-numa-default.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1631663bc6..0c311e0906 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -961,7 +961,7 @@ mymain(void) DO_TEST("pmu-feature-off", NONE); =20 DO_TEST("hugepages-default", NONE); - DO_TEST("hugepages-numa", + DO_TEST("hugepages-numa-default", QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_ICH9_USB_EHCI1, --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed May 1 23:09:49 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; 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 1533818355022170.35623106280275; Thu, 9 Aug 2018 05:39:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CAAFC308403A; Thu, 9 Aug 2018 12:39:12 +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 930AB17D52; Thu, 9 Aug 2018 12:39:12 +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 40DF9181ABE5; Thu, 9 Aug 2018 12:39:12 +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 w79Ccul7002803 for ; Thu, 9 Aug 2018 08:38:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 37FA22166BA8; 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 CA57D2166BA2 for ; Thu, 9 Aug 2018 12:38:55 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Aug 2018 14:38:36 +0200 Message-Id: <8b42a46937a249f28b30d184c7198e29581f9d25.1533818183.git.phrdina@redhat.com> 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 04/20] tests: remove unnecessary XML elements from hugepages-numa-default 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 09 Aug 2018 12:39:13 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- .../hugepages-numa-default.args | 42 ++--------- .../hugepages-numa-default.xml | 74 +------------------ tests/qemuxml2argvtest.c | 6 -- 3 files changed, 7 insertions(+), 115 deletions(-) diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qem= uxml2argvdata/hugepages-numa-default.args index 20c7802fd8..cc2223aee1 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default.args @@ -3,7 +3,7 @@ PATH=3D/bin \ HOME=3D/home/test \ USER=3Dtest \ LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dspice \ +QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ -name fedora \ -S \ @@ -14,46 +14,14 @@ QEMU_AUDIO_DRV=3Dspice \ -mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ -numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-display none \ -no-user-config \ -nodefaults \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-fedora/monitor.= sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc,driftfix=3Dslew \ --no-hpet \ +-rtc base=3Dutc \ -no-shutdown \ --global PIIX4_PM.disable_s3=3D1 \ --global PIIX4_PM.disable_s4=3D1 \ +-no-acpi \ -boot c \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x6.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,\ -addr=3D0x6 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x6.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x6.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x5 \ --drive file=3D/var/lib/libvirt/images/fedora.qcow2,format=3Dqcow2,if=3Dnon= e,\ -id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0 \ --drive if=3Dnone,id=3Ddrive-ide0-0-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --chardev socket,id=3Dcharchannel0,\ -path=3D/var/lib/libvirt/qemu/channel/target/fedora.org.qemu.guest_agent.0,= server,\ -nowait \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ -id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ --chardev spicevmc,id=3Dcharchannel1,name=3Dvdagent \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 1,\ -id=3Dchannel1,name=3Dcom.redhat.spice.0 \ --device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ --spice port=3D5901,tls-port=3D5902,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice \ --vga qxl \ --global qxl-vga.ram_size=3D67108864 \ --global qxl-vga.vram_size=3D67108864 \ --device intel-hda,id=3Dsound0,bus=3Dpci.0,addr=3D0x4 \ --device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0 \ --chardev spicevmc,id=3Dcharredir0,name=3Dusbredir \ --device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D2 \ --chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ --device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D3 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 +-usb diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.xml b/tests/qemu= xml2argvdata/hugepages-numa-default.xml index d3c6308be0..6bbd80d515 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-default.xml @@ -11,90 +11,20 @@ hvm - - - - - - - - - - destroy restart restart - - - - /usr/bin/qemu-system-x86_64 - - - - -
- - - - - -
- - -
- - - -
- - - -
- - - -
- + - -
- - -
- - - - -
- - - -
- - - - -
- -