External/libvirt
1
0
Fork 0
Code

tests: qemuxml: Remove prehistoric machine types from legacy tests

Browse Source 
None of the tests depend on anything that the machine type would
influence. This will allow us to drop the very old machine type from the
non-real-data tests. If something depends on the machine type it should
be tested with real data rather than this hack.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-01-23 10:39:47 +01:00
parent 0f73d707ea
commit de723a29a3
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuxml2argvdata/disk-discard.args
View File

@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \ /usr/bin/qemu-system-x86_64 \
-name test \ -name test \
-S \ -S \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \ -m 1024 \
-realtime mlock=off \ -realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

2
tests/qemuxml2argvdata/disk-discard.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-0.13'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/> <boot dev='cdrom'/>
<boot dev='hd'/> <boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>

2
tests/qemuxml2argvdata/disk-ioeventfd.args
View File

@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \ /usr/bin/qemu-system-x86_64 \
-name test \ -name test \
-S \ -S \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \ -m 1024 \
-realtime mlock=off \ -realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

2
tests/qemuxml2argvdata/disk-ioeventfd.xml
View File

@ -4,7 +4,7 @@
<memory unit='KiB'>1048576</memory> <memory unit='KiB'>1048576</memory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-0.13'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/> <boot dev='cdrom'/>
<boot dev='hd'/> <boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>

2
tests/qemuxml2argvdata/event_idx.args
View File

@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \ /usr/bin/qemu-system-x86_64 \
-name test \ -name test \
-S \ -S \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \ -m 1024 \
-realtime mlock=off \ -realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

2
tests/qemuxml2argvdata/event_idx.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-0.13'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/> <boot dev='cdrom'/>
<boot dev='hd'/> <boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>

2
tests/qemuxml2argvdata/video-device-pciaddr-default.args
View File

@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \ /usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \ -name QEMUGuest1 \
-S \ -S \
-machine pc-0.15,accel=kvm,usb=off,dump-guest-core=off \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 1024 \ -m 1024 \
-realtime mlock=off \ -realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

2
tests/qemuxml2argvdata/video-device-pciaddr-default.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-0.15'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2argvdata/virtio-lun.args
View File

@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \ /usr/bin/qemu-system-x86_64 \
-name test \ -name test \
-S \ -S \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \ -m 1024 \
-realtime mlock=off \ -realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \

2
tests/qemuxml2argvdata/virtio-lun.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-0.13'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/> <boot dev='cdrom'/>
<boot dev='hd'/> <boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>

2
tests/qemuxml2xmloutdata/disk-discard.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-0.13'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/> <boot dev='cdrom'/>
<boot dev='hd'/> <boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>

2
tests/qemuxml2xmloutdata/event_idx.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-0.13'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/> <boot dev='cdrom'/>
<boot dev='hd'/> <boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>

2
tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-0.15'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2xmloutdata/virtio-lun.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory> <currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc-0.13'>hvm</type> <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/> <boot dev='cdrom'/>
<boot dev='hd'/> <boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>