From nobody Mon Feb 9 01:06:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1621243084; cv=none; d=zohomail.com; s=zohoarc; b=CXcJ79RX0NpkfnVbm2kDDk8fS9d7StHnpec9xt9gDbbCM4MPhNu8+LqrUZDB5h2IXNOTa3vAJjg/nmv4VaHOGhoSqn/HIpaCkW2YB+bPFlJvd/q1BnQ0c1CCkMWus9ouS41aPweXffqt5f48iYbvPCyzXdZeiqOntTTYR7aKX7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621243084; 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=cYMk2zDtmSP+M245QjstwrU+mSqm89t4aNjAiWaVA54=; b=VSamOpemM1/ov5seUMSoY+4kG2PnIIt/doKkoE/gqlr9Q+L4wpUavu5kMegILKol5eueL+4hR8Q47ZesUwoKDEqcZGbiPM8wJfcJsQ+9Hi4Rlg2HCtncoytqD8Sb3+1Vq2Np1d72PYDZv4Zw2e/ErDHnxpkV/I+XMkv5y6yyl9k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162124308466559.20023759907417; Mon, 17 May 2021 02:18:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-354-7uTkAoAiOuqpGEd-Fd0idg-1; Mon, 17 May 2021 05:17:07 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 500EF1966327; Mon, 17 May 2021 09:17:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2DB275F9B8; Mon, 17 May 2021 09:17:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ECD2255353; Mon, 17 May 2021 09:17:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14H9GfQ8029694 for ; Mon, 17 May 2021 05:16:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2104D10023AB; Mon, 17 May 2021 09:16:41 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FFA3100AE43 for ; Mon, 17 May 2021 09:16:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621243083; 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=cYMk2zDtmSP+M245QjstwrU+mSqm89t4aNjAiWaVA54=; b=W+fifT5GdOdZtyqFgC9AJzycvzrfysLsgLW/lUOHD8hPv9t0E/CEKNL3CEKkMhCZDBmgRR FvTDCG6Hvx1GkE5KPEYWM4NH6IJinUlpmcPPTNdZ5qTPRNVXiUSz8Jcnjg0A2PLokITczL 5z+8FrRl7kIi5QaMZ9GIe+WJnSiwR2c= X-MC-Unique: 7uTkAoAiOuqpGEd-Fd0idg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/4] tests: qemucapabilities: Add test-data for the qemu-6.1 cycle Date: Mon, 17 May 2021 11:16:35 +0200 Message-Id: <2d2c6075dcfa56e17e958c2c363de1679bcfb7c2.1621242770.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add test data based on qemu commit v6.0.0-540-g6005ee07c3. Notable changes are the removal of 'sheepdog' disk storage protocol. Additionally the cpu model reported when probing seems to have changed from: "model-id": "AMD Ryzen 9 3900X 12-Core Processor " to: "model-id": "QEMU TCG CPU version 2.5+" despite building on the same machine. This probably also results in the 2 test changes in the CPU definition which popped up in this update. Signed-off-by: Peter Krempa --- Note that this commit is snipped. See cover letter on where to fetch the full version. .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 208 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 211 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 208 + .../caps_6.1.0.x86_64.replies | 32734 ++++++++++++++++ .../caps_6.1.0.x86_64.xml | 3339 ++ .../cpu-tsc-high-frequency.x86_64-latest.args | 2 +- .../hugepages-memaccess3.x86_64-latest.args | 2 +- 7 files changed, 36702 insertions(+), 2 deletions(-) create mode 100644 tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_6.1.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-q35.x86_64.xml new file mode 100644 index 0000000000..95291c8430 --- /dev/null +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -0,0 +1,208 @@ + + /usr/bin/qemu-system-x86_64 + kvm + pc-q35-6.1 + x86_64 + + + + + bios + efi + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/AAVMF/AAVMF32_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + yes + no + + + + + + + on + off + + + + + on + off + + + + EPYC-Rome + AMD + + + + + + + + + + + + + + + + + + + + + + qemu64 + qemu32 + phenom + pentium3 + pentium2 + pentium + n270 + kvm64 + kvm32 + coreduo + core2duo + athlon + Westmere-IBRS + Westmere + Snowridge + Skylake-Server-noTSX-IBRS + Skylake-Server-IBRS + Skylake-Server + Skylake-Client-noTSX-IBRS + Skylake-Client-IBRS + Skylake-Client + SandyBridge-IBRS + SandyBridge + Penryn + Opteron_G5 + Opteron_G4 + Opteron_G3 + Opteron_G2 + Opteron_G1 + Nehalem-IBRS + Nehalem + IvyBridge-IBRS + IvyBridge + Icelake-Server-noTSX + Icelake-Server + Icelake-Client-noTSX + Icelake-Client + Haswell-noTSX-IBRS + Haswell-noTSX + Haswell-IBRS + Haswell + EPYC-Rome + EPYC-Milan + EPYC-IBPB + EPYC + Dhyana + Cooperlake + Conroe + Cascadelake-Server-noTSX + Cascadelake-Server + Broadwell-noTSX-IBRS + Broadwell-noTSX + Broadwell-IBRS + Broadwell + 486 + + + + + + disk + cdrom + floppy + lun + + + fdc + scsi + virtio + usb + sata + + + virtio + virtio-transitional + virtio-non-transitional + + + + + sdl + vnc + spice + egl-headless + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + vfio + + + + + virtio + virtio-transitional + virtio-non-transitional + + + random + egd + builtin + + + + + + + + + + + + diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-tcg.x86_64.xml new file mode 100644 index 0000000000..4e19eea365 --- /dev/null +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -0,0 +1,211 @@ + + /usr/bin/qemu-system-x86_64 + qemu + pc-i440fx-6.1 + x86_64 + + + + + bios + efi + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/AAVMF/AAVMF32_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + no + + + + + + + + on + off + + + + EPYC + AMD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + qemu64 + qemu32 + phenom + pentium3 + pentium2 + pentium + n270 + kvm64 + kvm32 + coreduo + core2duo + athlon + Westmere-IBRS + Westmere + Snowridge + Skylake-Server-noTSX-IBRS + Skylake-Server-IBRS + Skylake-Server + Skylake-Client-noTSX-IBRS + Skylake-Client-IBRS + Skylake-Client + SandyBridge-IBRS + SandyBridge + Penryn + Opteron_G5 + Opteron_G4 + Opteron_G3 + Opteron_G2 + Opteron_G1 + Nehalem-IBRS + Nehalem + IvyBridge-IBRS + IvyBridge + Icelake-Server-noTSX + Icelake-Server + Icelake-Client-noTSX + Icelake-Client + Haswell-noTSX-IBRS + Haswell-noTSX + Haswell-IBRS + Haswell + EPYC-Rome + EPYC-Milan + EPYC-IBPB + EPYC + Dhyana + Cooperlake + Conroe + Cascadelake-Server-noTSX + Cascadelake-Server + Broadwell-noTSX-IBRS + Broadwell-noTSX + Broadwell-IBRS + Broadwell + 486 + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + usb + sata + + + virtio + virtio-transitional + virtio-non-transitional + + + + + sdl + vnc + spice + egl-headless + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + vfio + + + + + virtio + virtio-transitional + virtio-non-transitional + + + random + egd + builtin + + + + + + + + + + + + diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.1.0.x86_64.xml new file mode 100644 index 0000000000..b6fb64891c --- /dev/null +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -0,0 +1,208 @@ + + /usr/bin/qemu-system-x86_64 + kvm + pc-i440fx-6.1 + x86_64 + + + + + bios + efi + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/AAVMF/AAVMF32_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + no + + + + + + + on + off + + + + + on + off + + + + EPYC-Rome + AMD + + + + + + + + + + + + + + + + + + + + + + qemu64 + qemu32 + phenom + pentium3 + pentium2 + pentium + n270 + kvm64 + kvm32 + coreduo + core2duo + athlon + Westmere-IBRS + Westmere + Snowridge + Skylake-Server-noTSX-IBRS + Skylake-Server-IBRS + Skylake-Server + Skylake-Client-noTSX-IBRS + Skylake-Client-IBRS + Skylake-Client + SandyBridge-IBRS + SandyBridge + Penryn + Opteron_G5 + Opteron_G4 + Opteron_G3 + Opteron_G2 + Opteron_G1 + Nehalem-IBRS + Nehalem + IvyBridge-IBRS + IvyBridge + Icelake-Server-noTSX + Icelake-Server + Icelake-Client-noTSX + Icelake-Client + Haswell-noTSX-IBRS + Haswell-noTSX + Haswell-IBRS + Haswell + EPYC-Rome + EPYC-Milan + EPYC-IBPB + EPYC + Dhyana + Cooperlake + Conroe + Cascadelake-Server-noTSX + Cascadelake-Server + Broadwell-noTSX-IBRS + Broadwell-noTSX + Broadwell-IBRS + Broadwell + 486 + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + usb + sata + + + virtio + virtio-transitional + virtio-non-transitional + + + + + sdl + vnc + spice + egl-headless + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + vfio + + + + + virtio + virtio-transitional + virtio-non-transitional + + + random + egd + builtin + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.1.0.x86_64.replies new file mode 100644 index 0000000000..186cf4c1ee --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies @@ -0,0 +1,32734 @@ +{ + "execute": "qmp_capabilities", [SNIPPED] diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args index 1200f0ac67..c39817af98 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no= =3Don,pschange-mc-no=3Don,invtsc=3Don,tsc-frequency=3D4567890000 \ +-cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no= =3Don,pschange-mc-no=3Don,svm=3Doff,npt=3Doff,nrip-save=3Doff,invtsc=3Don,t= sc-frequency=3D4567890000 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index e111d3e834..f6c5e116d8 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ -machine pc-i440fx-2.9,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ --cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no= =3Don,pschange-mc-no=3Don \ +-cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no= =3Don,pschange-mc-no=3Don,svm=3Doff,npt=3Doff,nrip-save=3Doff \ -m 4096 \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/= hugepages2M/libvirt/qemu/-1-fedora","share":true,"x-use-canonical-path-for-= ramblock-id":false,"prealloc":true,"size":4294967296}' \ -overcommit mem-lock=3Doff \ --=20 2.30.2