[PATCH 1/4] qemuxml2argvdata: disk-cdrom-network: Remove specific machine type

The test doesn't depend on a specific machine type. The test uses a machine type which is becoming deprecated so it would break the _LATEST version of the test once we update the qemu data. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/qemuxml2argvdata/disk-cdrom-network.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-network.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args index 794fdecdcb..53940d0076 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.args @@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,accel=kvm,usb=off,dump-guest-core=off \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args index fa5c0ba087..ce885cb98a 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,accel=kvm,usb=off,dump-guest-core=off \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 3c4f3993f6..01444abcfe 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.xml b/tests/qemuxml2argvdata/disk-cdrom-network.xml index 18a56f7156..14872d8889 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.xml +++ b/tests/qemuxml2argvdata/disk-cdrom-network.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-1.2'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> <features> -- 2.29.2