[PATCH 2/7] qemuxmlconftest: x86_64: Drop explicit use of '2.12' machine type

From: Peter Krempa <pkrempa(a)redhat.com&gt; New qemu will be deprecating them. Drop the use from test files not depending on the actual machine type. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tpm-emulator-crb-profile.xml | 2 +- tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml | 2 +- .../qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml | 2 +- tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tpm-emulator-tpm2.xml | 2 +- tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tpm-emulator.xml | 2 +- tests/qemuxmlconfdata/tpm-external.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tpm-external.xml | 2 +- tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tpm-passthrough-crb.xml | 2 +- tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tpm-passthrough.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args index 7e2fb83a98..6dd97dfbe7 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \ -name guest=TPM-VM,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.xml b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.xml index 40224f43a7..522ccc516d 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.xml +++ b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>512288</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args index e79552a603..9ff9ac0db2 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \ -name guest=TPM-VM,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml index e0c657645d..e6746d5739 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>512288</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args index e79552a603..9ff9ac0db2 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \ -name guest=TPM-VM,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml index 42e93cfcbe..6569b5e4dd 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>512288</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args index e79552a603..9ff9ac0db2 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \ -name guest=TPM-VM,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml index 3d6300f544..bf780a6597 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>512288</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args index e79552a603..9ff9ac0db2 100644 --- a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \ -name guest=TPM-VM,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/tpm-emulator.xml b/tests/qemuxmlconfdata/tpm-emulator.xml index b98a3693b7..a7e6ec7159 100644 --- a/tests/qemuxmlconfdata/tpm-emulator.xml +++ b/tests/qemuxmlconfdata/tpm-emulator.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>512288</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args index f181cc2fa4..5ddf21a4c7 100644 --- a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \ -name guest=TPM-VM,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/tpm-external.xml b/tests/qemuxmlconfdata/tpm-external.xml index c8f9c72b1f..92af4a375c 100644 --- a/tests/qemuxmlconfdata/tpm-external.xml +++ b/tests/qemuxmlconfdata/tpm-external.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>512288</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args index 96da874a6b..cd210b50a0 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \ -name guest=TPM-VM,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.xml b/tests/qemuxmlconfdata/tpm-passthrough-crb.xml index 47c622bd84..c2cf153647 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough-crb.xml +++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>512288</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args index 970869eaec..cab016b666 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \ -name guest=TPM-VM,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-TPM-VM/master-key.aes"}' \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ -accel tcg \ -cpu qemu64 \ -m size=2097152k \ diff --git a/tests/qemuxmlconfdata/tpm-passthrough.xml b/tests/qemuxmlconfdata/tpm-passthrough.xml index 1555de4e86..fe8de6cfe5 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough.xml +++ b/tests/qemuxmlconfdata/tpm-passthrough.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>512288</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <bootmenu enable='yes'/> </os> -- 2.49.0