From nobody Fri Oct 18 06:17:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693924040; cv=none; d=zohomail.com; s=zohoarc; b=NlumPCxxzF9esOK7hiKT7sKJkoM3ENsMIb6Yauxh1xUjbQF+INNHdoV88muDCfLWIXVnJcQLxDnQCvoMBKVh4BzBQw3l1CU/O8VwR3wgm0MxWMN1Se9nXOFl5Ib2FTuwqE6g9h6aaU/HS8aupgrrJESBmOPZc2mm9xHz8m/i5nA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924040; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nbjej+ReCraNE0NvVssje21ifOSVMYeV2pv3JzXpCnY=; b=WgdZfhUUlhFoXDE78x57PuLP/l/Jaic9aSFHcrqM4SwOS5s3u4HfRqRFPCtghyNAFypIdJi6As2flQ/8XZiMfv393ca9nLhEwPti/Vs7aIgTGBKrXygtnXQ5Jto3wULavMiprdXynO/nBUeaPo/FwNs3FTiFQFE9sWePYXGjrGE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1693924040318291.998169183084; Tue, 5 Sep 2023 07:27:20 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-38-JrNTHyNRMi-PmIyP7k0DtQ-1; Tue, 05 Sep 2023 10:25:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CFEE7927A39; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B08E82014E19; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 592E31946A6B; Tue, 5 Sep 2023 14:24:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 404121946A6D for ; Tue, 5 Sep 2023 14:24:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2FC38101325D; Tue, 5 Sep 2023 14:24:40 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FA251121314 for ; Tue, 5 Sep 2023 14:24:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924039; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nbjej+ReCraNE0NvVssje21ifOSVMYeV2pv3JzXpCnY=; b=grC1q/YByLK8KPH7YaWoSJsQ1NmQhv/AbX86jV7/SKWNWaulu3ALhZIrjbIRFV3PFBBice zFrqk5X7uG/bLJw9sFIF93oCUp1qJv6oc+1mQkPJ3LaVwl+5w1cqX6jxQNzWcv2+ayPVB1 0zlQQT76YEPRwrvd/umwkdWQMCAasFM= X-MC-Unique: JrNTHyNRMi-PmIyP7k0DtQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/51] qemuxml2argvtest: Use real caps for 'cpu-host-model-fallback' test case Date: Tue, 5 Sep 2023 16:23:44 +0200 Message-ID: <6d0cd548dcf9b776776b202edd61704071f9b7d6.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693924041438100003 Content-Type: text/plain; charset="utf-8" Similarly to 'cpu-host-model' add a real capability invocation for each version we support and remove the old fake caps invocation. Signed-off-by: Peter Krempa --- ...cpu-host-model-fallback.x86_64-4.2.0.args} | 7 ++-- .../cpu-host-model-fallback.x86_64-5.0.0.args | 33 ++++++++++++++++++ .../cpu-host-model-fallback.x86_64-5.1.0.args | 33 ++++++++++++++++++ .../cpu-host-model-fallback.x86_64-5.2.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-6.0.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-6.1.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-6.2.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-7.0.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-7.1.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-7.2.0.args | 34 +++++++++++++++++++ .../cpu-host-model-fallback.x86_64-8.0.0.args | 33 ++++++++++++++++++ ...cpu-host-model-fallback.x86_64-latest.args | 33 ++++++++++++++++++ tests/qemuxml2argvtest.c | 15 ++++++-- 13 files changed, 387 insertions(+), 5 deletions(-) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.args =3D> cpu-host-= model-fallback.x86_64-4.2.0.args} (63%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5= .0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5= .1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5= .2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6= .0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6= .1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6= .2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7= .0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7= .1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7= .2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8= .0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-l= atest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qe= muxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args similarity index 63% rename from tests/qemuxml2argvdata/cpu-host-model-fallback.args rename to tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args index 3d09b039f3..cf7ad7b5f4 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args @@ -10,9 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --cpu Conroe,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,mo= nitor=3Don,ds-cpl=3Don,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-= lm=3Don \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args new file mode 100644 index 0000000000..257b271386 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args new file mode 100644 index 0000000000..71551b51a3 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args new file mode 100644 index 0000000000..834d92c35a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3= dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args new file mode 100644 index 0000000000..611bf05482 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe= xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args new file mode 100644 index 0000000000..79ae00e993 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe= xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args new file mode 100644 index 0000000000..9c8331629a --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la= 57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe= xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,mis= alignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args new file mode 100644 index 0000000000..5929c9a87b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p= ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb= =3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-= chk=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args new file mode 100644 index 0000000000..141c2e36eb --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s= se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso= r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx= =3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p= ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb= =3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-= chk=3Don,misalignsse=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args new file mode 100644 index 0000000000..1e7f444d73 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do= n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,3d= nowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Doff,rdse= ed=3Doff,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,3dnowpr= efetch=3Doff,osvw=3Doff,topoext=3Doff,nrip-save=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.ar= gs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args new file mode 100644 index 0000000000..943b0d477b --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-8.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-accel tcg \ +-cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do= n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,fs= rm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgi= f=3Don,svme-addr-chk=3Don,vme=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,= fxsr-opt=3Doff,misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Do= ff,nrip-save=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args new file mode 100644 index 0000000000..135aed7287 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do= n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,= pks=3Don,fsrm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,x= saveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Dof= f,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,osvw=3Doff,top= oext=3Doff,nrip-save=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 840daab25a..6222b2edc5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1757,13 +1757,24 @@ mymain(void) DO_TEST_CAPS_VER("cpu-host-model", "7.2.0"); DO_TEST_CAPS_VER("cpu-host-model", "8.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "4.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.0.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.1.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.2.0"); + DO_TEST_CAPS_VER("cpu-host-model-fallback", "8.0.0"); + /* For this specific test we accept the increased likelihood of changes * if qemu updates the CPU model */ DO_TEST_CAPS_LATEST("cpu-host-model"); + DO_TEST_CAPS_LATEST("cpu-host-model-fallback"); DO_TEST_NOCAPS("cpu-host-model-vendor"); - DO_TEST_FULL("cpu-host-model-fallback", "", - ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS, ARG_END); DO_TEST_FULL("cpu-host-model-nofallback", "", ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE, ARG_END); --=20 2.41.0