On Fri, Jun 11, 2021 at 15:24:12 +0200, Pavel Hrdina wrote: > The pc-1.0 machine type was deprecated in QEMU 6.0.0. In our tests we > use 2.12.0 and 6.1.0 replies so switch to pc-i440fx-2.12 type. > > Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> > --- > tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args | 2 +- > tests/qemuxml2argvdata/launch-security-sev.xml | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args > index 4e281e2e59..40f79d377b 100644 > --- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args > +++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args > @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \ > -name guest=QEMUGuest1,debug-threads=on \ > -S \ > -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ > --machine pc-1.0,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \ > +-machine pc-i440fx-2.12,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \ > -m 214 \ > -realtime mlock=off \ > -smp 1,sockets=1,cores=1,threads=1 \ > diff --git a/tests/qemuxml2argvdata/launch-security-sev.xml b/tests/qemuxml2argvdata/launch-security-sev.xml > index b73defd6ee..0a0e35812d 100644 > --- a/tests/qemuxml2argvdata/launch-security-sev.xml > +++ b/tests/qemuxml2argvdata/launch-security-sev.xml > @@ -5,7 +5,7 @@ > <currentMemory unit='KiB'>219100</currentMemory> > <vcpu placement='static'>1</vcpu> > <os> > - <type arch='x86_64' machine='pc-1.0'>hvm</type> > + <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> Another option is to just use 'pc' here. It will get auto-filled to 2.12 since it's used by DO_TEST_CAPS_VER and the advantage is that any further invocation will also pick a more modern machine type. Reviewed-by: Peter Krempa <pkrempa@xxxxxxxxxx>
