External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-26 13:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml: Purge prehistoric machine type 'pc-0.13' from "latest" tests

Browse Source 
Remove the old machine type which will be dropped in the upcomming
qemu-5.0 release from tests used against the most recent capabilities
data.

None of the modified tests really cares about the actual machine type.

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:17:28 +01:00
parent ec0db69c86
commit 30518a3b6a
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuxml2argvdata/disk-cdrom-tray.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-cdrom-tray.x86_64-2.12.0.args
View File

@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-test/master-key.aes \ file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc-i440fx-2.12,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-cdrom-tray.x86_64-latest.args
View File

@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-test/master-key.aes \ file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu64 \ -cpu qemu64 \
-m 1024 \ -m 1024 \
-overcommit mem-lock=off \ -overcommit mem-lock=off \

2
tests/qemuxml2argvdata/disk-cdrom-tray.xml
View File

@ -5,7 +5,7 @@
<currentMemory>1048576</currentMemory> <currentMemory>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-copy_on_read.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-copy_on_read.x86_64-2.12.0.args
View File

@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-test/master-key.aes \ file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc-i440fx-2.12,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-copy_on_read.x86_64-latest.args
View File

@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-test/master-key.aes \ file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu64 \ -cpu qemu64 \
-m 1024 \ -m 1024 \
-overcommit mem-lock=off \ -overcommit mem-lock=off \

2
tests/qemuxml2argvdata/disk-copy_on_read.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-detect-zeroes.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-detect-zeroes.x86_64-2.12.0.args
View File

@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-test/master-key.aes \ file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc-i440fx-2.12,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-detect-zeroes.x86_64-latest.args
View File

@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-test/master-key.aes \ file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu64 \ -cpu qemu64 \
-m 1024 \ -m 1024 \
-overcommit mem-lock=off \ -overcommit mem-lock=off \

2
tests/qemuxml2argvdata/disk-detect-zeroes.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/vhost-vsock.x86_64-latest.args
View File

@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-object secret,id=masterKey0,format=raw,\ -object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-test/master-key.aes \ file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu64 \ -cpu qemu64 \
-m 1024 \ -m 1024 \
-overcommit mem-lock=off \ -overcommit mem-lock=off \

2
tests/qemuxml2argvdata/vhost-vsock.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='hd'/> <boot dev='hd'/>
<bootmenu enable='yes'/> <bootmenu enable='yes'/>
</os> </os>

2
tests/qemuxml2xmloutdata/disk-copy_on_read.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'/>