From 1dc9941c5aa7fb921a1f868669b12108b477f572 Mon Sep 17 00:00:00 2001 Message-Id: <1dc9941c5aa7fb921a1f868669b12108b477f572@dist-git> From: Pavel Hrdina Date: Mon, 13 Aug 2018 18:16:07 +0200 Subject: [PATCH] tests: remove unnecessary XML elements from hugepages-numa-default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pavel Hrdina (cherry picked from commit 335c4a5e26b23d4dcb86ede5a43c5bb8a68b604e) Conflicts: tests/qemuxml2argvdata/hugepages-numa-default.args - missing upstream commit Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1591235 Signed-off-by: Pavel Hrdina Reviewed-by: Ján Tomko --- .../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/qemuxml2argvdata/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=/bin \ HOME=/home/test \ USER=test \ LOGNAME=test \ -QEMU_AUDIO_DRV=spice \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name fedora \ -S \ @@ -14,46 +14,14 @@ QEMU_AUDIO_DRV=spice \ -mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-display none \ -no-user-config \ -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fedora/monitor.sock,\ server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc,driftfix=slew \ --no-hpet \ +-rtc base=utc \ -no-shutdown \ --global PIIX4_PM.disable_s3=1 \ --global PIIX4_PM.disable_s4=1 \ +-no-acpi \ -boot c \ --device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x6.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\ -addr=0x6 \ --device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x6.0x1 \ --device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x6.0x2 \ --device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x5 \ --drive file=/var/lib/libvirt/images/fedora.qcow2,format=qcow2,if=none,\ -id=drive-virtio-disk0 \ --device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,\ -id=virtio-disk0 \ --drive if=none,id=drive-ide0-0-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --chardev socket,id=charchannel0,\ -path=/var/lib/libvirt/qemu/channel/target/fedora.org.qemu.guest_agent.0,server,\ -nowait \ --device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ -id=channel0,name=org.qemu.guest_agent.0 \ --chardev spicevmc,id=charchannel1,name=vdagent \ --device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\ -id=channel1,name=com.redhat.spice.0 \ --device usb-tablet,id=input0,bus=usb.0,port=1 \ --spice port=5901,tls-port=5902,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice \ --vga qxl \ --global qxl-vga.ram_size=67108864 \ --global qxl-vga.vram_size=67108864 \ --device intel-hda,id=sound0,bus=pci.0,addr=0x4 \ --device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \ --chardev spicevmc,id=charredir0,name=usbredir \ --device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \ --chardev spicevmc,id=charredir1,name=usbredir \ --device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=3 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8 +-usb diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.xml b/tests/qemuxml2argvdata/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 - - - - -
- - - - - -
- - -
- - - -
- - - -
- - - -
- + - -
- - -
- - - - -
- - - -
- - - - -
- -