From nobody Sun Feb  8 23:58:51 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: <libvir-list-bounces@redhat.com>
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 <libvir-list@listman.util.phx.redhat.com>;
	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 <libvir-list@redhat.com>; Thu,  9 Aug 2018 12:38:55 +0000 (UTC)
From: Pavel Hrdina <phrdina@redhat.com>
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: <cover.1533818183.git.phrdina@redhat.com>
References: <cover.1533818183.git.phrdina@redhat.com>
In-Reply-To: <cover.1533818183.git.phrdina@redhat.com>
References: <cover.1533818183.git.phrdina@redhat.com>
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
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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 <phrdina@redhat.com>
---
 .../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 @@
     <type arch=3D'x86_64' machine=3D'pc-i440fx-2.3'>hvm</type>
     <boot dev=3D'hd'/>
   </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
   <cpu>
     <numa>
       <cell id=3D'0' cpus=3D'0-1' memory=3D'1048576' unit=3D'KiB'/>
     </numa>
   </cpu>
-  <clock offset=3D'utc'>
-    <timer name=3D'rtc' tickpolicy=3D'catchup'/>
-    <timer name=3D'pit' tickpolicy=3D'delay'/>
-    <timer name=3D'hpet' present=3D'no'/>
-  </clock>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
-  <pm>
-    <suspend-to-mem enabled=3D'no'/>
-    <suspend-to-disk enabled=3D'no'/>
-  </pm>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type=3D'file' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'qcow2'/>
-      <source file=3D'/var/lib/libvirt/images/fedora.qcow2'/>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
-    </disk>
-    <disk type=3D'block' device=3D'cdrom'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <readonly/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x7'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci1'>
-      <master startport=3D'0'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0' multifunction=3D'on'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci2'>
-      <master startport=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci3'>
-      <master startport=3D'4'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x2'/>
-    </controller>
+    <controller type=3D'usb' index=3D'0'/>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <controller type=3D'ide' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'virtio-serial' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
-    </controller>
-    <channel type=3D'unix'>
-      <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target/f=
edora.org.qemu.guest_agent.0'/>
-      <target type=3D'virtio' name=3D'org.qemu.guest_agent.0'/>
-      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
-    </channel>
-    <channel type=3D'spicevmc'>
-      <target type=3D'virtio' name=3D'com.redhat.spice.0'/>
-      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
-    </channel>
-    <input type=3D'tablet' bus=3D'usb'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
-    <graphics type=3D'spice' autoport=3D'yes'/>
-    <sound model=3D'ich6'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
-    </sound>
-    <video>
-      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </video>
-    <redirdev bus=3D'usb' type=3D'spicevmc'>
-    </redirdev>
-    <redirdev bus=3D'usb' type=3D'spicevmc'>
-    </redirdev>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08' f=
unction=3D'0x0'/>
-    </memballoon>
+    <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 0c311e0906..f36058272f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -962,12 +962,6 @@ mymain(void)
=20
     DO_TEST("hugepages-default", NONE);
     DO_TEST("hugepages-numa-default",
-            QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
-            QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_ICH9_USB_EHCI1,
-            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,
--=20
2.17.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list