From 89c3f5c24c6a9d5847e2f17690619b49b56c211f Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 11 Mar 2025 07:41:08 +0000 Subject: [PATCH] import CS libvirt-10.10.0-7.el9 --- .gitignore | 2 +- .libvirt.metadata | 2 +- ...Bump-minimum-glib2-version-to-2.66.0.patch | 286 + ...nf-Adjust-hyperv-tlbflush-formatting.patch | 72 + ...irDomainHostdevInsert-to-return-void.patch | 158 + ...irect-and-extended-tlbflush-features.patch | 213 + ...t-almost-optional-for-type-vhostuser.patch | 170 + ...-refactor-hyperv-features-formatting.patch | 112 + ...libvirt-cpu_map-Add-486-v1-CPU-model.patch | 658 + ...virt-cpu_map-Add-Conroe-v1-CPU-model.patch | 684 + ...-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch | 869 + ...cpu_map-Add-KnightsMill-v1-CPU-model.patch | 1417 + ...-cpu_map-Add-Opteron_G1-v1-CPU-model.patch | 658 + ...-cpu_map-Add-Opteron_G2-v1-CPU-model.patch | 658 + ...-cpu_map-Add-Opteron_G3-v1-CPU-model.patch | 768 + ...-cpu_map-Add-Opteron_G4-v1-CPU-model.patch | 1097 + ...-cpu_map-Add-Opteron_G5-v1-CPU-model.patch | 1154 + ...virt-cpu_map-Add-Penryn-v1-CPU-model.patch | 684 + ...virt-cpu_map-Add-athlon-v1-CPU-model.patch | 879 + ...rt-cpu_map-Add-core2duo-v1-CPU-model.patch | 827 + ...irt-cpu_map-Add-coreduo-v1-CPU-model.patch | 814 + ...bvirt-cpu_map-Add-kvm32-v1-CPU-model.patch | 658 + ...bvirt-cpu_map-Add-kvm64-v1-CPU-model.patch | 658 + ...ibvirt-cpu_map-Add-n270-v1-CPU-model.patch | 840 + ...irt-cpu_map-Add-pentium-v1-CPU-model.patch | 658 + ...rt-cpu_map-Add-pentium2-v1-CPU-model.patch | 658 + ...rt-cpu_map-Add-pentium3-v1-CPU-model.patch | 658 + ...virt-cpu_map-Add-phenom-v1-CPU-model.patch | 950 + ...virt-cpu_map-Add-qemu32-v1-CPU-model.patch | 658 + ...virt-cpu_map-Add-qemu64-v1-CPU-model.patch | 658 + ...u_map-Sort-data-files-in-meson.build.patch | 73 + ...ackend-with-interface-type-vhostuser.patch | 139 + ...-differences-between-SLIRP-and-passt.patch | 177 + ...-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch | 69 + ...-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch | 47 + ...-Add-existing-flags-to-virCheckFlags.patch | 37 + ...irect-and-extended-tlbflush-features.patch | 108 + ...ingDestroyed-true-on-inactive-domain.patch | 124 - ...Enable-I-O-APIC-even-more-frequently.patch | 154 + ...bvirt-qemu-Enable-I-O-APIC-if-needed.patch | 61 + ...BLOCK_IO_ERROR-event-in-monitor-code.patch | 66 + ...vice-in-qemu-IO-error-event-handling.patch | 93 + ...n-of-guest-with-mdev-vGPU-to-VF-vGPU.patch | 76 + ...-virtio-for-interface-type-vhostuser.patch | 41 + ...roduce-QEMU_CAPS_BLOCKDEV_SET_ACTIVE.patch | 76 + ...emu-complete-vhostuser-passt-support.patch | 663 + ...-attribute-validation-in-qemu-driver.patch | 75 + ...deprecated-options-for-new-virtiofsd.patch | 128 - ...r-a-virStorageSource-before-using-it.patch | 85 + ...as-vhostuser-passt-but-no-shared-mem.patch | 203 + ...qemu-fill-capabilities-for-virtiofsd.patch | 208 - ...-guest-side-IP-address-for-type-vdpa.patch | 94 + ...ake-qemuPasstCreateSocketPath-public.patch | 51 + ...after-migration-if-VM-is-left-paused.patch | 139 + ...gration-allow-migration-for-virtiofs.patch | 52 - ...itor-backend-for-blockdev-set-active.patch | 160 + ...repareNVRAM-for-use-in-snapshot-code.patch | 109 + ...interface-types-during-update-device.patch | 106 + ...en-taking-inactive-internal-snapshot.patch | 94 + ...-only-if-parent-snapshot-is-external.patch | 71 + ...e-profile-name-for-transient-domains.patch | 73 + ...f-in-qemuProcessPrepareDomainNetwork.patch | 132 + ...nd-vdpa-interfaces-in-the-same-place.patch | 82 + ...iofs-cache-use-never-instead-of-none.patch | 49 - ...munge-reason-field-of-IO-error-event.patch | 139 + ...IOError-Propagate-new-qom-path-field.patch | 118 + ...ror-Log-IO-errors-in-the-VM-log-file.patch | 48 + ...I-O-error-reason-to-virStorageSource.patch | 55 + ...leIOError-Prefer-lookup-by-node-name.patch | 64 + ...or-to-extract-priv-instead-of-driver.patch | 76 + ...HandleIOError-Rename-local-variables.patch | 59 + ...EachQcow2-Don-t-initialize-nrollback.patch | 36 + ...n-Strip-acpi-from-s390-x-definitions.patch | 105 - ...ically-resume-domain-after-I-O-error.patch | 38 + ...post-copy-active-in-postcopy-recover.patch | 57 + ...r-qemuMigrationSrcRestoreDomainState.patch | 110 + ...or-the-qemu-10.0-dev-cycle-on-x86_64.patch | 54292 ++++++++++++++++ ....0_x86_64-to-v9.2.0-1636-gffaf7f0376.patch | 13228 ++++ ...with-writable-flag-in-disk-source-fd.patch | 164 + ...-for-the-ACPI-stripping-hack-on-s390.patch | 435 - ...itable-flag-for-passed-FDs-for-disks.patch | 71 + ...mages-with-empty-string-as-data_file.patch | 56 + ...de-modularize-the-local-file-backend.patch | 117 + ...ls_i386-Generate-missing-v1-variants.patch | 37 + ..._qemu_models_i386-Update-meson.build.patch | 68 + ...nf-adjust-test-case-to-new-virtiofsd.patch | 46 - ...stuser-add-virtiofsd-json-descriptor.patch | 69 - ...domain-status-before-parsing-its-CID.patch | 43 + ...-virNetDevOpenvswitchInterfaceSetQos.patch | 41 + ...nicalize-paths-before-comparing-them.patch | 55 + ...ntroduce-VIR_DOMAIN_MESSAGE_IOERRORS.patch | 210 + ...GetMessages-Refactor-using-GPtrArray.patch | 191 + ...s-for-storing-last-I-O-error-message.patch | 72 + ...image-with-empty-string-as-data_file.patch | 63 + ...idate-Allow-longer-list-of-CPU-flags.patch | 85 - ...t-virt-host-validate-Drop-extra-PASS.patch | 46 - ...en-trying-to-comprehend-serial-ports.patch | 97 - ...D-data-for-VMWare-Distributed-Switch.patch | 171 - ...lineInit-to-be-called-multiple-times.patch | 43 - SPECS/libvirt.spec | 269 +- 100 files changed, 91667 insertions(+), 1700 deletions(-) create mode 100644 SOURCES/libvirt-build-Bump-minimum-glib2-version-to-2.66.0.patch create mode 100644 SOURCES/libvirt-conf-Adjust-hyperv-tlbflush-formatting.patch create mode 100644 SOURCES/libvirt-conf-change-virDomainHostdevInsert-to-return-void.patch create mode 100644 SOURCES/libvirt-conf-docs-Add-support-for-direct-and-extended-tlbflush-features.patch create mode 100644 SOURCES/libvirt-conf-qemu-make-source-element-almost-optional-for-type-vhostuser.patch create mode 100644 SOURCES/libvirt-conf-refactor-hyperv-features-formatting.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-486-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-n270-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch create mode 100644 SOURCES/libvirt-cpu_map-Sort-data-files-in-meson.build.patch create mode 100644 SOURCES/libvirt-docs-document-using-passt-backend-with-interface-type-vhostuser.patch create mode 100644 SOURCES/libvirt-docs-improve-type-user-docs-to-higlight-differences-between-SLIRP-and-passt.patch create mode 100644 SOURCES/libvirt-include-libvirt-domain-Add-message-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch create mode 100644 SOURCES/libvirt-include-libvirt-domain-Reword-documentation-for-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch create mode 100644 SOURCES/libvirt-libxlDomainGetMessages-Add-existing-flags-to-virCheckFlags.patch create mode 100644 SOURCES/libvirt-qemu-Add-support-for-direct-and-extended-tlbflush-features.patch delete mode 100644 SOURCES/libvirt-qemu-Don-t-leave-beingDestroyed-true-on-inactive-domain.patch create mode 100644 SOURCES/libvirt-qemu-Enable-I-O-APIC-even-more-frequently.patch create mode 100644 SOURCES/libvirt-qemu-Enable-I-O-APIC-if-needed.patch create mode 100644 SOURCES/libvirt-qemu-Handle-quirks-of-device-field-of-BLOCK_IO_ERROR-event-in-monitor-code.patch create mode 100644 SOURCES/libvirt-qemu-Rename-diskAlias-to-device-in-qemu-IO-error-event-handling.patch create mode 100644 SOURCES/libvirt-qemu-allow-migration-of-guest-with-mdev-vGPU-to-VF-vGPU.patch create mode 100644 SOURCES/libvirt-qemu-automatically-set-model-type-virtio-for-interface-type-vhostuser.patch create mode 100644 SOURCES/libvirt-qemu-capabilies-Introduce-QEMU_CAPS_BLOCKDEV_SET_ACTIVE.patch create mode 100644 SOURCES/libvirt-qemu-complete-vhostuser-passt-support.patch create mode 100644 SOURCES/libvirt-qemu-do-all-vhostuser-attribute-validation-in-qemu-driver.patch delete mode 100644 SOURCES/libvirt-qemu-do-not-use-deprecated-options-for-new-virtiofsd.patch create mode 100644 SOURCES/libvirt-qemu-domain-Initialize-FD-passthrough-for-a-virStorageSource-before-using-it.patch create mode 100644 SOURCES/libvirt-qemu-fail-validation-if-a-domain-def-has-vhostuser-passt-but-no-shared-mem.patch delete mode 100644 SOURCES/libvirt-qemu-fill-capabilities-for-virtiofsd.patch create mode 100644 SOURCES/libvirt-qemu-fix-qemu-validation-to-forbid-guest-side-IP-address-for-type-vdpa.patch create mode 100644 SOURCES/libvirt-qemu-make-qemuPasstCreateSocketPath-public.patch create mode 100644 SOURCES/libvirt-qemu-migration-Reactivate-block-nodes-after-migration-if-VM-is-left-paused.patch delete mode 100644 SOURCES/libvirt-qemu-migration-allow-migration-for-virtiofs.patch create mode 100644 SOURCES/libvirt-qemu-monitor-Add-monitor-backend-for-blockdev-set-active.patch create mode 100644 SOURCES/libvirt-qemu-process-Export-qemuPrepareNVRAM-for-use-in-snapshot-code.patch create mode 100644 SOURCES/libvirt-qemu-re-use-existing-ActualNetDef-for-more-interface-types-during-update-device.patch create mode 100644 SOURCES/libvirt-qemu-snapshot-Ensure-that-NVRAM-image-exists-when-taking-inactive-internal-snapshot.patch create mode 100644 SOURCES/libvirt-qemu-snapshot-delete-disk-image-only-if-parent-snapshot-is-external.patch create mode 100644 SOURCES/libvirt-qemu-tpm-do-not-update-profile-name-for-transient-domains.patch create mode 100644 SOURCES/libvirt-qemu-use-switch-instead-of-if-in-qemuProcessPrepareDomainNetwork.patch create mode 100644 SOURCES/libvirt-qemu-validate-that-model-is-virtio-for-vhostuser-and-vdpa-interfaces-in-the-same-place.patch delete mode 100644 SOURCES/libvirt-qemu-virtiofs-cache-use-never-instead-of-none.patch create mode 100644 SOURCES/libvirt-qemuMonitorJSONHandleIOError-Do-not-munge-reason-field-of-IO-error-event.patch create mode 100644 SOURCES/libvirt-qemuMonitorJSONHandleIOError-Propagate-new-qom-path-field.patch create mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Log-IO-errors-in-the-VM-log-file.patch create mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Populate-I-O-error-reason-to-virStorageSource.patch create mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Prefer-lookup-by-node-name.patch create mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Refactor-to-extract-priv-instead-of-driver.patch create mode 100644 SOURCES/libvirt-qemuProcessHandleIOError-Rename-local-variables.patch create mode 100644 SOURCES/libvirt-qemuSnapshotForEachQcow2-Don-t-initialize-nrollback.patch delete mode 100644 SOURCES/libvirt-qemu_domain-Strip-acpi-from-s390-x-definitions.patch create mode 100644 SOURCES/libvirt-qemu_migration-Do-not-automatically-resume-domain-after-I-O-error.patch create mode 100644 SOURCES/libvirt-qemu_migration-Do-not-consider-post-copy-active-in-postcopy-recover.patch create mode 100644 SOURCES/libvirt-qemu_migration-Refactor-qemuMigrationSrcRestoreDomainState.patch create mode 100644 SOURCES/libvirt-qemucapabilitiestest-Add-data-for-the-qemu-10.0-dev-cycle-on-x86_64.patch create mode 100644 SOURCES/libvirt-qemucapabilitiestest-Update-caps_10.0.0_x86_64-to-v9.2.0-1636-gffaf7f0376.patch create mode 100644 SOURCES/libvirt-qemuxmlconftest-Add-testing-of-FDs-with-writable-flag-in-disk-source-fd.patch delete mode 100644 SOURCES/libvirt-qemuxmlconftest-Add-tests-for-the-ACPI-stripping-hack-on-s390.patch create mode 100644 SOURCES/libvirt-qemuxmlconftest-Allow-testing-of-the-writable-flag-for-passed-FDs-for-disks.patch create mode 100644 SOURCES/libvirt-storage_file-Refuse-qcow2-images-with-empty-string-as-data_file.patch create mode 100644 SOURCES/libvirt-storage_file-de-modularize-the-local-file-backend.patch create mode 100644 SOURCES/libvirt-sync_qemu_models_i386-Generate-missing-v1-variants.patch create mode 100644 SOURCES/libvirt-sync_qemu_models_i386-Update-meson.build.patch delete mode 100644 SOURCES/libvirt-tests-qemuxmlconf-adjust-test-case-to-new-virtiofsd.patch delete mode 100644 SOURCES/libvirt-tests-vhostuser-add-virtiofsd-json-descriptor.patch create mode 100644 SOURCES/libvirt-tools-ssh-proxy-Check-for-domain-status-before-parsing-its-CID.patch create mode 100644 SOURCES/libvirt-util-Fix-typo-in-virNetDevOpenvswitchInterfaceSetQos.patch create mode 100644 SOURCES/libvirt-utils-Canonicalize-paths-before-comparing-them.patch create mode 100644 SOURCES/libvirt-virDomainGetMessages-Introduce-VIR_DOMAIN_MESSAGE_IOERRORS.patch create mode 100644 SOURCES/libvirt-virDomainObjGetMessages-Refactor-using-GPtrArray.patch create mode 100644 SOURCES/libvirt-virStorageSource-Add-fields-for-storing-last-I-O-error-message.patch create mode 100644 SOURCES/libvirt-virstoragetest-Add-case-for-qcow2-image-with-empty-string-as-data_file.patch delete mode 100644 SOURCES/libvirt-virt-host-validate-Allow-longer-list-of-CPU-flags.patch delete mode 100644 SOURCES/libvirt-virt-host-validate-Drop-extra-PASS.patch delete mode 100644 SOURCES/libvirt-vmx-Be-even-more-lax-when-trying-to-comprehend-serial-ports.patch delete mode 100644 SOURCES/libvirt-vmx-Do-not-require-all-ID-data-for-VMWare-Distributed-Switch.patch delete mode 100644 SOURCES/libvirt-vsh-Allow-vshReadlineInit-to-be-called-multiple-times.patch diff --git a/.gitignore b/.gitignore index ce3d684..3f04786 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libvirt-10.5.0.tar.xz +SOURCES/libvirt-10.10.0.tar.xz diff --git a/.libvirt.metadata b/.libvirt.metadata index f46ae75..954575b 100644 --- a/.libvirt.metadata +++ b/.libvirt.metadata @@ -1 +1 @@ -345a0557aeca3b74afb7f048ff4e281782503a16 SOURCES/libvirt-10.5.0.tar.xz +7e76874bdcd1b220d90619c1ce7a876b6c9a8d78 SOURCES/libvirt-10.10.0.tar.xz diff --git a/SOURCES/libvirt-build-Bump-minimum-glib2-version-to-2.66.0.patch b/SOURCES/libvirt-build-Bump-minimum-glib2-version-to-2.66.0.patch new file mode 100644 index 0000000..d1f76c1 --- /dev/null +++ b/SOURCES/libvirt-build-Bump-minimum-glib2-version-to-2.66.0.patch @@ -0,0 +1,286 @@ +From 5e88ca84d3988e7943cace7b53cd1a249c55a99b Mon Sep 17 00:00:00 2001 +Message-ID: <5e88ca84d3988e7943cace7b53cd1a249c55a99b.1738940190.git.jdenemar@redhat.com> +From: Peter Krempa +Date: Mon, 27 Jan 2025 17:42:34 +0100 +Subject: [PATCH] build: Bump minimum glib2 version to 2.66.0 + +Per our supported platforms the minimum available versions are: + + CentOS Stream 9: 2.68.4 + Debian 11: 2.66.8 + Fedora 39: 2.78.6 + openSUSE Leap 15.6: 2.78.6 + Ubuntu 22.04: 2.72.4 + FreeBSD ports: 2.80.5 + macOS homebrew: 2.82.4 + macOS macports: 2.78.4 + +Bump to 2.66 which is limited by Debian 11. While ideally we'd bump to +2.68 which would give us 'g_strv_builder' and friends 2.66 is enough for +g_ptr_array_steal() which can be used to emulate the former with almost +no extra code. + +Signed-off-by: Peter Krempa +Reviewed-by: Pavel Hrdina +(cherry picked from commit 420c39d6bd66ccf4841878882f5a3e9e47103ebb) + +https://issues.redhat.com/browse/RHEL-77884 +--- + libvirt.spec.in | 2 +- + meson.build | 2 +- + src/libvirt_private.syms | 4 -- + src/qemu/qemu_agent.c | 2 +- + src/qemu/qemu_monitor.c | 2 +- + src/util/glibcompat.c | 94 ---------------------------------------- + src/util/glibcompat.h | 18 -------- + src/util/vireventglib.c | 12 ++--- + 8 files changed, 10 insertions(+), 126 deletions(-) + +diff --git a/meson.build b/meson.build +index 89ac1594cb..d3e2c939ea 100644 +--- a/meson.build ++++ b/meson.build +@@ -998,7 +998,7 @@ else + endif + endif + +-glib_version = '2.58.0' ++glib_version = '2.66.0' + glib_dep = dependency('glib-2.0', version: '>=' + glib_version) + gobject_dep = dependency('gobject-2.0', version: '>=' + glib_version) + if host_machine.system() == 'windows' +diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms +index c931003fad..43e2dfb9cd 100644 +--- a/src/libvirt_private.syms ++++ b/src/libvirt_private.syms +@@ -1871,10 +1871,6 @@ virStorageSourceUpdatePhysicalSize; + + + # util/glibcompat.h +-vir_g_fsync; +-vir_g_source_unref; +-vir_g_strdup_printf; +-vir_g_strdup_vprintf; + vir_g_string_replace; + + +diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c +index 22359f8518..43fca86f10 100644 +--- a/src/qemu/qemu_agent.c ++++ b/src/qemu/qemu_agent.c +@@ -448,7 +448,7 @@ qemuAgentUnregister(qemuAgent *agent) + { + if (agent->watch) { + g_source_destroy(agent->watch); +- vir_g_source_unref(agent->watch, agent->context); ++ g_source_unref(agent->watch); + agent->watch = NULL; + } + } +diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c +index 73f37d26eb..79bd91b539 100644 +--- a/src/qemu/qemu_monitor.c ++++ b/src/qemu/qemu_monitor.c +@@ -745,7 +745,7 @@ qemuMonitorUnregister(qemuMonitor *mon) + { + if (mon->watch) { + g_source_destroy(mon->watch); +- vir_g_source_unref(mon->watch, mon->context); ++ g_source_unref(mon->watch); + mon->watch = NULL; + } + } +diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c +index 98dcfab389..bcb666992a 100644 +--- a/src/util/glibcompat.c ++++ b/src/util/glibcompat.c +@@ -63,100 +63,6 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +-#undef g_fsync +-#undef g_strdup_printf +-#undef g_strdup_vprintf +- +- +-/* Drop when min glib >= 2.63.0 */ +-gint +-vir_g_fsync(gint fd) +-{ +-#ifdef G_OS_WIN32 +- return _commit(fd); +-#else +- return fsync(fd); +-#endif +-} +- +- +-/* Due to a bug in glib, g_strdup_printf() nor g_strdup_vprintf() +- * abort on OOM. It's fixed in glib's upstream. Provide our own +- * implementation until the fix gets distributed. */ +-char * +-vir_g_strdup_printf(const char *msg, ...) +-{ +- va_list args; +- char *ret; +- va_start(args, msg); +- ret = g_strdup_vprintf(msg, args); +- if (!ret) +- abort(); +- va_end(args); +- return ret; +-} +- +- +-char * +-vir_g_strdup_vprintf(const char *msg, va_list args) +-{ +- char *ret; +- ret = g_strdup_vprintf(msg, args); +- if (!ret) +- abort(); +- return ret; +-} +- +- +-/* +- * If the last reference to a GSource is released in a non-main +- * thread we're exposed to a race condition that causes a +- * crash: +- * +- * https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1358 +- * +- * Thus we're using an idle func to release our ref... +- * +- * ...but this imposes a significant performance penalty on +- * I/O intensive workloads which are sensitive to the iterations +- * of the event loop, so avoid the workaround if we know we have +- * new enough glib. +- * +- * The function below is used from a header file definition. +- * +- * Drop when min glib >= 2.64.0 +- */ +-#if GLIB_CHECK_VERSION(2, 64, 0) +-void vir_g_source_unref(GSource *src, GMainContext *ctx G_GNUC_UNUSED) +-{ +- g_source_unref(src); +-} +-#else +- +-static gboolean +-virEventGLibSourceUnrefIdle(gpointer data) +-{ +- GSource *src = data; +- +- g_source_unref(src); +- +- return FALSE; +-} +- +-void vir_g_source_unref(GSource *src, GMainContext *ctx) +-{ +- GSource *idle = g_idle_source_new(); +- +- g_source_set_callback(idle, virEventGLibSourceUnrefIdle, src, NULL); +- +- g_source_attach(idle, ctx); +- +- g_source_unref(idle); +-} +- +-#endif +- +- + /** + * Adapted (to pass syntax check) from 'g_string_replace' from + * glib-2.81.1. Drop once minimum glib is bumped to 2.68. +diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h +index 474ff95bc5..a3d01089e6 100644 +--- a/src/util/glibcompat.h ++++ b/src/util/glibcompat.h +@@ -42,24 +42,6 @@ + + #endif /* GLib < 2.67.0 */ + +- +-gint vir_g_fsync(gint fd); +-char *vir_g_strdup_printf(const char *msg, ...) +- G_GNUC_PRINTF(1, 2); +-char *vir_g_strdup_vprintf(const char *msg, va_list args) +- G_GNUC_PRINTF(1, 0); +- +-#if !GLIB_CHECK_VERSION(2, 64, 0) +-# define g_strdup_printf vir_g_strdup_printf +-# define g_strdup_vprintf vir_g_strdup_vprintf +-#endif +- +-#undef g_fsync +-#define g_fsync vir_g_fsync +- +-void vir_g_source_unref(GSource *src, GMainContext *ctx); +- +- + /* Drop once we require glib-2.68 at minimum */ + guint + vir_g_string_replace(GString *string, +diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c +index 023dc37445..6c54f62123 100644 +--- a/src/util/vireventglib.c ++++ b/src/util/vireventglib.c +@@ -213,7 +213,7 @@ virEventGLibHandleUpdate(int watch, + if (data->source != NULL) { + VIR_DEBUG("Removed old handle source=%p", data->source); + g_source_destroy(data->source); +- vir_g_source_unref(data->source, NULL); ++ g_source_unref(data->source); + } + + data->source = virEventGLibAddSocketWatch( +@@ -227,7 +227,7 @@ virEventGLibHandleUpdate(int watch, + + VIR_DEBUG("Removed old handle source=%p", data->source); + g_source_destroy(data->source); +- vir_g_source_unref(data->source, NULL); ++ g_source_unref(data->source); + data->source = NULL; + data->events = 0; + } +@@ -276,7 +276,7 @@ virEventGLibHandleRemove(int watch) + + if (data->source != NULL) { + g_source_destroy(data->source); +- vir_g_source_unref(data->source, NULL); ++ g_source_unref(data->source); + data->source = NULL; + data->events = 0; + } +@@ -409,7 +409,7 @@ virEventGLibTimeoutUpdate(int timer, + if (interval >= 0) { + if (data->source != NULL) { + g_source_destroy(data->source); +- vir_g_source_unref(data->source, NULL); ++ g_source_unref(data->source); + } + + data->interval = interval; +@@ -419,7 +419,7 @@ virEventGLibTimeoutUpdate(int timer, + goto cleanup; + + g_source_destroy(data->source); +- vir_g_source_unref(data->source, NULL); ++ g_source_unref(data->source); + data->source = NULL; + } + +@@ -468,7 +468,7 @@ virEventGLibTimeoutRemove(int timer) + + if (data->source != NULL) { + g_source_destroy(data->source); +- vir_g_source_unref(data->source, NULL); ++ g_source_unref(data->source); + data->source = NULL; + } + +-- +2.48.1 diff --git a/SOURCES/libvirt-conf-Adjust-hyperv-tlbflush-formatting.patch b/SOURCES/libvirt-conf-Adjust-hyperv-tlbflush-formatting.patch new file mode 100644 index 0000000..e2fc32d --- /dev/null +++ b/SOURCES/libvirt-conf-Adjust-hyperv-tlbflush-formatting.patch @@ -0,0 +1,72 @@ +From e34ac564b018b166a7d6f955f2abe80a9e62f07e Mon Sep 17 00:00:00 2001 +Message-ID: +From: Martin Kletzander +Date: Mon, 6 Jan 2025 16:11:01 +0100 +Subject: [PATCH] conf: Adjust hyperv tlbflush formatting +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 247357cc292a added support for direct and extended modes for +tlbflush, but forgot to do the formatting as well. + +Signed-off-by: Martin Kletzander +Signed-off-by: Ján Tomko +Reviewed-by: Martin Kletzander +(cherry picked from commit 9df14f51735eeb4221a25ccd408a2dccf0a35b59) + +https://issues.redhat.com/browse/RHEL-7122 + +Signed-off-by: Martin Kletzander +--- + src/conf/domain_conf.c | 11 ++++++++++- + tests/qemuxmlconfdata/hyperv.x86_64-latest.xml | 5 ++++- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index c8254d2146..1f0b67ca28 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -27974,7 +27974,6 @@ virDomainDefFormatFeatures(virBuffer *buf, + case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: + case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: +- case VIR_DOMAIN_HYPERV_TLBFLUSH: + case VIR_DOMAIN_HYPERV_IPI: + case VIR_DOMAIN_HYPERV_EVMCS: + case VIR_DOMAIN_HYPERV_AVIC: +@@ -28004,6 +28003,16 @@ virDomainDefFormatFeatures(virBuffer *buf, + } + break; + ++ case VIR_DOMAIN_HYPERV_TLBFLUSH: ++ if (def->hyperv_features[j] != VIR_TRISTATE_SWITCH_ON) ++ break; ++ ++ if (def->hyperv_tlbflush_direct == VIR_TRISTATE_SWITCH_ON) ++ virBufferAddLit(&hypervChildBuf, "\n"); ++ if (def->hyperv_tlbflush_extended == VIR_TRISTATE_SWITCH_ON) ++ virBufferAddLit(&hypervChildBuf, "\n"); ++ break; ++ + case VIR_DOMAIN_HYPERV_LAST: + break; + } +diff --git a/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml b/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml +index 36d9161fa8..49537188af 100644 +--- a/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml ++++ b/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml +@@ -22,7 +22,10 @@ + + + +- ++ ++ ++ ++ + + + +-- +2.47.1 diff --git a/SOURCES/libvirt-conf-change-virDomainHostdevInsert-to-return-void.patch b/SOURCES/libvirt-conf-change-virDomainHostdevInsert-to-return-void.patch new file mode 100644 index 0000000..55007fc --- /dev/null +++ b/SOURCES/libvirt-conf-change-virDomainHostdevInsert-to-return-void.patch @@ -0,0 +1,158 @@ +From de4d1cf7306b8c456ccd167f29d47c7fb7b49943 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Laine Stump +Date: Tue, 11 Feb 2025 16:44:49 -0500 +Subject: [PATCH] conf: change virDomainHostdevInsert() to return void +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We haven't checked for memalloc failure in many years, and that was +the only reason this function would have ever failed. + +Signed-off-by: Laine Stump +Reviewed-by: Ján Tomko +(cherry picked from commit 956c6684113b46b2350db698dc75604f4c3a4b76) + +https://issues.redhat.com/browse/RHEL-69455 +Signed-off-by: Laine Stump +--- + src/conf/domain_conf.c | 15 +++++---------- + src/conf/domain_conf.h | 2 +- + src/libxl/libxl_domain.c | 5 +---- + src/libxl/libxl_driver.c | 3 +-- + src/lxc/lxc_driver.c | 3 +-- + src/qemu/qemu_driver.c | 3 +-- + src/qemu/qemu_process.c | 3 +-- + 7 files changed, 11 insertions(+), 23 deletions(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index d83f1ba240..cba0b162f4 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -14456,12 +14456,10 @@ virDomainChrTargetTypeToString(int deviceType, + return type; + } + +-int ++void + virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev) + { + VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev); +- +- return 0; + } + + virDomainHostdevDef * +@@ -14877,9 +14875,8 @@ virDomainDiskRemoveByName(virDomainDef *def, const char *name) + int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) + { + /* hostdev net devices must also exist in the hostdevs array */ +- if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV && +- virDomainHostdevInsert(def, &net->data.hostdev.def) < 0) +- return -1; ++ if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) ++ virDomainHostdevInsert(def, &net->data.hostdev.def); + + VIR_APPEND_ELEMENT(def->nets, def->nnets, net); + return 0; +@@ -19257,10 +19254,8 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, + * where the actual network type is already known to be + * hostdev) must also be in the hostdevs array. + */ +- if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV && +- virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)) < 0) { +- return NULL; +- } ++ if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV) ++ virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)); + } + VIR_FREE(nodes); + +diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h +index 5237046196..2d38e8fa51 100644 +--- a/src/conf/domain_conf.h ++++ b/src/conf/domain_conf.h +@@ -3982,7 +3982,7 @@ virDomainNetDef *virDomainNetRemove(virDomainDef *def, size_t i); + virDomainNetDef *virDomainNetRemoveByObj(virDomainDef *def, virDomainNetDef *net); + void virDomainNetRemoveHostdev(virDomainDef *def, virDomainNetDef *net); + +-int virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev); ++void virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev); + virDomainHostdevDef * + virDomainHostdevRemove(virDomainDef *def, size_t i); + int virDomainHostdevFind(virDomainDef *def, virDomainHostdevDef *match, +diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c +index cad6c9ce42..711e22b8df 100644 +--- a/src/libxl/libxl_domain.c ++++ b/src/libxl/libxl_domain.c +@@ -1015,10 +1015,7 @@ libxlNetworkPrepareDevices(virDomainDef *def) + /* Each type='hostdev' network device must also have a + * corresponding entry in the hostdevs array. + */ +- virDomainHostdevDef *hostdev = virDomainNetGetActualHostdev(net); +- +- if (virDomainHostdevInsert(def, hostdev) < 0) +- return -1; ++ virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)); + } + } + +diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c +index 29dcee3cfc..b670e697c6 100644 +--- a/src/libxl/libxl_driver.c ++++ b/src/libxl/libxl_driver.c +@@ -3585,8 +3585,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev) + return -1; + } + +- if (virDomainHostdevInsert(vmdef, hostdev) < 0) +- return -1; ++ virDomainHostdevInsert(vmdef, hostdev); + dev->data.hostdev = NULL; + break; + +diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c +index d682e7168a..9609d7d10c 100644 +--- a/src/lxc/lxc_driver.c ++++ b/src/lxc/lxc_driver.c +@@ -3025,8 +3025,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef, + _("device is already in the domain configuration")); + return -1; + } +- if (virDomainHostdevInsert(vmdef, hostdev) < 0) +- return -1; ++ virDomainHostdevInsert(vmdef, hostdev); + dev->data.hostdev = NULL; + ret = 0; + break; +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 9a69574f31..379f9fb74f 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -6734,8 +6734,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, + _("device is already in the domain configuration")); + return -1; + } +- if (virDomainHostdevInsert(vmdef, hostdev)) +- return -1; ++ virDomainHostdevInsert(vmdef, hostdev); + dev->data.hostdev = NULL; + break; + +diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c +index 1866c8f4e1..a45f1b5b7d 100644 +--- a/src/qemu/qemu_process.c ++++ b/src/qemu/qemu_process.c +@@ -5929,8 +5929,7 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm) + if (qemuDomainPrepareHostdev(hostdev, priv) < 0) + return -1; + +- if (virDomainHostdevInsert(def, hostdev) < 0) +- return -1; ++ virDomainHostdevInsert(def, hostdev); + } + } + return 0; +-- +2.48.1 diff --git a/SOURCES/libvirt-conf-docs-Add-support-for-direct-and-extended-tlbflush-features.patch b/SOURCES/libvirt-conf-docs-Add-support-for-direct-and-extended-tlbflush-features.patch new file mode 100644 index 0000000..8f2f184 --- /dev/null +++ b/SOURCES/libvirt-conf-docs-Add-support-for-direct-and-extended-tlbflush-features.patch @@ -0,0 +1,213 @@ +From 2acec098dbc64f20d36f2b7592c2867885196141 Mon Sep 17 00:00:00 2001 +Message-ID: <2acec098dbc64f20d36f2b7592c2867885196141.1737030652.git.jdenemar@redhat.com> +From: Martin Kletzander +Date: Fri, 20 Dec 2024 12:27:22 +0100 +Subject: [PATCH] conf, docs: Add support for direct and extended tlbflush + features + +Similarly to stimer-direct these are subelements of in the +domain XML. + +Signed-off-by: Martin Kletzander +Reviewed-by: Michal Privoznik +(cherry picked from commit ac08b362da724f1dd7aa6f05c0a9e7a960a7f024) + +https://issues.redhat.com/browse/RHEL-7122 + +Signed-off-by: Martin Kletzander +--- + docs/formatdomain.rst | 13 ++++++++----- + src/conf/domain_conf.c | 26 +++++++++++++++++++++++++- + src/conf/domain_conf.h | 2 ++ + src/conf/schemas/domaincommon.rng | 21 ++++++++++++++++++++- + src/cpu/cpu_x86.c | 7 +++++++ + src/cpu/cpu_x86_data.h | 2 ++ + 6 files changed, 64 insertions(+), 7 deletions(-) + +diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst +index 60bee8bd4f..8d787ef59a 100644 +--- a/docs/formatdomain.rst ++++ b/docs/formatdomain.rst +@@ -1993,7 +1993,10 @@ Hypervisors may allow certain CPU / machine features to be toggled on/off. + + + +- ++ ++ ++ ++ + + + +@@ -2068,9 +2071,9 @@ are: + Enable various features improving behavior of guests running Microsoft + Windows. + +- =============== ====================================================================== ============================================ ======================================================= ++ =============== ====================================================================== ============================================ ======================================================================== + Feature Description Value Since +- =============== ====================================================================== ============================================ ======================================================= ++ =============== ====================================================================== ============================================ ======================================================================== + relaxed Relax constraints on timers on, off :since:`1.0.0 (QEMU 2.0)` + vapic Enable virtual APIC on, off :since:`1.1.0 (QEMU 2.0)` + spinlocks Enable spinlock support on, off; retries - at least 4095 :since:`1.1.0 (QEMU 2.0)` +@@ -2082,13 +2085,13 @@ are: + vendor_id Set hypervisor vendor id on, off; value - string, up to 12 characters :since:`1.3.3 (QEMU 2.5)` + frequencies Expose frequency MSRs on, off :since:`4.7.0 (QEMU 2.12)` + reenlightenment Enable re-enlightenment notification on migration on, off :since:`4.7.0 (QEMU 3.0)` +- tlbflush Enable PV TLB flush support on, off :since:`4.7.0 (QEMU 3.0)` ++ tlbflush Enable PV TLB flush support on, off; direct - on,off; extended - on,off :since:`4.7.0 (QEMU 3.0), direct and extended modes 11.0.0 (QEMU 7.1.0)` + ipi Enable PV IPI support on, off :since:`4.10.0 (QEMU 3.1)` + evmcs Enable Enlightened VMCS on, off :since:`4.10.0 (QEMU 3.1)` + avic Enable use Hyper-V SynIC with hardware APICv/AVIC on, off :since:`8.10.0 (QEMU 6.2)` + emsr_bitmap Avoid unnecessary updates to L2 MSR Bitmap upon vmexits. on, off :since:`10.7.0 (QEMU 7.1)` + xmm_input Enable XMM Fast Hypercall Input on, off :since:`10.7.0 (QEMU 7.1)` +- =============== ====================================================================== ============================================ ======================================================= ++ =============== ====================================================================== ============================================ ======================================================================== + + :since:`Since 8.0.0`, the hypervisor can be configured further by setting + the ``mode`` attribute to one of the following values: +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index 4ad8289b89..c2164f6377 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -16672,7 +16672,6 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, + case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: + case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: +- case VIR_DOMAIN_HYPERV_TLBFLUSH: + case VIR_DOMAIN_HYPERV_IPI: + case VIR_DOMAIN_HYPERV_EVMCS: + case VIR_DOMAIN_HYPERV_AVIC: +@@ -16680,6 +16679,31 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, + case VIR_DOMAIN_HYPERV_XMM_INPUT: + break; + ++ case VIR_DOMAIN_HYPERV_TLBFLUSH: ++ if (value != VIR_TRISTATE_SWITCH_ON) ++ break; ++ ++ child = xmlFirstElementChild(node); ++ while (child) { ++ if (STREQ((const char *)child->name, "direct")) { ++ if (virXMLPropTristateSwitch(child, "state", VIR_XML_PROP_REQUIRED, ++ &def->hyperv_tlbflush_direct) < 0) ++ return -1; ++ } else if (STREQ((const char *)child->name, "extended")) { ++ if (virXMLPropTristateSwitch(child, "state", VIR_XML_PROP_REQUIRED, ++ &def->hyperv_tlbflush_extended) < 0) ++ return -1; ++ } else { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, ++ _("unsupported Hyper-V tlbflush feature: %1$s"), ++ child->name); ++ return -1; ++ } ++ ++ child = xmlNextElementSibling(child); ++ } ++ break; ++ + case VIR_DOMAIN_HYPERV_STIMER: + if (value != VIR_TRISTATE_SWITCH_ON) + break; +diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h +index a187ab4083..9f7c28343f 100644 +--- a/src/conf/domain_conf.h ++++ b/src/conf/domain_conf.h +@@ -3101,6 +3101,8 @@ struct _virDomainDef { + virDomainXenPassthroughMode xen_passthrough_mode; + unsigned int hyperv_spinlocks; + virTristateSwitch hyperv_stimer_direct; ++ virTristateSwitch hyperv_tlbflush_direct; ++ virTristateSwitch hyperv_tlbflush_extended; + virGICVersion gic_version; + virDomainHPTResizing hpt_resizing; + unsigned long long hpt_maxpagesize; /* Stored in KiB */ +diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng +index b3fdbf7ffb..7121519ca3 100644 +--- a/src/conf/schemas/domaincommon.rng ++++ b/src/conf/schemas/domaincommon.rng +@@ -8027,7 +8027,7 @@ + + + +- ++ + + + +@@ -8075,6 +8075,25 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c +index 13695802da..6d72d446c9 100644 +--- a/src/cpu/cpu_x86.c ++++ b/src/cpu/cpu_x86.c +@@ -99,6 +99,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_HV_REENLIGHTENMENT, + + KVM_FEATURE_DEF(VIR_CPU_x86_HV_STIMER_DIRECT, + 0x40000003, 0x0, 0x00080000); ++KVM_FEATURE_DEF(VIR_CPU_x86_HV_TLBFLUSH_DIRECT, ++ 0x40000003, 0x0, 0x00004000); + + KVM_FEATURE_DEF(VIR_CPU_x86_HV_TLBFLUSH, + 0x40000004, 0x00000004, 0x0); +@@ -109,6 +111,9 @@ KVM_FEATURE_DEF(VIR_CPU_x86_HV_IPI, + KVM_FEATURE_DEF(VIR_CPU_x86_HV_EVMCS, + 0x40000004, 0x00004000, 0x0); + ++KVM_FEATURE_DEF(VIR_CPU_x86_HV_TLBFLUSH_EXT, ++ 0x40000004, 0x0, 0x00004000); ++ + KVM_FEATURE_DEF(VIR_CPU_x86_HV_EMSR_BITMAP, + 0x4000000A, 0x00080000, 0x0); + static virCPUx86Feature x86_kvm_features[] = +@@ -130,6 +135,8 @@ static virCPUx86Feature x86_kvm_features[] = + KVM_FEATURE(VIR_CPU_x86_HV_EVMCS), + KVM_FEATURE(VIR_CPU_x86_HV_STIMER_DIRECT), + KVM_FEATURE(VIR_CPU_x86_HV_EMSR_BITMAP), ++ KVM_FEATURE(VIR_CPU_x86_HV_TLBFLUSH_DIRECT), ++ KVM_FEATURE(VIR_CPU_x86_HV_TLBFLUSH_EXT), + }; + + typedef struct _virCPUx86Signature virCPUx86Signature; +diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h +index 43ad2faeb1..448acbbeb2 100644 +--- a/src/cpu/cpu_x86_data.h ++++ b/src/cpu/cpu_x86_data.h +@@ -60,6 +60,8 @@ struct _virCPUx86MSR { + #define VIR_CPU_x86_HV_FREQUENCIES "hv-frequencies" + #define VIR_CPU_x86_HV_REENLIGHTENMENT "hv-reenlightenment" + #define VIR_CPU_x86_HV_TLBFLUSH "hv-tlbflush" ++#define VIR_CPU_x86_HV_TLBFLUSH_EXT "hv-tlbflush-ext" ++#define VIR_CPU_x86_HV_TLBFLUSH_DIRECT "hv-tlbflush-direct" + #define VIR_CPU_x86_HV_IPI "hv-ipi" + #define VIR_CPU_x86_HV_EVMCS "hv-evmcs" + #define VIR_CPU_x86_HV_AVIC "hv-avic" +-- +2.47.1 diff --git a/SOURCES/libvirt-conf-qemu-make-source-element-almost-optional-for-type-vhostuser.patch b/SOURCES/libvirt-conf-qemu-make-source-element-almost-optional-for-type-vhostuser.patch new file mode 100644 index 0000000..2aef200 --- /dev/null +++ b/SOURCES/libvirt-conf-qemu-make-source-element-almost-optional-for-type-vhostuser.patch @@ -0,0 +1,170 @@ +From 8aac60b3f07513fea6968b1f9d340f7408a3a8e6 Mon Sep 17 00:00:00 2001 +Message-ID: <8aac60b3f07513fea6968b1f9d340f7408a3a8e6.1739824249.git.jdenemar@redhat.com> +From: Laine Stump +Date: Sun, 9 Feb 2025 22:52:54 -0500 +Subject: [PATCH] conf/qemu: make element *almost* optional for + type=vhostuser +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For some reason, when vhostuser interface support was added in 2014, +the parser required that the XML for the have a +element with type, mode, and path, all 3 also required. This in spite +of the fact that 'unix' is the only possible valid setting for type, +and 95% of the time the mode is set to 'client' (as I understand from +comments in the code, normally a guest will use mode='client' to +connect to an existing socket that is precreated (by OVS?), and the +only use for mode='server' is for test setups where one guest is setup +with a listening vhostuser socket (i.e. 'server') and another guest +connects to that socket (i.e. 'client')). (or maybe one guest connects +to OVS in server mode, and all the others connect in client mode, not +sure - I don't claim to be an expert on vhost-user.) + +So from the point of view of existing vhost-user functionality, it +seems reasonable to make 'type' and 'mode' optional, and by default +fill in the vhostuser part of the NetDef as if they were 'unix' and +'client'. + +In theory, the element itself is also not *directly* required +after this patch, however, the path attribute of *is* +required (for now), so effectively the element is still +required. + +Signed-off-by: Laine Stump +Reviewed-by: Ján Tomko +(cherry picked from commit fb4bfa78589f7f556b6b0a176f109c94516d3cdd) + +https://issues.redhat.com/browse/RHEL-69455 +Signed-off-by: Laine Stump +--- + src/conf/domain_conf.c | 56 ++++++++++++------------------- + src/conf/schemas/domaincommon.rng | 4 ++- + src/qemu/qemu_validate.c | 20 +++++++---- + 3 files changed, 39 insertions(+), 41 deletions(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index cba0b162f4..b1e9dda80e 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -9767,50 +9767,38 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, + g_autofree char *vhostuser_type = NULL; + virDomainNetVhostuserMode vhostuser_mode; + +- if (virDomainNetDefParseXMLRequireSource(def, source_node) < 0) +- return NULL; +- +- if (!(vhostuser_type = virXMLPropStringRequired(source_node, "type"))) +- return NULL; +- +- if (STRNEQ_NULLABLE(vhostuser_type, "unix")) { +- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, +- _("Type='%1$s' unsupported for "), +- vhostuser_type); +- return NULL; +- } +- + if (!(def->data.vhostuser = virDomainChrSourceDefNew(xmlopt))) + return NULL; + ++ /* Default (and only valid) value of type is "unix". ++ * Everything else's default value is 0/NULL. ++ */ + def->data.vhostuser->type = VIR_DOMAIN_CHR_TYPE_UNIX; + +- if (!(def->data.vhostuser->data.nix.path = virXMLPropStringRequired(source_node, "path"))) +- return NULL; ++ if (source_node) { ++ if ((vhostuser_type = virXMLPropString(source_node, "type"))) { ++ if (STRNEQ(vhostuser_type, "unix")) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, ++ _("Type='%1$s' unsupported for "), ++ vhostuser_type); ++ return NULL; ++ } ++ } + +- if (virXMLPropEnum(source_node, "mode", +- virDomainNetVhostuserModeTypeFromString, +- VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, +- &vhostuser_mode) < 0) +- return NULL; ++ def->data.vhostuser->data.nix.path = virXMLPropString(source_node, "path"); + +- switch (vhostuser_mode) { +- case VIR_DOMAIN_NET_VHOSTUSER_MODE_CLIENT: +- def->data.vhostuser->data.nix.listen = false; +- break; ++ if (virXMLPropEnum(source_node, "mode", virDomainNetVhostuserModeTypeFromString, ++ VIR_XML_PROP_NONZERO, &vhostuser_mode) < 0) { ++ return NULL; ++ } + +- case VIR_DOMAIN_NET_VHOSTUSER_MODE_SERVER: +- def->data.vhostuser->data.nix.listen = true; +- break; ++ if (vhostuser_mode == VIR_DOMAIN_NET_VHOSTUSER_MODE_SERVER) ++ def->data.vhostuser->data.nix.listen = true; + +- case VIR_DOMAIN_NET_VHOSTUSER_MODE_NONE: +- case VIR_DOMAIN_NET_VHOSTUSER_MODE_LAST: +- break; ++ if (virDomainChrSourceReconnectDefParseXML(&def->data.vhostuser->data.nix.reconnect, ++ source_node, ctxt) < 0) ++ return NULL; + } +- +- if (virDomainChrSourceReconnectDefParseXML(&def->data.vhostuser->data.nix.reconnect, +- source_node, ctxt) < 0) +- return NULL; + } + break; + +diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng +index 7121519ca3..cbc093ca7b 100644 +--- a/src/conf/schemas/domaincommon.rng ++++ b/src/conf/schemas/domaincommon.rng +@@ -3485,7 +3485,9 @@ + vhostuser + + +- ++ ++ ++ + + + +diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c +index b7b2e3d0af..eb8c5366f6 100644 +--- a/src/qemu/qemu_validate.c ++++ b/src/qemu/qemu_validate.c +@@ -1810,12 +1810,20 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net, + } + } + +- if (net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && +- net->data.vhostuser->data.nix.listen && +- net->data.vhostuser->data.nix.reconnect.enabled == VIR_TRISTATE_BOOL_YES) { +- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", +- _("'reconnect' attribute is not supported when source mode='server' for ")); +- return -1; ++ if (net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER) { ++ if (!net->data.vhostuser->data.nix.path) { ++ virReportError(VIR_ERR_XML_ERROR, ++ _("Missing required attribute '%1$s' in element '%2$s'"), ++ "path", "source"); ++ return -1; ++ } ++ ++ if (net->data.vhostuser->data.nix.listen && ++ net->data.vhostuser->data.nix.reconnect.enabled == VIR_TRISTATE_BOOL_YES) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("'reconnect' attribute is not supported when source mode='server' for ")); ++ return -1; ++ } + } + + if (!virDomainNetIsVirtioModel(net)) { +-- +2.48.1 diff --git a/SOURCES/libvirt-conf-refactor-hyperv-features-formatting.patch b/SOURCES/libvirt-conf-refactor-hyperv-features-formatting.patch new file mode 100644 index 0000000..192ec8f --- /dev/null +++ b/SOURCES/libvirt-conf-refactor-hyperv-features-formatting.patch @@ -0,0 +1,112 @@ +From 6f1673eb80487d090c4abc2feaf6a6821fb09580 Mon Sep 17 00:00:00 2001 +Message-ID: <6f1673eb80487d090c4abc2feaf6a6821fb09580.1737030652.git.jdenemar@redhat.com> +From: =?UTF-8?q?J=C3=A1n=20Tomko?= +Date: Mon, 6 Jan 2025 17:20:57 +0100 +Subject: [PATCH] conf: refactor hyperv features formatting +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add a nested buffer for whatever sub-elements a particular +hyperv feature might have. + +Signed-off-by: Ján Tomko +Reviewed-by: Martin Kletzander +(cherry picked from commit ad6b4d1fef275036b31a2bee435144871ebbcfbb) + +https://issues.redhat.com/browse/RHEL-7122 + +Signed-off-by: Martin Kletzander +--- + src/conf/domain_conf.c | 46 +++++++++++++++++------------------------- + 1 file changed, 19 insertions(+), 27 deletions(-) + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index c2164f6377..c8254d2146 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -27954,13 +27954,15 @@ virDomainDefFormatFeatures(virBuffer *buf, + + virBufferAsprintf(&childBuf, "\n", + virDomainHyperVModeTypeToString(def->features[i])); +- virBufferAdjustIndent(&childBuf, 2); ++ + for (j = 0; j < VIR_DOMAIN_HYPERV_LAST; j++) { ++ g_auto(virBuffer) hypervAttrBuf = VIR_BUFFER_INITIALIZER; ++ g_auto(virBuffer) hypervChildBuf = VIR_BUFFER_INIT_CHILD(&tmpChildBuf); ++ + if (def->hyperv_features[j] == VIR_TRISTATE_SWITCH_ABSENT) + continue; + +- virBufferAsprintf(&childBuf, "<%s state='%s'", +- virDomainHypervTypeToString(j), ++ virBufferAsprintf(&hypervAttrBuf, " state='%s'", + virTristateSwitchTypeToString(def->hyperv_features[j])); + + switch ((virDomainHyperv) j) { +@@ -27978,49 +27980,39 @@ virDomainDefFormatFeatures(virBuffer *buf, + case VIR_DOMAIN_HYPERV_AVIC: + case VIR_DOMAIN_HYPERV_EMSR_BITMAP: + case VIR_DOMAIN_HYPERV_XMM_INPUT: +- virBufferAddLit(&childBuf, "/>\n"); + break; + + case VIR_DOMAIN_HYPERV_SPINLOCKS: +- if (def->hyperv_features[j] != VIR_TRISTATE_SWITCH_ON) { +- virBufferAddLit(&childBuf, "/>\n"); +- break; ++ if (def->hyperv_features[j] == VIR_TRISTATE_SWITCH_ON) { ++ virBufferAsprintf(&hypervAttrBuf, ++ " retries='%d'", def->hyperv_spinlocks); + } +- virBufferAsprintf(&childBuf, " retries='%d'/>\n", +- def->hyperv_spinlocks); + break; + + case VIR_DOMAIN_HYPERV_STIMER: +- if (def->hyperv_features[j] != VIR_TRISTATE_SWITCH_ON) { +- virBufferAddLit(&childBuf, "/>\n"); +- break; +- } +- if (def->hyperv_stimer_direct == VIR_TRISTATE_SWITCH_ON) { +- virBufferAddLit(&childBuf, ">\n"); +- virBufferAdjustIndent(&childBuf, 2); +- virBufferAddLit(&childBuf, "\n"); +- virBufferAdjustIndent(&childBuf, -2); +- virBufferAddLit(&childBuf, "\n"); +- } else { +- virBufferAddLit(&childBuf, "/>\n"); ++ if (def->hyperv_features[j] == VIR_TRISTATE_SWITCH_ON && ++ def->hyperv_stimer_direct == VIR_TRISTATE_SWITCH_ON) { ++ virBufferAddLit(&hypervChildBuf, "\n"); + } + + break; + + case VIR_DOMAIN_HYPERV_VENDOR_ID: +- if (def->hyperv_features[j] != VIR_TRISTATE_SWITCH_ON) { +- virBufferAddLit(&childBuf, "/>\n"); +- break; ++ if (def->hyperv_features[j] == VIR_TRISTATE_SWITCH_ON) { ++ virBufferEscapeString(&hypervAttrBuf, " value='%s'", ++ def->hyperv_vendor_id); + } +- virBufferEscapeString(&childBuf, " value='%s'/>\n", +- def->hyperv_vendor_id); + break; + + case VIR_DOMAIN_HYPERV_LAST: + break; + } ++ ++ virXMLFormatElement(&tmpChildBuf, virDomainHypervTypeToString(j), ++ &hypervAttrBuf, &hypervChildBuf); + } +- virBufferAdjustIndent(&childBuf, -2); ++ ++ virBufferAddBuffer(&childBuf, &tmpChildBuf); + virBufferAddLit(&childBuf, "\n"); + break; + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-486-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-486-v1-CPU-model.patch new file mode 100644 index 0000000..19af217 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-486-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From 307d105889cf0645b40d2ed7d7286f7124964732 Mon Sep 17 00:00:00 2001 +Message-ID: <307d105889cf0645b40d2ed7d7286f7124964732.1734433245.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:20:54 +0100 +Subject: [PATCH] cpu_map: Add 486-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 2abf6bd47c795c05d299285876977394e60479e4) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_486-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_486-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 287cd7395e..e9fb278fd3 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -5,6 +5,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index f659ef230e..b335278b08 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -22,6 +22,7 @@ cpumap_data = [ + 'ppc64_POWERPC_e5500.xml', + 'ppc64_POWERPC_e6500.xml', + 'ppc64_vendors.xml', ++ 'x86_486-v1.xml', + 'x86_486.xml', + 'x86_athlon.xml', + 'x86_Broadwell-IBRS.xml', +diff --git a/src/cpu_map/x86_486-v1.xml b/src/cpu_map/x86_486-v1.xml +new file mode 100644 +index 0000000000..33f7ee09b5 +--- /dev/null ++++ b/src/cpu_map/x86_486-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 5fa2d07976..46f1bd7d4f 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -62,7 +62,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 0348a65589..7153fe3925 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -74,7 +74,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 49a18cd333..93df9af8f6 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -61,7 +61,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index b990a2d597..25b16b34bb 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -62,7 +62,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 6746479be5..c9a124cda2 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -75,7 +75,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 81c9bb1444..a99c89e98b 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -61,7 +61,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index 0cd73ee54f..c4f95a282b 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -63,7 +63,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 8a09c53177..b6f01ffbce 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -75,7 +75,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 5a23dfee52..5d3c1ab1aa 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -62,7 +62,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index 84e783f739..c24b88f412 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -63,7 +63,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 4d7ed1eea8..eb8f5e3f22 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -77,7 +77,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 0446dff4fb..b1f198d62b 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -62,7 +62,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index e5718bc50c..7a4830b126 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -64,7 +64,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index c3a93369e4..d624842aab 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -78,7 +78,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 7415bda6bf..43bcca9b52 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -63,7 +63,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 720387e9db..275ce525fe 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -65,7 +65,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 3000d11487..6500ceac17 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -78,7 +78,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 31fe652a9f..1e54981f3c 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -64,7 +64,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 88db1c659e..5b1bb3ad55 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -70,7 +70,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 3392f2b42f..339c622684 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -67,7 +67,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 3392f2b42f..339c622684 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -67,7 +67,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 5223dbb2e2..a016f77b09 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -69,7 +69,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index e43c6710e9..9a42375791 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -70,7 +70,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 3d5c15fdf1..677ebbf2e6 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -71,7 +71,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 420dae738f..1eb4af3fdc 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -69,7 +69,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index e5853535ce..e2fa9da460 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -72,7 +72,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 22c40afdb1..787fc9d870 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -72,7 +72,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index c40cbb8a73..3fa195c6aa 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -71,7 +71,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index cfc4b3e301..5fe9ab775c 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -73,7 +73,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 4383050d3c..5c9f1c92a5 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -71,7 +71,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 062d91ba9a..73f129706d 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -72,7 +72,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index e8053efc99..2315bda338 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -73,7 +73,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 8f3357be6f..90c9862321 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -73,7 +73,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index db12bd81e3..983597be92 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -72,7 +72,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index c3a7aff766..578dea23a5 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -77,7 +77,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index a18ce928a5..2009920390 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -72,7 +72,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 5019918b9b..505ea9978f 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -76,7 +76,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 5cd872831b..e78f6a9dd3 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -77,7 +77,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 7afc9e3d69..da9f2a1193 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -72,7 +72,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 11cfc7863d..74d1094511 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -76,7 +76,8 @@ + + + +- 486 ++ 486 ++ 486-v1 + Broadwell + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch new file mode 100644 index 0000000..44954a5 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-Conroe-v1-CPU-model.patch @@ -0,0 +1,684 @@ +From 4d951963cb08a659ab1a3077cabd6111d586f39f Mon Sep 17 00:00:00 2001 +Message-ID: <4d951963cb08a659ab1a3077cabd6111d586f39f.1734433246.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:38:08 +0100 +Subject: [PATCH] cpu_map: Add Conroe-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 2d061eba8c2b7907cad1fe80fb6e2b1707417ed3) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_Conroe-v1.xml | 6 ++++++ + tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml | 2 +- + tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml | 2 +- + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 45 files changed, 90 insertions(+), 42 deletions(-) + create mode 100644 src/cpu_map/x86_Conroe-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index a9a8d1b2c4..e9a180526e 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -39,6 +39,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 7ea53373ae..cbf7bb407b 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -40,6 +40,7 @@ cpumap_data = [ + 'x86_Cascadelake-Server-v4.xml', + 'x86_Cascadelake-Server-v5.xml', + 'x86_Cascadelake-Server.xml', ++ 'x86_Conroe-v1.xml', + 'x86_Conroe.xml', + 'x86_Cooperlake-v1.xml', + 'x86_Cooperlake-v2.xml', +diff --git a/src/cpu_map/x86_Conroe-v1.xml b/src/cpu_map/x86_Conroe-v1.xml +new file mode 100644 +index 0000000000..8dd626795a +--- /dev/null ++++ b/src/cpu_map/x86_Conroe-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml +index dae7f8846e..6625ebc44d 100644 +--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Conroe ++ Conroe-v1 + Intel + + +diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml +index ec509f92e4..cca99c7b04 100644 +--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Conroe ++ Conroe-v1 + Intel + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 985a00cf84..3a14131fda 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -218,7 +218,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 74aa563566..5223402151 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -350,7 +350,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 4fdeaec417..a3638c64a4 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -217,7 +217,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 284d70c7cc..9af3b3768d 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -218,7 +218,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 07097ce25b..7932c25f39 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -351,7 +351,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 1aefe0ea08..72c598466a 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -217,7 +217,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index 2ffe8cb354..b3ba5b020d 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -234,7 +234,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 2a084c64fe..69a73ea9b2 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -379,7 +379,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index bda2e0ef68..54edabd43f 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -233,7 +233,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index d2fbcad98c..be908c6cc6 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -234,7 +234,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 60093eda9a..8fb08191ea 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -381,7 +381,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index eafdc53ff6..1f9bdf36af 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -233,7 +233,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 03896267d5..14081dfafd 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -235,7 +235,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index 52eb4b8215..d9ba0202bd 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -382,7 +382,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index f212097662..bba1b69e41 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -234,7 +234,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 38b0f47092..9fb0fbe581 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -236,7 +236,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 43de9e5193..b7f01c2b58 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -382,7 +382,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 92514055c9..f7e9853077 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -235,7 +235,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 10017064b8..4b670c95fe 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -241,7 +241,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 95b582af9f..8b85bd98b4 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -311,7 +311,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 95b582af9f..8b85bd98b4 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -311,7 +311,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 1e40bc5b23..0e1328f1fc 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -240,7 +240,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 392ec1e232..b3040a9e6e 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -241,7 +241,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 0893277250..ac533cccfa 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -315,7 +315,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 52ef9718d0..0558eb7588 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -240,7 +240,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index ef74bbd2fa..3b334589ed 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -244,7 +244,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 404237ef67..9815a01beb 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -266,7 +266,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index eafacf0b61..3b1796949f 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -243,7 +243,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index c544eb02e3..c4d2a768bd 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -245,7 +245,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index b7b0ddd7c4..207092ba7b 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -265,7 +265,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index a4c86941c6..855dfef498 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -244,7 +244,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 06341f125a..f7ddcd9aff 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -245,7 +245,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index e759a15ea7..3419e26d32 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -252,7 +252,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index eb4822c667..43bc77f7cc 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -244,7 +244,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index a6c7d8e74c..0a962420cd 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -249,7 +249,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 18070cd01a..02209df41b 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -251,7 +251,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index e008a2f2e9..49e1df7be4 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -248,7 +248,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index ce19774d0d..56449ad3db 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -249,7 +249,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 217fbfe51c..04a759a16b 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -251,7 +251,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 4f34340651..7b3379b3e5 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -248,7 +248,8 @@ + + + +- Conroe ++ Conroe ++ Conroe-v1 + Cooperlake + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch new file mode 100644 index 0000000..99d7c11 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-EPYC-Genoa-v1-CPU-model.patch @@ -0,0 +1,869 @@ +From c849388f86989e8bced51ad498b58c7cd40af179 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 16:02:17 +0100 +Subject: [PATCH] cpu_map: Add EPYC-Genoa-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit da2439b746c5da1b6544d6e1cc0d6dd6b9691a1b) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_EPYC-Genoa-v1.xml | 6 +++ + .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 32 +++++++++++++- + .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 42 ++++++++++++++++++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 32 +++++++++++++- + .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 32 +++++++++++++- + .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 41 +++++++++++++++++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 32 +++++++++++++- + .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 32 +++++++++++++- + .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 41 +++++++++++++++++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 32 +++++++++++++- + .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 32 +++++++++++++- + .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 41 +++++++++++++++++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 32 +++++++++++++- + .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 32 +++++++++++++- + .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 41 +++++++++++++++++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 32 +++++++++++++- + 18 files changed, 519 insertions(+), 15 deletions(-) + create mode 100644 src/cpu_map/x86_EPYC-Genoa-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 9bd90cc83b..8e74195312 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -161,6 +161,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 5ac3c82dc7..fa7faa4016 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -59,6 +59,7 @@ cpumap_data = [ + 'x86_Dhyana-v1.xml', + 'x86_Dhyana-v2.xml', + 'x86_Dhyana.xml', ++ 'x86_EPYC-Genoa-v1.xml', + 'x86_EPYC-Genoa.xml', + 'x86_EPYC-IBPB.xml', + 'x86_EPYC-Milan-v1.xml', +diff --git a/src/cpu_map/x86_EPYC-Genoa-v1.xml b/src/cpu_map/x86_EPYC-Genoa-v1.xml +new file mode 100644 +index 0000000000..df45ca18ff +--- /dev/null ++++ b/src/cpu_map/x86_EPYC-Genoa-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 197efcbe59..e80e175376 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -334,7 +334,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -364,6 +364,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 07fdd0c3a3..62ffabb3e2 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -414,7 +414,7 @@ + + + +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -454,6 +454,46 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index ec95c1a2ac..4117d926cb 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -333,7 +333,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -363,6 +363,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index d1d330df87..dfa88bcf96 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -335,7 +335,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -365,6 +365,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 75cb1b8f17..327cad253e 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -408,7 +408,7 @@ + + + +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -447,6 +447,45 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 5f6e72e7ca..f8dbb717f1 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -334,7 +334,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -364,6 +364,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 3c005d0c10..c5a653f57b 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -335,7 +335,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -365,6 +365,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 3a6424eddf..30876c5fef 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -388,7 +388,7 @@ + + + +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -427,6 +427,45 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 79c39678ca..6c141e1cb9 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -334,7 +334,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -364,6 +364,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 117947ef13..9445d999b5 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -339,7 +339,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -369,6 +369,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index c2c244f464..61d92550c1 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -387,7 +387,7 @@ + + + +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -426,6 +426,45 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 30959cd723..5e87efe5e8 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -338,7 +338,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -368,6 +368,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 5fc9576495..99445e5f44 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -339,7 +339,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -369,6 +369,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index eeba43f9fa..8bf967c99f 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -387,7 +387,7 @@ + + + +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -426,6 +426,45 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 96d789ee1c..40aa971144 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -338,7 +338,7 @@ + + + EPYC +- EPYC-Genoa ++ EPYC-Genoa + + + +@@ -368,6 +368,36 @@ + + + ++ EPYC-Genoa-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + EPYC-IBPB + EPYC-Milan + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch new file mode 100644 index 0000000..bdd850e --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-KnightsMill-v1-CPU-model.patch @@ -0,0 +1,1417 @@ +From b7570f7b0d6c1637c9f49a88a45fa3f4caf29d4e Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:42:16 +0100 +Subject: [PATCH] cpu_map: Add KnightsMill-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 8f5e36cbce655086009bc906d63adcd50ddf8925) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_KnightsMill-v1.xml | 6 ++++++ + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 20 ++++++++++++++++++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 20 ++++++++++++++++++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 20 ++++++++++++++++++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 20 ++++++++++++++++++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 20 ++++++++++++++++++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 20 ++++++++++++++++++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 14 ++++++++++++- + .../qemu_7.2.0-tcg.x86_64+hvf.xml | 16 ++++++++++++++- + .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 16 ++++++++++++++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 16 ++++++++++++++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 14 ++++++++++++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 14 ++++++++++++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 13 +++++++++++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 13 +++++++++++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 14 ++++++++++++- + .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 13 +++++++++++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 14 ++++++++++++- + 43 files changed, 567 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_KnightsMill-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 16ebe36539..a0aa677dee 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -128,6 +128,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 4d74431c55..70c7d2091b 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -99,6 +99,7 @@ cpumap_data = [ + 'x86_IvyBridge-v1.xml', + 'x86_IvyBridge-v2.xml', + 'x86_IvyBridge.xml', ++ 'x86_KnightsMill-v1.xml', + 'x86_KnightsMill.xml', + 'x86_kvm32-v1.xml', + 'x86_kvm32.xml', +diff --git a/src/cpu_map/x86_KnightsMill-v1.xml b/src/cpu_map/x86_KnightsMill-v1.xml +new file mode 100644 +index 0000000000..00293d05b8 +--- /dev/null ++++ b/src/cpu_map/x86_KnightsMill-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index efd8f06104..43e1ca8861 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -538,7 +538,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -550,6 +550,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index beb923a1f3..0718de04f7 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1021,7 +1021,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1039,6 +1039,24 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index d9ae5568be..6eb78e68f0 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -537,7 +537,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -549,6 +549,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 403b9f6674..3b716faf00 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -560,7 +560,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -572,6 +572,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index f2ad35c6cd..bd8c0a086c 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1111,7 +1111,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1129,6 +1129,24 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 07570f5b02..b6ec55cf0c 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -559,7 +559,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -571,6 +571,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index 4cf841b3e9..e6615316f7 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -630,7 +630,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -642,6 +642,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index bbb9cfff7f..50d6395d7f 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1251,7 +1251,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1269,6 +1269,24 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 0c615f1802..974346f980 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -629,7 +629,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -641,6 +641,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index e468a90911..812ebd5e0a 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -627,7 +627,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -639,6 +639,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index b46a515864..24f22dd53f 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1248,7 +1248,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1266,6 +1266,24 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index d06e67a5e2..9af219d59d 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -626,7 +626,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -638,6 +638,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index a0c47fd84e..439f609233 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -654,7 +654,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -666,6 +666,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index db68047af7..53c114699c 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1277,7 +1277,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1295,6 +1295,24 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 71999ab677..6d91c4ac75 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -653,7 +653,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -665,6 +665,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 3a2874f08a..d61b339dd9 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -621,7 +621,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -633,6 +633,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 2416987852..a758fbabc5 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1225,7 +1225,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1243,6 +1243,24 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index eda271a1b2..48e8299c23 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -620,7 +620,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -632,6 +632,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 2b5cfdae87..6a15994158 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -626,7 +626,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -638,6 +638,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 6a191f3ce8..4d0def8fc7 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1010,7 +1010,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1024,6 +1024,20 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 6a191f3ce8..4d0def8fc7 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1010,7 +1010,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1024,6 +1024,20 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 48b4ced22f..ead8df9815 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -625,7 +625,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -637,6 +637,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index ec1fea19fc..1936c89c70 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -626,7 +626,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -638,6 +638,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 049bef7aa6..d72b0c93d3 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1009,7 +1009,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1023,6 +1023,20 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 206a3a86a2..4adb6402ae 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -625,7 +625,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -637,6 +637,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 34fbc59118..c9f53064ff 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -804,7 +804,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -816,6 +816,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 2a836cbc21..b2e2c3264b 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1021,7 +1021,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1033,6 +1033,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 3380b8a9aa..c630356571 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -803,7 +803,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -815,6 +815,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index 0ec9ebeafe..17f4f6c4f0 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -805,7 +805,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -817,6 +817,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index b3fd8eb6c6..3ea2911762 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -996,7 +996,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -1008,6 +1008,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 210024bc44..77286e9aef 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -804,7 +804,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -816,6 +816,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 2aade71dae..d304fbd62b 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -805,7 +805,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -817,6 +817,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 36cec1ee6b..3e6cc25529 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -954,7 +954,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -965,6 +965,17 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 8316b40fce..a6fae9e3f1 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -804,7 +804,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -816,6 +816,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index cabd1c3694..060d96ab09 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -838,7 +838,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -850,6 +850,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 67a8a5f5e7..75f83cb376 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -979,7 +979,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -990,6 +990,17 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 45252b6b81..66dcb81fe6 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -837,7 +837,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -849,6 +849,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index cc5cbfbf19..72df5e5e7d 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -838,7 +838,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -850,6 +850,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index d0761a2c57..6a756782cd 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -979,7 +979,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -990,6 +990,17 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index df2f9d27ad..ef7b2bb67b 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -837,7 +837,7 @@ + + + +- KnightsMill ++ KnightsMill + + + +@@ -849,6 +849,18 @@ + + + ++ KnightsMill-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Nehalem + Nehalem-IBRS + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch new file mode 100644 index 0000000..9abbd58 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-Opteron_G1-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From a16cad37582dc4641a63b9494c0c2e62b20cd8a5 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:45:11 +0100 +Subject: [PATCH] cpu_map: Add Opteron_G1-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit a1625b73f6408918a3a5b07572b21d5bbb5f2fbd) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_Opteron_G1-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_Opteron_G1-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 74b315c661..4cf884e778 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -137,6 +137,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 47c93deace..8385c89552 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -112,6 +112,7 @@ cpumap_data = [ + 'x86_Nehalem-v1.xml', + 'x86_Nehalem-v2.xml', + 'x86_Nehalem.xml', ++ 'x86_Opteron_G1-v1.xml', + 'x86_Opteron_G1.xml', + 'x86_Opteron_G2.xml', + 'x86_Opteron_G3.xml', +diff --git a/src/cpu_map/x86_Opteron_G1-v1.xml b/src/cpu_map/x86_Opteron_G1-v1.xml +new file mode 100644 +index 0000000000..b040da4dea +--- /dev/null ++++ b/src/cpu_map/x86_Opteron_G1-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 27d36feccf..d12aa0d569 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -572,7 +572,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index b06febb821..2aabe77417 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1067,7 +1067,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 21b4ab8c5c..743262e1a0 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -571,7 +571,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 83bb914c7d..b15ba4ebb6 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -594,7 +594,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 47ab7240fb..38b2861714 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1157,7 +1157,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index cc212722f5..01a0eb2f47 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -593,7 +593,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index ec7abc3903..ac184c5075 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -664,7 +664,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 87fe22edd7..02b362c722 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1297,7 +1297,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 35bba84033..00b61e4380 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -663,7 +663,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index b448d7bdb8..dc82ce2aa9 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -661,7 +661,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index a8a96f2bb4..1a016f7379 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1294,7 +1294,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 303b714aa7..b5389e8a3f 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -660,7 +660,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 9da8e156e2..ccb8bb7f7b 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -688,7 +688,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index a5b9edaeb6..e0e53e543d 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1323,7 +1323,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 3029403bac..980c296c18 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -687,7 +687,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 259613d7fe..10d31b6007 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -655,7 +655,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index d3ecad143c..e916f523ac 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1271,7 +1271,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 7f08dd995d..434fa7bd95 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -654,7 +654,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 1057fc58d3..80497c5125 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -660,7 +660,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index fa4e9cfb8c..e67ae9b280 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1048,7 +1048,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index fa4e9cfb8c..e67ae9b280 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1048,7 +1048,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 0c0f363d2b..e0a1209cea 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -659,7 +659,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index b1de96fadd..03c40996e1 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -660,7 +660,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index c83819435d..3d52b5fda0 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1047,7 +1047,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 8f195f0e39..8c84a54239 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -659,7 +659,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 5495883fe9..dcce5a827f 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -838,7 +838,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 87fc57da66..d086460c7d 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1055,7 +1055,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 43703fefab..19ff721d09 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -837,7 +837,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index 2eab4e49b1..c09f4c56bf 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -839,7 +839,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 08b45ba90b..13c2cc5439 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1030,7 +1030,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 28b233d35d..bd6c173c04 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -838,7 +838,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 16a3cdacb5..f644b1ac5c 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -839,7 +839,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 549e21c273..2107e5b7be 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -986,7 +986,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 16e0d61c51..5cf479694e 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -838,7 +838,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 2b33304882..5c52c08ee7 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -872,7 +872,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index f91fcdd4e5..1d41d3ef8c 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1011,7 +1011,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 82fe2b3b1a..dfb6f741c4 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -871,7 +871,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 0c896766cb..c711064a04 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -872,7 +872,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 94c6914767..caf86d2c2b 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1011,7 +1011,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 1f73e3903c..16a34ed042 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -871,7 +871,8 @@ + + + +- Opteron_G1 ++ Opteron_G1 ++ Opteron_G1-v1 + Opteron_G2 + Opteron_G3 + Opteron_G4 +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch new file mode 100644 index 0000000..8669e31 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-Opteron_G2-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From d70b69c794be4bcda17250c0101772bd2ffd2996 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:47:52 +0100 +Subject: [PATCH] cpu_map: Add Opteron_G2-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 51ffa44fb4242bd6c6610271a6c45d2c3672a55d) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_Opteron_G2-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_Opteron_G2-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 4cf884e778..0070796dee 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -139,6 +139,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 8385c89552..fb6494a14a 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -114,6 +114,7 @@ cpumap_data = [ + 'x86_Nehalem.xml', + 'x86_Opteron_G1-v1.xml', + 'x86_Opteron_G1.xml', ++ 'x86_Opteron_G2-v1.xml', + 'x86_Opteron_G2.xml', + 'x86_Opteron_G3.xml', + 'x86_Opteron_G4.xml', +diff --git a/src/cpu_map/x86_Opteron_G2-v1.xml b/src/cpu_map/x86_Opteron_G2-v1.xml +new file mode 100644 +index 0000000000..8f0a05f37c +--- /dev/null ++++ b/src/cpu_map/x86_Opteron_G2-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index d12aa0d569..8f0b9b3bff 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -574,7 +574,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 2aabe77417..b4f2c700f9 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1069,7 +1069,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 743262e1a0..bd3095fec9 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -573,7 +573,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index b15ba4ebb6..b426bd1e63 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -596,7 +596,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 38b2861714..d89a9b2c32 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1159,7 +1159,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 01a0eb2f47..a8773fb4f7 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -595,7 +595,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index ac184c5075..de1f78b335 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -666,7 +666,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 02b362c722..581afc86a0 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1299,7 +1299,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 00b61e4380..53d83980a6 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -665,7 +665,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index dc82ce2aa9..77eab8aa95 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -663,7 +663,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 1a016f7379..710866e495 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1296,7 +1296,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index b5389e8a3f..99fe26dc76 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -662,7 +662,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index ccb8bb7f7b..eab56f9a7c 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -690,7 +690,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index e0e53e543d..e5b4cff7c6 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1325,7 +1325,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 980c296c18..6ec56068bd 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -689,7 +689,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 10d31b6007..0e27b3400c 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -657,7 +657,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index e916f523ac..e588593d91 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1273,7 +1273,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 434fa7bd95..7cb9663805 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -656,7 +656,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 80497c5125..c66731ceac 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -662,7 +662,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index e67ae9b280..ec61c328c9 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1050,7 +1050,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index e67ae9b280..ec61c328c9 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1050,7 +1050,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index e0a1209cea..8fd837d2c4 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -661,7 +661,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 03c40996e1..2a78fe6926 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -662,7 +662,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 3d52b5fda0..cb7bb1513c 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1049,7 +1049,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 8c84a54239..7c66d893ae 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -661,7 +661,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index dcce5a827f..1d23c25196 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -840,7 +840,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index d086460c7d..768769a4ef 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1057,7 +1057,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 19ff721d09..95106cfeab 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -839,7 +839,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index c09f4c56bf..5b777b730b 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -841,7 +841,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 13c2cc5439..0ea4c2cdb8 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1032,7 +1032,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index bd6c173c04..506b949225 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -840,7 +840,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index f644b1ac5c..d84324eac6 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -841,7 +841,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 2107e5b7be..cccf48aafb 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -988,7 +988,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 5cf479694e..05c06c9b25 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -840,7 +840,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 5c52c08ee7..e295c808d7 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -874,7 +874,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 1d41d3ef8c..8b338c75be 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1013,7 +1013,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index dfb6f741c4..6b2c1f15b5 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -873,7 +873,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index c711064a04..ab82a874b1 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -874,7 +874,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index caf86d2c2b..bf20e3d536 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1013,7 +1013,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 16a34ed042..d28d4c1f14 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -873,7 +873,8 @@ + + Opteron_G1 + Opteron_G1-v1 +- Opteron_G2 ++ Opteron_G2 ++ Opteron_G2-v1 + Opteron_G3 + Opteron_G4 + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch new file mode 100644 index 0000000..4531999 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-Opteron_G3-v1-CPU-model.patch @@ -0,0 +1,768 @@ +From d46a39eb87ab713ef82982ed9578ab1e5e826237 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:48:47 +0100 +Subject: [PATCH] cpu_map: Add Opteron_G3-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 422d90dc56d34879e6f52f34516c92dfc7f286fa) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_Opteron_G3-v1.xml | 6 ++++++ + tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml | 2 +- + tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml | 2 +- + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 45 files changed, 132 insertions(+), 42 deletions(-) + create mode 100644 src/cpu_map/x86_Opteron_G3-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 0070796dee..cdb8a568a6 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -141,6 +141,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index fb6494a14a..d735c54fd6 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -116,6 +116,7 @@ cpumap_data = [ + 'x86_Opteron_G1.xml', + 'x86_Opteron_G2-v1.xml', + 'x86_Opteron_G2.xml', ++ 'x86_Opteron_G3-v1.xml', + 'x86_Opteron_G3.xml', + 'x86_Opteron_G4.xml', + 'x86_Opteron_G5.xml', +diff --git a/src/cpu_map/x86_Opteron_G3-v1.xml b/src/cpu_map/x86_Opteron_G3-v1.xml +new file mode 100644 +index 0000000000..8a625c5b1f +--- /dev/null ++++ b/src/cpu_map/x86_Opteron_G3-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml +index 53b98713e5..87aee9febe 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Opteron_G3 ++ Opteron_G3-v1 + AMD + + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml +index 53b98713e5..87aee9febe 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Opteron_G3 ++ Opteron_G3-v1 + AMD + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 8f0b9b3bff..f673f670a0 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -576,7 +576,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index b4f2c700f9..6a3af31956 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1071,10 +1071,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index bd3095fec9..f0f6303099 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -575,7 +575,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index b426bd1e63..24f2c91022 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -598,7 +598,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index d89a9b2c32..111613d0b8 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1161,10 +1161,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index a8773fb4f7..82dbca5341 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -597,7 +597,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index de1f78b335..a869314868 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -668,7 +668,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 581afc86a0..660744d28c 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1301,10 +1301,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 53d83980a6..8bc739091e 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -667,7 +667,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index 77eab8aa95..a3014c8142 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -665,7 +665,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 710866e495..b4d902b44c 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1298,10 +1298,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 99fe26dc76..2e9bc75e1f 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -664,7 +664,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index eab56f9a7c..8a6379b7b9 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -692,7 +692,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index e5b4cff7c6..02a5887255 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1327,10 +1327,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 6ec56068bd..7168fb805a 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -691,7 +691,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 0e27b3400c..93373fbe5b 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -659,7 +659,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index e588593d91..890164b50a 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1275,10 +1275,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 7cb9663805..1c0a102063 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -658,7 +658,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index c66731ceac..6348bf9eb9 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -664,7 +664,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index ec61c328c9..dc9a0cc4b2 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1052,10 +1052,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index ec61c328c9..dc9a0cc4b2 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1052,10 +1052,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 8fd837d2c4..70c15a677a 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -663,7 +663,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 2a78fe6926..875f902101 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -664,7 +664,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index cb7bb1513c..52324024a0 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1051,10 +1051,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 7c66d893ae..6291c3c303 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -663,7 +663,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 1d23c25196..cc248936df 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -842,7 +842,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 768769a4ef..b1e820ea61 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1059,10 +1059,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 95106cfeab..c3cd328dea 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -841,7 +841,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index 5b777b730b..5dbfe76dd8 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -843,7 +843,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 0ea4c2cdb8..a51e57f66d 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1034,10 +1034,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 506b949225..dfc98e58f0 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -842,7 +842,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index d84324eac6..9c21297cec 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -843,7 +843,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index cccf48aafb..81c404727c 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -990,10 +990,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 05c06c9b25..744280a43a 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -842,7 +842,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index e295c808d7..3b5ee6ec78 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -876,7 +876,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 8b338c75be..9091305bb5 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1015,10 +1015,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 6b2c1f15b5..330e9748b9 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -875,7 +875,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index ab82a874b1..adf0140fc2 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -876,7 +876,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index bf20e3d536..93efe9253b 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1015,10 +1015,14 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 + + + ++ Opteron_G3-v1 ++ ++ ++ + Opteron_G4 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index d28d4c1f14..e2e11f239f 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -875,7 +875,8 @@ + Opteron_G1-v1 + Opteron_G2 + Opteron_G2-v1 +- Opteron_G3 ++ Opteron_G3 ++ Opteron_G3-v1 + Opteron_G4 + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch new file mode 100644 index 0000000..6079d84 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-Opteron_G4-v1-CPU-model.patch @@ -0,0 +1,1097 @@ +From bfeef75f78413d6aff187dedd490781501dfef36 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:49:46 +0100 +Subject: [PATCH] cpu_map: Add Opteron_G4-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit d092730fb4e629ec87c45e7a4340ae63c853556c) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_Opteron_G4-v1.xml | 6 ++++++ + tests/cputestdata/x86_64-cpuid-FX-8150-host.xml | 2 +- + tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml | 2 +- + tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml | 2 +- + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 11 ++++++++++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 11 ++++++++++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 11 ++++++++++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 11 ++++++++++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 11 ++++++++++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 11 ++++++++++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 10 +++++++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 10 +++++++++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 10 +++++++++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 9 ++++++++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 9 ++++++++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 9 ++++++++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 9 ++++++++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 9 ++++++++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 7 ++++++- + 46 files changed, 294 insertions(+), 43 deletions(-) + create mode 100644 src/cpu_map/x86_Opteron_G4-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index cdb8a568a6..40be965c36 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -143,6 +143,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index d735c54fd6..b1bff43d1a 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -118,6 +118,7 @@ cpumap_data = [ + 'x86_Opteron_G2.xml', + 'x86_Opteron_G3-v1.xml', + 'x86_Opteron_G3.xml', ++ 'x86_Opteron_G4-v1.xml', + 'x86_Opteron_G4.xml', + 'x86_Opteron_G5.xml', + 'x86_Penryn-v1.xml', +diff --git a/src/cpu_map/x86_Opteron_G4-v1.xml b/src/cpu_map/x86_Opteron_G4-v1.xml +new file mode 100644 +index 0000000000..e89c93948d +--- /dev/null ++++ b/src/cpu_map/x86_Opteron_G4-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml +index d8c6a8ac0f..9549fa1507 100644 +--- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Opteron_G4 ++ Opteron_G4-v1 + AMD + + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml +index d8c6a8ac0f..9549fa1507 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Opteron_G4 ++ Opteron_G4-v1 + AMD + + +diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml +index d8c6a8ac0f..9549fa1507 100644 +--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Opteron_G4 ++ Opteron_G4-v1 + AMD + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index f673f670a0..48303b17e1 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -578,11 +578,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 6a3af31956..bc8fd8b7e8 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1079,7 +1079,7 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + +@@ -1088,6 +1088,15 @@ + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index f0f6303099..a149caaac7 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -577,11 +577,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 24f2c91022..342e2b3ccd 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -600,11 +600,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 111613d0b8..ddf0080cc1 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1169,7 +1169,7 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + +@@ -1178,6 +1178,15 @@ + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 82dbca5341..79a282c065 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -599,11 +599,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index a869314868..edabb37ead 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -670,11 +670,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 660744d28c..801fddf93a 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1309,7 +1309,7 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + +@@ -1318,6 +1318,15 @@ + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 8bc739091e..386083131c 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -669,11 +669,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index a3014c8142..12aa247563 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -667,11 +667,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index b4d902b44c..8eaadfd389 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1306,7 +1306,7 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + +@@ -1315,6 +1315,15 @@ + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 2e9bc75e1f..5744c2cbbf 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -666,11 +666,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 8a6379b7b9..7129b49670 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -694,11 +694,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index 02a5887255..e10973b629 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1335,7 +1335,7 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + +@@ -1344,6 +1344,15 @@ + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 7168fb805a..98cf875d10 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -693,11 +693,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 93373fbe5b..7617177578 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -661,11 +661,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 890164b50a..6d1b777442 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1283,7 +1283,7 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + +@@ -1292,6 +1292,15 @@ + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 1c0a102063..95b3476116 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -660,11 +660,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 6348bf9eb9..fe591e6644 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -666,11 +666,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index dc9a0cc4b2..6e6eb8d57c 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1060,7 +1060,7 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + +@@ -1068,6 +1068,14 @@ + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index dc9a0cc4b2..6e6eb8d57c 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1060,7 +1060,7 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + +@@ -1068,6 +1068,14 @@ + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 70c15a677a..3568c4011b 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -665,11 +665,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 875f902101..3846d633c1 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -666,11 +666,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 52324024a0..1983d5e635 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1059,7 +1059,7 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + +@@ -1067,6 +1067,14 @@ + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 6291c3c303..0fd169dda6 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -665,11 +665,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index cc248936df..2f1ef6b196 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -844,11 +844,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index b1e820ea61..816891f303 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1067,13 +1067,20 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index c3cd328dea..6bf06dd445 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -843,11 +843,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index 5dbfe76dd8..b4258868aa 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -845,11 +845,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index a51e57f66d..fc92315651 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1042,13 +1042,20 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index dfc98e58f0..2b33577cec 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -844,11 +844,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 9c21297cec..85216b05a4 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -845,11 +845,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 81c404727c..8cf49e42f8 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -998,13 +998,20 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 744280a43a..6570359797 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -844,11 +844,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 3b5ee6ec78..b7aa3acedd 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -878,11 +878,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 9091305bb5..fbcae333c6 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1023,13 +1023,20 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 330e9748b9..65f4238125 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -877,11 +877,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index adf0140fc2..21f38b8f2f 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -878,11 +878,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 93efe9253b..5071762544 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1023,13 +1023,20 @@ + + + +- Opteron_G4 ++ Opteron_G4 + + + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ ++ ++ + Opteron_G5 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index e2e11f239f..e3391a74bf 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -877,11 +877,16 @@ + Opteron_G2-v1 + Opteron_G3 + Opteron_G3-v1 +- Opteron_G4 ++ Opteron_G4 + + + + ++ Opteron_G4-v1 ++ ++ ++ ++ + Opteron_G5 + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch new file mode 100644 index 0000000..e916411 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-Opteron_G5-v1-CPU-model.patch @@ -0,0 +1,1154 @@ +From d32138717aa3212542a788a4824a832766cedd51 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 16:01:20 +0100 +Subject: [PATCH] cpu_map: Add Opteron_G5-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 9bc479a3c0e0453e50ceb149abc41c5787e61735) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_Opteron_G5-v1.xml | 6 ++++++ + tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml | 2 +- + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 14 +++++++++++++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 14 +++++++++++++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 14 +++++++++++++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 14 +++++++++++++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 14 +++++++++++++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 14 +++++++++++++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 11 ++++++++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 11 ++++++++++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 11 ++++++++++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 10 +++++++++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 10 +++++++++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 10 +++++++++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 10 +++++++++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 8 +++++++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 10 +++++++++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 8 +++++++- + 44 files changed, 344 insertions(+), 41 deletions(-) + create mode 100644 src/cpu_map/x86_Opteron_G5-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 40be965c36..9bd90cc83b 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -145,6 +145,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index b1bff43d1a..5ac3c82dc7 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -120,6 +120,7 @@ cpumap_data = [ + 'x86_Opteron_G3.xml', + 'x86_Opteron_G4-v1.xml', + 'x86_Opteron_G4.xml', ++ 'x86_Opteron_G5-v1.xml', + 'x86_Opteron_G5.xml', + 'x86_Penryn-v1.xml', + 'x86_Penryn.xml', +diff --git a/src/cpu_map/x86_Opteron_G5-v1.xml b/src/cpu_map/x86_Opteron_G5-v1.xml +new file mode 100644 +index 0000000000..7e0f16775e +--- /dev/null ++++ b/src/cpu_map/x86_Opteron_G5-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml +index e4a455df15..738e8ea67a 100644 +--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Opteron_G5 ++ Opteron_G5-v1 + AMD + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 48303b17e1..ce3ba14684 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -588,12 +588,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index bc8fd8b7e8..92827056db 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1097,7 +1097,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1109,6 +1109,18 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index a149caaac7..21e8a55a63 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -587,12 +587,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 342e2b3ccd..ba09a6cbb2 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -610,12 +610,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index ddf0080cc1..dc15afa017 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1187,7 +1187,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1199,6 +1199,18 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 79a282c065..72ceb31595 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -609,12 +609,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index edabb37ead..deaa3a0041 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -680,12 +680,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 801fddf93a..469752cf32 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1327,7 +1327,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1339,6 +1339,18 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 386083131c..7484c13f2c 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -679,12 +679,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index 12aa247563..d1a8399812 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -677,12 +677,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 8eaadfd389..8c8f016233 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1324,7 +1324,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1336,6 +1336,18 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 5744c2cbbf..1f21b8be4e 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -676,12 +676,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 7129b49670..2c5129453e 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -704,12 +704,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index e10973b629..d4a567f5c6 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1353,7 +1353,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1365,6 +1365,18 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 98cf875d10..6fa08af994 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -703,12 +703,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 7617177578..8bed31ad22 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -671,12 +671,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 6d1b777442..cb7fd8811b 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1301,7 +1301,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1313,6 +1313,18 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 95b3476116..a0f8b13f72 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -670,12 +670,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index fe591e6644..f9d27024fc 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -676,12 +676,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 6e6eb8d57c..c7728ac454 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1076,7 +1076,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1085,6 +1085,15 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 6e6eb8d57c..c7728ac454 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1076,7 +1076,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1085,6 +1085,15 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 3568c4011b..f0d9493353 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -675,12 +675,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 3846d633c1..b8c376cb14 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -676,12 +676,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 1983d5e635..d3c9830a1a 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1075,7 +1075,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1084,6 +1084,15 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 0fd169dda6..e8df30ae07 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -675,12 +675,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 2f1ef6b196..197efcbe59 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -854,12 +854,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 816891f303..07fdd0c3a3 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1081,7 +1081,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1089,6 +1089,14 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 6bf06dd445..ec95c1a2ac 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -853,12 +853,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index b4258868aa..d1d330df87 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -855,12 +855,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index fc92315651..75cb1b8f17 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1056,7 +1056,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1064,6 +1064,14 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 2b33577cec..5f6e72e7ca 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -854,12 +854,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 85216b05a4..3c005d0c10 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -855,12 +855,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 8cf49e42f8..3a6424eddf 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1012,7 +1012,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1020,6 +1020,14 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 6570359797..79c39678ca 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -854,12 +854,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index b7aa3acedd..117947ef13 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -888,12 +888,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index fbcae333c6..c2c244f464 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1037,7 +1037,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1045,6 +1045,14 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 65f4238125..30959cd723 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -887,12 +887,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 21f38b8f2f..5fc9576495 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -888,12 +888,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 5071762544..eeba43f9fa 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1037,7 +1037,7 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + +@@ -1045,6 +1045,14 @@ + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index e3391a74bf..96d789ee1c 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -887,12 +887,18 @@ + + + +- Opteron_G5 ++ Opteron_G5 + + + + + ++ Opteron_G5-v1 ++ ++ ++ ++ ++ + Penryn + Penryn-v1 + SandyBridge +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch new file mode 100644 index 0000000..0cbcb64 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-Penryn-v1-CPU-model.patch @@ -0,0 +1,684 @@ +From 8eb51b4d75eccc4ba1d2f812a9ff13cb3953c22a Mon Sep 17 00:00:00 2001 +Message-ID: <8eb51b4d75eccc4ba1d2f812a9ff13cb3953c22a.1734433246.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:41:18 +0100 +Subject: [PATCH] cpu_map: Add Penryn-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 537f136549ea9c02642b6114c540c6cb1276ed6e) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_Penryn-v1.xml | 6 ++++++ + tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml | 2 +- + tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml | 2 +- + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 45 files changed, 90 insertions(+), 42 deletions(-) + create mode 100644 src/cpu_map/x86_Penryn-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index e9a180526e..16ebe36539 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -41,6 +41,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index cbf7bb407b..4d74431c55 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -115,6 +115,7 @@ cpumap_data = [ + 'x86_Opteron_G3.xml', + 'x86_Opteron_G4.xml', + 'x86_Opteron_G5.xml', ++ 'x86_Penryn-v1.xml', + 'x86_Penryn.xml', + 'x86_pentium-v1.xml', + 'x86_pentium.xml', +diff --git a/src/cpu_map/x86_Penryn-v1.xml b/src/cpu_map/x86_Penryn-v1.xml +new file mode 100644 +index 0000000000..5da70a233e +--- /dev/null ++++ b/src/cpu_map/x86_Penryn-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml +index dac84ba5fc..5034355859 100644 +--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Penryn ++ Penryn-v1 + Intel + + +diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml +index b7bc4cbb5b..a0516e6652 100644 +--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- Penryn ++ Penryn-v1 + Intel + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 3a14131fda..efd8f06104 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -574,7 +574,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 5223402151..beb923a1f3 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1076,7 +1076,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index a3638c64a4..d9ae5568be 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -573,7 +573,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 9af3b3768d..403b9f6674 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -596,7 +596,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 7932c25f39..f2ad35c6cd 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1166,7 +1166,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 72c598466a..07570f5b02 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -595,7 +595,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index b3ba5b020d..4cf841b3e9 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -666,7 +666,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 69a73ea9b2..bbb9cfff7f 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1306,7 +1306,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 54edabd43f..0c615f1802 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -665,7 +665,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index be908c6cc6..e468a90911 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -663,7 +663,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 8fb08191ea..b46a515864 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1303,7 +1303,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 1f9bdf36af..d06e67a5e2 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -662,7 +662,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 14081dfafd..a0c47fd84e 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -690,7 +690,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index d9ba0202bd..db68047af7 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1332,7 +1332,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index bba1b69e41..71999ab677 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -689,7 +689,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 9fb0fbe581..3a2874f08a 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -657,7 +657,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index b7f01c2b58..2416987852 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1280,7 +1280,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index f7e9853077..eda271a1b2 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -656,7 +656,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 4b670c95fe..2b5cfdae87 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -662,7 +662,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 8b85bd98b4..6a191f3ce8 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1057,7 +1057,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 8b85bd98b4..6a191f3ce8 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1057,7 +1057,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 0e1328f1fc..48b4ced22f 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -661,7 +661,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index b3040a9e6e..ec1fea19fc 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -662,7 +662,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index ac533cccfa..049bef7aa6 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1056,7 +1056,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 0558eb7588..206a3a86a2 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -661,7 +661,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 3b334589ed..34fbc59118 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -840,7 +840,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 9815a01beb..2a836cbc21 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1064,7 +1064,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 3b1796949f..3380b8a9aa 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -839,7 +839,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index c4d2a768bd..0ec9ebeafe 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -841,7 +841,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 207092ba7b..b3fd8eb6c6 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1039,7 +1039,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 855dfef498..210024bc44 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -840,7 +840,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index f7ddcd9aff..2aade71dae 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -841,7 +841,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 3419e26d32..36cec1ee6b 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -996,7 +996,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 43bc77f7cc..8316b40fce 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -840,7 +840,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 0a962420cd..cabd1c3694 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -874,7 +874,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 02209df41b..67a8a5f5e7 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1021,7 +1021,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 49e1df7be4..45252b6b81 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -873,7 +873,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 56449ad3db..cc5cbfbf19 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -874,7 +874,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 04a759a16b..d0761a2c57 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1021,7 +1021,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 7b3379b3e5..df2f9d27ad 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -873,7 +873,8 @@ + + + +- Penryn ++ Penryn ++ Penryn-v1 + SandyBridge + SandyBridge-IBRS + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch new file mode 100644 index 0000000..116a530 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-athlon-v1-CPU-model.patch @@ -0,0 +1,879 @@ +From 74bf67730d74babf7f32e3c3328eb64a980fb0dc Mon Sep 17 00:00:00 2001 +Message-ID: <74bf67730d74babf7f32e3c3328eb64a980fb0dc.1734433246.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:43:25 +0100 +Subject: [PATCH] cpu_map: Add athlon-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 6b775a68ec90595c2a0892c70985ca0784f87c10) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_athlon-v1.xml | 6 ++++++ + tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml | 2 +- + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 7 ++++++- + 44 files changed, 193 insertions(+), 41 deletions(-) + create mode 100644 src/cpu_map/x86_athlon-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index a0aa677dee..5f42fdc7fd 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -133,6 +133,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 70c7d2091b..8d45feee00 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -24,6 +24,7 @@ cpumap_data = [ + 'ppc64_vendors.xml', + 'x86_486-v1.xml', + 'x86_486.xml', ++ 'x86_athlon-v1.xml', + 'x86_athlon.xml', + 'x86_Broadwell-IBRS.xml', + 'x86_Broadwell-noTSX-IBRS.xml', +diff --git a/src/cpu_map/x86_athlon-v1.xml b/src/cpu_map/x86_athlon-v1.xml +new file mode 100644 +index 0000000000..cefe282c51 +--- /dev/null ++++ b/src/cpu_map/x86_athlon-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml +index 6a4196b735..b337947d3e 100644 +--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- athlon ++ athlon-v1 + AMD + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 43e1ca8861..c71286deb2 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -788,11 +788,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 0718de04f7..26f3eed92b 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1431,7 +1431,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 6eb78e68f0..6e67479e25 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -787,11 +787,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 3b716faf00..d5b703e09a 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -810,11 +810,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index bd8c0a086c..5928a72da9 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1521,7 +1521,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index b6ec55cf0c..69c1eb816f 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -809,11 +809,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index e6615316f7..c65db67a41 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -911,11 +911,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 50d6395d7f..e85937b36d 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1718,7 +1718,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 974346f980..b1b76ad6fd 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -910,11 +910,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index 812ebd5e0a..fa27ff520a 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -917,11 +917,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 24f22dd53f..33ff630126 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1733,7 +1733,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 9af219d59d..0cf8733f1e 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -916,11 +916,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 439f609233..ba3669f4b2 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -944,11 +944,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index 53c114699c..43b6a68e24 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1757,7 +1757,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 6d91c4ac75..a7d454b330 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -943,11 +943,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index d61b339dd9..08c27dbab8 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -911,11 +911,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index a758fbabc5..8e974ebfde 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1705,7 +1705,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 48e8299c23..71cb90d172 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -910,11 +910,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 6a15994158..2d346b5a15 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -916,11 +916,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 4d0def8fc7..31a774af8a 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1414,7 +1414,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 4d0def8fc7..31a774af8a 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1414,7 +1414,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index ead8df9815..46b0e223c7 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -915,11 +915,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 1936c89c70..95d809d412 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -998,11 +998,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index d72b0c93d3..95c413a22f 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1509,7 +1509,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 4adb6402ae..4cd5d8e640 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -997,11 +997,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index c9f53064ff..94def05942 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1227,11 +1227,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index b2e2c3264b..958b250336 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1493,7 +1493,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index c630356571..4480ff39cd 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1226,11 +1226,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index 17f4f6c4f0..9f91f9ef93 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1228,11 +1228,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 3ea2911762..cf6ce11821 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1460,7 +1460,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 77286e9aef..07034ee9a7 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1227,11 +1227,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index d304fbd62b..020ad5bdba 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1228,11 +1228,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 3e6cc25529..b0a25f5ea6 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1389,7 +1389,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index a6fae9e3f1..f6e47f704a 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1227,11 +1227,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 060d96ab09..b501544f11 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1364,11 +1364,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 75f83cb376..1704b3b265 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1494,7 +1494,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 66dcb81fe6..3a1642af94 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1363,11 +1363,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 72df5e5e7d..91eab35039 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1364,11 +1364,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 6a756782cd..e807b965f6 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1494,7 +1494,8 @@ + + + +- athlon ++ athlon ++ athlon-v1 + core2duo + core2duo-v1 + coreduo +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index ef7b2bb67b..a876e7b98f 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1363,11 +1363,16 @@ + + + +- athlon ++ athlon + + + + ++ athlon-v1 ++ ++ ++ ++ + core2duo + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch new file mode 100644 index 0000000..dfa2b4f --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-core2duo-v1-CPU-model.patch @@ -0,0 +1,827 @@ +From 0d09852c46c6acfac300098f853f9f6f53ef0104 Mon Sep 17 00:00:00 2001 +Message-ID: <0d09852c46c6acfac300098f853f9f6f53ef0104.1734433246.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:32:57 +0100 +Subject: [PATCH] cpu_map: Add core2duo-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit a3cab1ae67c4d0657a1ebfeaaa0e6d41d951d780) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_core2duo-v1.xml | 6 ++++++ + tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml | 2 +- + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 6 +++++- + 44 files changed, 167 insertions(+), 41 deletions(-) + create mode 100644 src/cpu_map/x86_core2duo-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 9534e5f308..eb847341da 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -21,6 +21,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 5e85e24eb9..b179fb442c 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -44,6 +44,7 @@ cpumap_data = [ + 'x86_Cooperlake-v1.xml', + 'x86_Cooperlake-v2.xml', + 'x86_Cooperlake.xml', ++ 'x86_core2duo-v1.xml', + 'x86_core2duo.xml', + 'x86_coreduo-v1.xml', + 'x86_coreduo.xml', +diff --git a/src/cpu_map/x86_core2duo-v1.xml b/src/cpu_map/x86_core2duo-v1.xml +new file mode 100644 +index 0000000000..e23855ae75 +--- /dev/null ++++ b/src/cpu_map/x86_core2duo-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml +index a1a42d4b83..1bad0b11d3 100644 +--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- core2duo ++ core2duo-v1 + Intel + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 1ba8a7eb11..d4853706b3 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -779,10 +779,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 1abbfcc4bb..03c88241c8 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1412,7 +1412,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 3040deeb50..75592e124e 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -778,10 +778,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index cb59946b78..de38e87010 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -801,10 +801,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index e6165eab77..29aa3f9adc 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1502,7 +1502,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 5aae9a3fca..6469251e47 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -800,10 +800,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index 2898e56b41..3918fd5101 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -902,10 +902,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 2b5baf0a02..5d5b18cfdf 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1699,7 +1699,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 0fd3e38ee6..98bcfec2bb 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -901,10 +901,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index 690959d35a..ed4a66a4ca 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -908,10 +908,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 6153d8a9ee..a748c623bc 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1714,7 +1714,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 15edc7e73d..f9a0221e7b 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -907,10 +907,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index a1f68beb2a..6b97ff8ba7 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -935,10 +935,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index 9eda36d3c8..2e27e674f2 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1738,7 +1738,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 249baa1342..99d8cf9558 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -934,10 +934,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index b65196f979..e101305e83 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -902,10 +902,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 84df14bc63..24f90ed830 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1686,7 +1686,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 2e41f4a73a..0f993e3763 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -901,10 +901,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index ca8391756b..bfea565a00 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -907,10 +907,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 258212d852..91fc6133e4 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1399,7 +1399,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 258212d852..91fc6133e4 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1399,7 +1399,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 819010acff..1e8f10d17f 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -906,10 +906,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 68b1192153..8dfbc2b21a 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -989,10 +989,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index ea0bc81bea..6982dc8035 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1494,7 +1494,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index bddb1413a1..a739ec6b73 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -988,10 +988,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 7f1f4a2082..4d6e8c8a7f 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1218,10 +1218,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index e2fc678bb6..0009fb007d 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1480,7 +1480,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 4b0aed148d..74f9fe6dbe 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1217,10 +1217,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index ab371ea688..d4d7a9e079 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1219,10 +1219,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index a256fed6d7..b948f32538 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1447,7 +1447,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 3f952bb379..3e22f5e9b3 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1218,10 +1218,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 21358e340a..7a30c27b83 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1219,10 +1219,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index d34524193a..ee71c658cb 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1377,7 +1377,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 9bbb95c0cb..8509032a62 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1218,10 +1218,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index c5cbe2d855..b43b607c39 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1355,10 +1355,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 3ec8575cf4..b79140038c 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1482,7 +1482,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 513f4486cb..509b5a6c33 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1354,10 +1354,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 089ab497e0..9114ece766 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1355,10 +1355,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 64e893116a..e2e40d7ca2 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1482,7 +1482,8 @@ + + + athlon +- core2duo ++ core2duo ++ core2duo-v1 + coreduo + coreduo-v1 + kvm32 +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 6e4f518b23..4a5a09c488 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1354,10 +1354,14 @@ + + + +- core2duo ++ core2duo + + + ++ core2duo-v1 ++ ++ ++ + coreduo + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch new file mode 100644 index 0000000..8d35604 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-coreduo-v1-CPU-model.patch @@ -0,0 +1,814 @@ +From 679d1ce3b64151c9673a0287c5dada9f11b77cfc Mon Sep 17 00:00:00 2001 +Message-ID: <679d1ce3b64151c9673a0287c5dada9f11b77cfc.1734433245.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:30:57 +0100 +Subject: [PATCH] cpu_map: Add coreduo-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit ae14b20aaa11f506977b2e88b3c6050ad50ec33d) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_coreduo-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 6 +++++- + 43 files changed, 166 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_coreduo-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 87cc4f61ed..d8df3b214d 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -17,6 +17,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 6645786736..1213f6929c 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -45,6 +45,7 @@ cpumap_data = [ + 'x86_Cooperlake-v2.xml', + 'x86_Cooperlake.xml', + 'x86_core2duo.xml', ++ 'x86_coreduo-v1.xml', + 'x86_coreduo.xml', + 'x86_cpu64-rhel5.xml', + 'x86_cpu64-rhel6.xml', +diff --git a/src/cpu_map/x86_coreduo-v1.xml b/src/cpu_map/x86_coreduo-v1.xml +new file mode 100644 +index 0000000000..c32be47485 +--- /dev/null ++++ b/src/cpu_map/x86_coreduo-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index f887be4468..cb6db8f83c 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -783,10 +783,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 0c5a3a81f8..36625a07b3 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1413,7 +1413,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 7591b2efe9..fcd76f9bc8 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -782,10 +782,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index a7b325fd61..4b2d94b281 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -805,10 +805,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 63c1ff9b4a..b20dbe72c1 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1503,7 +1503,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 3d6ff5657e..ad3be21085 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -804,10 +804,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index e475c264ee..a76f03f910 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -906,10 +906,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 5deb101fe3..da44554a73 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1700,7 +1700,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index f4542588e8..4369595b2e 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -905,10 +905,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index c388b7919a..dc6dd2f743 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -912,10 +912,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index bae374c05b..d8bb03fbfd 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1715,7 +1715,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 43d1a8d3a2..69afbc55f0 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -911,10 +911,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index b882feace0..0798ee74de 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -939,10 +939,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index dcdad93bc4..07bbd505fa 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1739,7 +1739,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index f825365d4e..bf07fa3f51 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -938,10 +938,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index f8ac31d143..694561221f 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -906,10 +906,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index c4a159a3da..d98b895940 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1687,7 +1687,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 5efd8d499f..e02f39bdf5 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -905,10 +905,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index a0f10ca42d..faa838ee4b 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -911,10 +911,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 26e716e0e8..c65ffc40bb 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1400,7 +1400,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 26e716e0e8..c65ffc40bb 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1400,7 +1400,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 871949d74f..0a88511093 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -910,10 +910,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 9fb5e0a823..e931d7445d 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -993,10 +993,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index d7aeb43b83..c0cc453fd1 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1495,7 +1495,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 8e226ee237..59c36bfa49 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -992,10 +992,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 27fddae9f5..f822c040de 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1222,10 +1222,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 30169a55e4..7ea876c1fc 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1481,7 +1481,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index c91b05f312..56a57665f1 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1221,10 +1221,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index 76d9f80936..d2e14fcaab 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1223,10 +1223,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 7f08733452..25fe5a3f48 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1448,7 +1448,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 4bf5988cf3..dfcbcf2477 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1222,10 +1222,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 8e2d2a636e..7b20023b19 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1223,10 +1223,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 0b488faa07..ee58ddff1d 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1378,7 +1378,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 9b41cc5fcc..d2f19183f0 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1222,10 +1222,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 996a269525..3e3bd2b5e1 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1359,10 +1359,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 5d914aa62c..f4e8163256 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1483,7 +1483,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 094ec28df0..54d5323f71 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1358,10 +1358,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 0e9a63cf4e..b9697229d9 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1359,10 +1359,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 9fb8cb4e4a..cc672be9a1 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1483,7 +1483,8 @@ + + athlon + core2duo +- coreduo ++ coreduo ++ coreduo-v1 + kvm32 + kvm64 + n270 +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index d99a66ecfe..c29d1e99bc 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1358,10 +1358,14 @@ + + + +- coreduo ++ coreduo + + + ++ coreduo-v1 ++ ++ ++ + kvm32 + kvm64 + n270 +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch new file mode 100644 index 0000000..d55e392 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-kvm32-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From e116e273f4d3a88c2997f1780b3a8d0633907fcf Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:35:19 +0100 +Subject: [PATCH] cpu_map: Add kvm32-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 4a8259b5a3bfa224b431767e9091f54caefb25a2) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_kvm32-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_kvm32-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 0fe2a513ca..81d77e4dba 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -28,6 +28,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 61c5e403f9..d73a1b4feb 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -99,6 +99,7 @@ cpumap_data = [ + 'x86_IvyBridge-v2.xml', + 'x86_IvyBridge.xml', + 'x86_KnightsMill.xml', ++ 'x86_kvm32-v1.xml', + 'x86_kvm32.xml', + 'x86_kvm64.xml', + 'x86_n270-v1.xml', +diff --git a/src/cpu_map/x86_kvm32-v1.xml b/src/cpu_map/x86_kvm32-v1.xml +new file mode 100644 +index 0000000000..cce4b1d7c5 +--- /dev/null ++++ b/src/cpu_map/x86_kvm32-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 90a947b72a..da05a9358f 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -795,7 +795,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index a1d2982897..296f4bce12 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1416,7 +1416,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 1c6e65a408..dd5df8de0d 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -794,7 +794,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index bafaee4dc5..4330afb33a 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -817,7 +817,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index bac7c98eea..873d4b7b1f 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1506,7 +1506,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index fe78b42ab3..f1f8362f52 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -816,7 +816,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index c4e6cfeb84..7e0ed073a2 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -918,7 +918,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 3390d156e5..b93e3ca9ac 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1703,7 +1703,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 62d5a4bdad..8c538a6568 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -917,7 +917,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index 77fa39cf13..dc8fd0539b 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -924,7 +924,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index ee36631717..e075cc7dca 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1718,7 +1718,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index fb66ff6032..d0955a30f2 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -923,7 +923,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index fbbe1f7ed4..4f2d2a272d 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -951,7 +951,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index f5a84c16f7..fcb175557c 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1742,7 +1742,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index d828319061..07fa015c26 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -950,7 +950,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 968be6fc31..7880718caf 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -918,7 +918,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index d0a03a641c..e34444f915 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1690,7 +1690,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index a0492d152e..dd045555db 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -917,7 +917,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index dfb06177ff..34527a0fc0 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -923,7 +923,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 90908a78e2..14f0bc7f87 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1403,7 +1403,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 90908a78e2..14f0bc7f87 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1403,7 +1403,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index f3c03fe68b..de7e039b84 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -922,7 +922,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 27e43a875e..eeee7b926c 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -1005,7 +1005,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 8fc17e9d8a..882ef3ed4d 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1498,7 +1498,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index ccaf3af991..dee27a40c4 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -1004,7 +1004,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index f77e36d1ea..14f9d0a3a5 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1234,7 +1234,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 5e5cf92e53..1347de2c5b 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1484,7 +1484,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 3b53baae7a..6855f75ba4 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1233,7 +1233,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index a4faf9112c..63bce83ba5 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1235,7 +1235,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 3e7ba22317..6b4db43077 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1451,7 +1451,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index a2fbea3b21..b9449120d3 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1234,7 +1234,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index b945327d7a..5b0f2f84be 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1235,7 +1235,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 1c00bbb899..04049d17af 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1381,7 +1381,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index c0d45ff56b..4ec2b2e96d 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1234,7 +1234,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 7d5c0b114d..9e152d5b55 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1371,7 +1371,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 915970f0ca..1c79f73ae2 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1486,7 +1486,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 3703b8b6f4..0af8a79cb4 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1370,7 +1370,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index c76d4d112f..4cb0a22a9b 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1371,7 +1371,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index cf9ef74abe..99858a0b91 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1486,7 +1486,8 @@ + core2duo-v1 + coreduo + coreduo-v1 +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + n270-v1 +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index bb64a26754..cfedba3e8e 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1370,7 +1370,8 @@ + + + +- kvm32 ++ kvm32 ++ kvm32-v1 + kvm64 + n270 + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch new file mode 100644 index 0000000..6babb95 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-kvm64-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From 7297a02322a0fcc19ab46d0a39f0adae25bbb1ed Mon Sep 17 00:00:00 2001 +Message-ID: <7297a02322a0fcc19ab46d0a39f0adae25bbb1ed.1734433246.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:37:01 +0100 +Subject: [PATCH] cpu_map: Add kvm64-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 6d25eafaec0f138a57fbaa5c3e51952548ffae18) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_kvm64-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_kvm64-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 8077da260d..a9a8d1b2c4 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -34,6 +34,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 799a72df47..7ea53373ae 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -101,6 +101,7 @@ cpumap_data = [ + 'x86_KnightsMill.xml', + 'x86_kvm32-v1.xml', + 'x86_kvm32.xml', ++ 'x86_kvm64-v1.xml', + 'x86_kvm64.xml', + 'x86_n270-v1.xml', + 'x86_n270.xml', +diff --git a/src/cpu_map/x86_kvm64-v1.xml b/src/cpu_map/x86_kvm64-v1.xml +new file mode 100644 +index 0000000000..73d1e4f574 +--- /dev/null ++++ b/src/cpu_map/x86_kvm64-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index e6c0863d54..985a00cf84 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -797,7 +797,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 7f68ca79c7..74aa563566 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1418,7 +1418,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 13aef737e2..4fdeaec417 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -796,7 +796,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 734d1f3bb2..284d70c7cc 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -819,7 +819,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 39f1aaf3f8..07097ce25b 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1508,7 +1508,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 3db605a87b..1aefe0ea08 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -818,7 +818,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index c77b05c257..2ffe8cb354 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -920,7 +920,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 67b5a9f3d8..2a084c64fe 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1705,7 +1705,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index daafd91079..bda2e0ef68 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -919,7 +919,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index 6c15cae03d..d2fbcad98c 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -926,7 +926,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 2480513c4b..60093eda9a 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1720,7 +1720,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 914f011071..eafdc53ff6 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -925,7 +925,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index f368716de9..03896267d5 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -953,7 +953,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index c3dba8ccd7..52eb4b8215 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1744,7 +1744,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 4592e03dc4..f212097662 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -952,7 +952,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 39535a73ad..38b0f47092 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -920,7 +920,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 0694b5426e..43de9e5193 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1692,7 +1692,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index c36ebcf7fd..92514055c9 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -919,7 +919,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 3d15c7dca5..10017064b8 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -925,7 +925,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index bfb94bc389..95b582af9f 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1405,7 +1405,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index bfb94bc389..95b582af9f 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1405,7 +1405,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 2c3bca4a76..1e40bc5b23 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -924,7 +924,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index bf2c489691..392ec1e232 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -1007,7 +1007,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 345f8177f2..0893277250 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1500,7 +1500,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 758ce18d38..52ef9718d0 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -1006,7 +1006,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 4a478b678f..ef74bbd2fa 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1236,7 +1236,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index e3dda5ff74..404237ef67 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1486,7 +1486,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index aa94c97499..eafacf0b61 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1235,7 +1235,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index f3ad13ff40..c544eb02e3 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1237,7 +1237,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 4aa6ddca4f..b7b0ddd7c4 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1453,7 +1453,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 8ad3499c67..a4c86941c6 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1236,7 +1236,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index b3325f4e36..06341f125a 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1237,7 +1237,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 90a785ed55..e759a15ea7 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1383,7 +1383,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 9bac49c553..eb4822c667 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1236,7 +1236,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 986c3936c0..a6c7d8e74c 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1373,7 +1373,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 9f4d2d8af8..18070cd01a 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1488,7 +1488,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index e8b70c7e0f..e008a2f2e9 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1372,7 +1372,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 4ac90bad0d..ce19774d0d 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1373,7 +1373,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 94d866a5f0..217fbfe51c 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1488,7 +1488,8 @@ + coreduo-v1 + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + n270-v1 + pentium +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 84303bee0b..4f34340651 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1372,7 +1372,8 @@ + + kvm32 + kvm32-v1 +- kvm64 ++ kvm64 ++ kvm64-v1 + n270 + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-n270-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-n270-v1-CPU-model.patch new file mode 100644 index 0000000..db7a05e --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-n270-v1-CPU-model.patch @@ -0,0 +1,840 @@ +From 345fbc5a96c77d785879f1457dc83b5a9f6a5a30 Mon Sep 17 00:00:00 2001 +Message-ID: <345fbc5a96c77d785879f1457dc83b5a9f6a5a30.1734433245.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:32:08 +0100 +Subject: [PATCH] cpu_map: Add n270-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit c9fa77bfe84b8184254bb381d04f365391ab8a96) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_n270-v1.xml | 6 ++++++ + tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml | 2 +- + tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml | 2 +- + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 6 +++++- + 45 files changed, 168 insertions(+), 42 deletions(-) + create mode 100644 src/cpu_map/x86_n270-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index d8df3b214d..9534e5f308 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -19,6 +19,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 1213f6929c..5e85e24eb9 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -100,6 +100,7 @@ cpumap_data = [ + 'x86_KnightsMill.xml', + 'x86_kvm32.xml', + 'x86_kvm64.xml', ++ 'x86_n270-v1.xml', + 'x86_n270.xml', + 'x86_Nehalem-IBRS.xml', + 'x86_Nehalem-v1.xml', +diff --git a/src/cpu_map/x86_n270-v1.xml b/src/cpu_map/x86_n270-v1.xml +new file mode 100644 +index 0000000000..f49b823953 +--- /dev/null ++++ b/src/cpu_map/x86_n270-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml +index 1e9c6782e9..10797e0633 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- n270 ++ n270-v1 + Intel + + +diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml +index 4856cf53c4..498863b3ed 100644 +--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml ++++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml +@@ -1,6 +1,6 @@ + + x86_64 +- n270 ++ n270-v1 + Intel + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index cb6db8f83c..1ba8a7eb11 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -793,10 +793,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 36625a07b3..1abbfcc4bb 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1417,7 +1417,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index fcd76f9bc8..3040deeb50 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -792,10 +792,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 4b2d94b281..cb59946b78 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -815,10 +815,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index b20dbe72c1..e6165eab77 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1507,7 +1507,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index ad3be21085..5aae9a3fca 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -814,10 +814,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index a76f03f910..2898e56b41 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -916,10 +916,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index da44554a73..2b5baf0a02 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1704,7 +1704,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 4369595b2e..0fd3e38ee6 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -915,10 +915,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index dc6dd2f743..690959d35a 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -922,10 +922,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index d8bb03fbfd..6153d8a9ee 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1719,7 +1719,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 69afbc55f0..15edc7e73d 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -921,10 +921,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 0798ee74de..a1f68beb2a 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -949,10 +949,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index 07bbd505fa..9eda36d3c8 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1743,7 +1743,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index bf07fa3f51..249baa1342 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -948,10 +948,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 694561221f..b65196f979 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -916,10 +916,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index d98b895940..84df14bc63 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1691,7 +1691,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index e02f39bdf5..2e41f4a73a 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -915,10 +915,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index faa838ee4b..ca8391756b 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -921,10 +921,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index c65ffc40bb..258212d852 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1404,7 +1404,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index c65ffc40bb..258212d852 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1404,7 +1404,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 0a88511093..819010acff 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -920,10 +920,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index e931d7445d..68b1192153 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -1003,10 +1003,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index c0cc453fd1..ea0bc81bea 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1499,7 +1499,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 59c36bfa49..bddb1413a1 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -1002,10 +1002,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index f822c040de..7f1f4a2082 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1232,10 +1232,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 7ea876c1fc..e2fc678bb6 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1485,7 +1485,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 56a57665f1..4b0aed148d 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1231,10 +1231,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index d2e14fcaab..ab371ea688 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1233,10 +1233,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 25fe5a3f48..a256fed6d7 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1452,7 +1452,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index dfcbcf2477..3f952bb379 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1232,10 +1232,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 7b20023b19..21358e340a 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1233,10 +1233,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index ee58ddff1d..d34524193a 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1382,7 +1382,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index d2f19183f0..9bbb95c0cb 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1232,10 +1232,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 3e3bd2b5e1..c5cbe2d855 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1369,10 +1369,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index f4e8163256..3ec8575cf4 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1487,7 +1487,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 54d5323f71..513f4486cb 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1368,10 +1368,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index b9697229d9..089ab497e0 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1369,10 +1369,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index cc672be9a1..64e893116a 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1487,7 +1487,8 @@ + coreduo-v1 + kvm32 + kvm64 +- n270 ++ n270 ++ n270-v1 + pentium + pentium-v1 + pentium2 +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index c29d1e99bc..6e4f518b23 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1368,10 +1368,14 @@ + + kvm32 + kvm64 +- n270 ++ n270 + + + ++ n270-v1 ++ ++ ++ + pentium + pentium-v1 + pentium2 +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch new file mode 100644 index 0000000..e912aa2 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-pentium-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From f0ff972e084c4bc36624cfc965674a9d9ac91615 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:23:04 +0100 +Subject: [PATCH] cpu_map: Add pentium-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 70a4ec29a780d47b34ed0026f968cc4a66f3a2ee) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_pentium-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_pentium-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index e9fb278fd3..a12c32eec6 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -10,6 +10,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index b335278b08..2c76b32280 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -110,6 +110,7 @@ cpumap_data = [ + 'x86_Opteron_G4.xml', + 'x86_Opteron_G5.xml', + 'x86_Penryn.xml', ++ 'x86_pentium-v1.xml', + 'x86_pentium.xml', + 'x86_pentium2.xml', + 'x86_pentium3.xml', +diff --git a/src/cpu_map/x86_pentium-v1.xml b/src/cpu_map/x86_pentium-v1.xml +new file mode 100644 +index 0000000000..2b690dab19 +--- /dev/null ++++ b/src/cpu_map/x86_pentium-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 46f1bd7d4f..783df2e45f 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -793,7 +793,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 7153fe3925..b0c660dda2 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1417,7 +1417,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 93df9af8f6..d600d744f4 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -792,7 +792,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 25b16b34bb..5076c5f864 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -815,7 +815,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index c9a124cda2..d47632f95f 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1507,7 +1507,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index a99c89e98b..1a5ba3ed86 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -814,7 +814,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index c4f95a282b..6f444b15ec 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -916,7 +916,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index b6f01ffbce..d1a8a432d3 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1704,7 +1704,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 5d3c1ab1aa..9c83624e20 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -915,7 +915,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index c24b88f412..b696860c36 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -922,7 +922,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index eb8f5e3f22..686d89e864 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1719,7 +1719,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index b1f198d62b..c1ed9f13e9 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -921,7 +921,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 7a4830b126..1a0860f81a 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -949,7 +949,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index d624842aab..b8f950e7f3 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1743,7 +1743,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 43bcca9b52..9b7046a713 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -948,7 +948,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 275ce525fe..087c90344e 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -916,7 +916,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 6500ceac17..521eae41ce 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1691,7 +1691,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 1e54981f3c..5d6438d440 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -915,7 +915,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 5b1bb3ad55..b7175be7dc 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -921,7 +921,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 339c622684..08534be348 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1404,7 +1404,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 339c622684..08534be348 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1404,7 +1404,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index a016f77b09..f8b95431ac 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -920,7 +920,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 9a42375791..30cf441d89 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -1003,7 +1003,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 677ebbf2e6..940f1338e9 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1499,7 +1499,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 1eb4af3fdc..7ba288f0b2 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -1002,7 +1002,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index e2fa9da460..f5f6afb094 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1232,7 +1232,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 787fc9d870..3fabd84691 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1485,7 +1485,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 3fa195c6aa..b52d6d68d6 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1231,7 +1231,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index 5fe9ab775c..b67425cd20 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1233,7 +1233,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 5c9f1c92a5..69be0c7ffe 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1452,7 +1452,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 73f129706d..29e6285b17 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1232,7 +1232,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 2315bda338..c75666a7fd 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1233,7 +1233,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 90c9862321..de856ff33b 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1382,7 +1382,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 983597be92..b6d210838c 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1232,7 +1232,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 578dea23a5..054b233cfc 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1369,7 +1369,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 2009920390..d847b56680 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1487,7 +1487,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 505ea9978f..6a4918211c 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1368,7 +1368,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index e78f6a9dd3..fe8e7c6a8d 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1369,7 +1369,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index da9f2a1193..58ee6816e7 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1487,7 +1487,8 @@ + kvm32 + kvm64 + n270 +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 74d1094511..7aae7a2904 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1368,7 +1368,8 @@ + + + +- pentium ++ pentium ++ pentium-v1 + pentium2 + pentium3 + phenom +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch new file mode 100644 index 0000000..a161cfa --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-pentium2-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From 435f48536a5c989da9caf0dc0374e9c08f911a55 Mon Sep 17 00:00:00 2001 +Message-ID: <435f48536a5c989da9caf0dc0374e9c08f911a55.1734433245.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:25:30 +0100 +Subject: [PATCH] cpu_map: Add pentium2-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit df34ae48e9cb8fe0ed9b50900eab07cd6e87481c) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_pentium2-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_pentium2-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index a12c32eec6..1f1536339c 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -12,6 +12,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 2c76b32280..47c22db5b7 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -112,6 +112,7 @@ cpumap_data = [ + 'x86_Penryn.xml', + 'x86_pentium-v1.xml', + 'x86_pentium.xml', ++ 'x86_pentium2-v1.xml', + 'x86_pentium2.xml', + 'x86_pentium3.xml', + 'x86_pentiumpro.xml', +diff --git a/src/cpu_map/x86_pentium2-v1.xml b/src/cpu_map/x86_pentium2-v1.xml +new file mode 100644 +index 0000000000..554aebce41 +--- /dev/null ++++ b/src/cpu_map/x86_pentium2-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index 783df2e45f..db91ece840 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -795,7 +795,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index b0c660dda2..17ad483a0c 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1419,7 +1419,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index d600d744f4..88b506eeac 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -794,7 +794,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 5076c5f864..ec626f9c82 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -817,7 +817,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index d47632f95f..1f9f215a63 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1509,7 +1509,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 1a5ba3ed86..3551b22832 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -816,7 +816,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index 6f444b15ec..057b9a392a 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -918,7 +918,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index d1a8a432d3..e6a74efc27 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1706,7 +1706,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 9c83624e20..8583b09a19 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -917,7 +917,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index b696860c36..5662860ea4 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -924,7 +924,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 686d89e864..3ae800014b 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1721,7 +1721,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index c1ed9f13e9..ac04083e6d 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -923,7 +923,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 1a0860f81a..4c884f4385 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -951,7 +951,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index b8f950e7f3..6e308eb156 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1745,7 +1745,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 9b7046a713..347c13024b 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -950,7 +950,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 087c90344e..9d11b5f6c3 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -918,7 +918,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 521eae41ce..92d0d0d24f 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1693,7 +1693,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 5d6438d440..e3eb689de3 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -917,7 +917,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index b7175be7dc..d9aaf6bd10 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -923,7 +923,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 08534be348..1b4ee8ab7a 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1406,7 +1406,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 08534be348..1b4ee8ab7a 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1406,7 +1406,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index f8b95431ac..1bd4e45095 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -922,7 +922,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 30cf441d89..7b9d952866 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -1005,7 +1005,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 940f1338e9..dd96957e79 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1501,7 +1501,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 7ba288f0b2..876d2a37a8 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -1004,7 +1004,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index f5f6afb094..269c399d8c 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1234,7 +1234,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 3fabd84691..d0899b6beb 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1487,7 +1487,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index b52d6d68d6..647ba2ab7a 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1233,7 +1233,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index b67425cd20..a0b2a7c84b 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1235,7 +1235,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 69be0c7ffe..4b9cf3e152 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1454,7 +1454,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 29e6285b17..df21513db3 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1234,7 +1234,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index c75666a7fd..1c872e7f20 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1235,7 +1235,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index de856ff33b..439a82f4e2 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1384,7 +1384,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index b6d210838c..16764a7d67 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1234,7 +1234,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 054b233cfc..c45c2a88d5 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1371,7 +1371,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index d847b56680..2391821956 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1489,7 +1489,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 6a4918211c..1c23ac2b9d 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1370,7 +1370,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index fe8e7c6a8d..135546d930 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1371,7 +1371,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 58ee6816e7..2002feb338 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1489,7 +1489,8 @@ + n270 + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 7aae7a2904..871af7f505 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1370,7 +1370,8 @@ + + pentium + pentium-v1 +- pentium2 ++ pentium2 ++ pentium2-v1 + pentium3 + phenom + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch new file mode 100644 index 0000000..3040f31 --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-pentium3-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From cfb9b30ea4c8fc9304a2aa27946538e39fc7b7fd Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:28:21 +0100 +Subject: [PATCH] cpu_map: Add pentium3-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 886fd169c5e03ca9c065e69634ab3cd5656faf36) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_pentium3-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_pentium3-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 1f1536339c..87cc4f61ed 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -14,6 +14,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 47c22db5b7..6645786736 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -114,6 +114,7 @@ cpumap_data = [ + 'x86_pentium.xml', + 'x86_pentium2-v1.xml', + 'x86_pentium2.xml', ++ 'x86_pentium3-v1.xml', + 'x86_pentium3.xml', + 'x86_pentiumpro.xml', + 'x86_phenom.xml', +diff --git a/src/cpu_map/x86_pentium3-v1.xml b/src/cpu_map/x86_pentium3-v1.xml +new file mode 100644 +index 0000000000..7547e0ef0c +--- /dev/null ++++ b/src/cpu_map/x86_pentium3-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index db91ece840..f887be4468 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -797,7 +797,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 17ad483a0c..0c5a3a81f8 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1421,7 +1421,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 88b506eeac..7591b2efe9 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -796,7 +796,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index ec626f9c82..a7b325fd61 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -819,7 +819,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 1f9f215a63..63c1ff9b4a 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1511,7 +1511,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 3551b22832..3d6ff5657e 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -818,7 +818,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index 057b9a392a..e475c264ee 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -920,7 +920,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index e6a74efc27..5deb101fe3 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1708,7 +1708,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 8583b09a19..f4542588e8 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -919,7 +919,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index 5662860ea4..c388b7919a 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -926,7 +926,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 3ae800014b..bae374c05b 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1723,7 +1723,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index ac04083e6d..43d1a8d3a2 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -925,7 +925,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 4c884f4385..b882feace0 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -953,7 +953,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index 6e308eb156..dcdad93bc4 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1747,7 +1747,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 347c13024b..f825365d4e 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -952,7 +952,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 9d11b5f6c3..f8ac31d143 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -920,7 +920,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 92d0d0d24f..c4a159a3da 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1695,7 +1695,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index e3eb689de3..5efd8d499f 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -919,7 +919,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index d9aaf6bd10..a0f10ca42d 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -925,7 +925,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 1b4ee8ab7a..26e716e0e8 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1408,7 +1408,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 1b4ee8ab7a..26e716e0e8 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1408,7 +1408,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 1bd4e45095..871949d74f 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -924,7 +924,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 7b9d952866..9fb5e0a823 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -1007,7 +1007,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index dd96957e79..d7aeb43b83 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1503,7 +1503,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 876d2a37a8..8e226ee237 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -1006,7 +1006,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 269c399d8c..27fddae9f5 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1236,7 +1236,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index d0899b6beb..30169a55e4 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1489,7 +1489,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 647ba2ab7a..c91b05f312 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1235,7 +1235,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index a0b2a7c84b..76d9f80936 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1237,7 +1237,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 4b9cf3e152..7f08733452 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1456,7 +1456,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index df21513db3..4bf5988cf3 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1236,7 +1236,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 1c872e7f20..8e2d2a636e 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1237,7 +1237,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 439a82f4e2..0b488faa07 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1386,7 +1386,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 16764a7d67..9b41cc5fcc 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1236,7 +1236,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index c45c2a88d5..996a269525 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1373,7 +1373,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 2391821956..5d914aa62c 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1491,7 +1491,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 1c23ac2b9d..094ec28df0 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1372,7 +1372,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 135546d930..0e9a63cf4e 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1373,7 +1373,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 2002feb338..9fb8cb4e4a 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1491,7 +1491,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 871af7f505..d99a66ecfe 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1372,7 +1372,8 @@ + pentium-v1 + pentium2 + pentium2-v1 +- pentium3 ++ pentium3 ++ pentium3-v1 + phenom + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch new file mode 100644 index 0000000..5a8d09b --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-phenom-v1-CPU-model.patch @@ -0,0 +1,950 @@ +From 83e6078e15989f132d4c949d23bd6042a20f507d Mon Sep 17 00:00:00 2001 +Message-ID: <83e6078e15989f132d4c949d23bd6042a20f507d.1734433246.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:44:29 +0100 +Subject: [PATCH] cpu_map: Add phenom-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 332136e49ab4d122d053b11646c292a1a72e732a) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_phenom-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 7 ++++++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 6 +++++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 7 ++++++- + 43 files changed, 234 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_phenom-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 5f42fdc7fd..74b315c661 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -135,6 +135,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 8d45feee00..47c93deace 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -126,6 +126,7 @@ cpumap_data = [ + 'x86_pentium3-v1.xml', + 'x86_pentium3.xml', + 'x86_pentiumpro.xml', ++ 'x86_phenom-v1.xml', + 'x86_phenom.xml', + 'x86_qemu32-v1.xml', + 'x86_qemu32.xml', +diff --git a/src/cpu_map/x86_phenom-v1.xml b/src/cpu_map/x86_phenom-v1.xml +new file mode 100644 +index 0000000000..f465c0e1d3 +--- /dev/null ++++ b/src/cpu_map/x86_phenom-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index c71286deb2..27d36feccf 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -832,11 +832,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 26f3eed92b..b06febb821 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1449,10 +1449,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 6e67479e25..21b4ab8c5c 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -831,11 +831,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index d5b703e09a..83bb914c7d 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -854,11 +854,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 5928a72da9..47ab7240fb 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1539,10 +1539,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 69c1eb816f..cc212722f5 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -853,11 +853,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index c65db67a41..ec7abc3903 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -955,11 +955,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index e85937b36d..87fe22edd7 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1736,10 +1736,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index b1b76ad6fd..35bba84033 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -954,11 +954,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index fa27ff520a..b448d7bdb8 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -961,11 +961,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index 33ff630126..a8a96f2bb4 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1751,10 +1751,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index 0cf8733f1e..303b714aa7 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -960,11 +960,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index ba3669f4b2..9da8e156e2 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -988,11 +988,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index 43b6a68e24..a5b9edaeb6 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1775,10 +1775,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index a7d454b330..3029403bac 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -987,11 +987,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 08c27dbab8..259613d7fe 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -955,11 +955,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 8e974ebfde..d3ecad143c 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1723,10 +1723,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 71cb90d172..7f08dd995d 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -954,11 +954,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 2d346b5a15..1057fc58d3 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -960,11 +960,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 31a774af8a..fa4e9cfb8c 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1432,10 +1432,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 31a774af8a..fa4e9cfb8c 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1432,10 +1432,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 46b0e223c7..0c0f363d2b 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -959,11 +959,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 95d809d412..b1de96fadd 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -1042,11 +1042,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 95c413a22f..c83819435d 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1527,10 +1527,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index 4cd5d8e640..8f195f0e39 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -1041,11 +1041,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 94def05942..5495883fe9 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1271,11 +1271,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 958b250336..87fc57da66 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1511,10 +1511,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 4480ff39cd..43703fefab 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1270,11 +1270,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index 9f91f9ef93..2eab4e49b1 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1272,11 +1272,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index cf6ce11821..08b45ba90b 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1478,10 +1478,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 07034ee9a7..28b233d35d 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1271,11 +1271,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 020ad5bdba..16a3cdacb5 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1272,11 +1272,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index b0a25f5ea6..549e21c273 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1407,10 +1407,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index f6e47f704a..16e0d61c51 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1271,11 +1271,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index b501544f11..2b33304882 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1408,11 +1408,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 1704b3b265..f91fcdd4e5 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1512,10 +1512,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 3a1642af94..82fe2b3b1a 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1407,11 +1407,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 91eab35039..0c896766cb 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1408,11 +1408,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index e807b965f6..94c6914767 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1512,10 +1512,14 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + ++ phenom-v1 ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index a876e7b98f..1f73e3903c 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1407,11 +1407,16 @@ + pentium2-v1 + pentium3 + pentium3-v1 +- phenom ++ phenom + + + + ++ phenom-v1 ++ ++ ++ ++ + qemu32 + qemu32-v1 + qemu64 +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch new file mode 100644 index 0000000..4805b7a --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-qemu32-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From e901d5338199da24fa6a96410b1369df2ce13d5a Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:34:21 +0100 +Subject: [PATCH] cpu_map: Add qemu32-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit d9b23d77c0165a3a1cbea6b6bf953ae49547b60d) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_qemu32-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_qemu32-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index eb847341da..0fe2a513ca 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -26,6 +26,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index b179fb442c..61c5e403f9 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -121,6 +121,7 @@ cpumap_data = [ + 'x86_pentium3.xml', + 'x86_pentiumpro.xml', + 'x86_phenom.xml', ++ 'x86_qemu32-v1.xml', + 'x86_qemu32.xml', + 'x86_qemu64.xml', + 'x86_SandyBridge-IBRS.xml', +diff --git a/src/cpu_map/x86_qemu32-v1.xml b/src/cpu_map/x86_qemu32-v1.xml +new file mode 100644 +index 0000000000..904c3c6461 +--- /dev/null ++++ b/src/cpu_map/x86_qemu32-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index d4853706b3..90a947b72a 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -816,7 +816,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 03c88241c8..a1d2982897 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1430,7 +1430,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index 75592e124e..1c6e65a408 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -815,7 +815,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index de38e87010..bafaee4dc5 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -838,7 +838,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 29aa3f9adc..bac7c98eea 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1520,7 +1520,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index 6469251e47..fe78b42ab3 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -837,7 +837,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index 3918fd5101..c4e6cfeb84 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -939,7 +939,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index 5d5b18cfdf..3390d156e5 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1717,7 +1717,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 98bcfec2bb..62d5a4bdad 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -938,7 +938,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index ed4a66a4ca..77fa39cf13 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -945,7 +945,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index a748c623bc..ee36631717 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1732,7 +1732,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index f9a0221e7b..fb66ff6032 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -944,7 +944,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 6b97ff8ba7..fbbe1f7ed4 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -972,7 +972,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index 2e27e674f2..f5a84c16f7 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1756,7 +1756,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 99d8cf9558..d828319061 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -971,7 +971,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index e101305e83..968be6fc31 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -939,7 +939,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index 24f90ed830..d0a03a641c 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1704,7 +1704,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index 0f993e3763..a0492d152e 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -938,7 +938,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index bfea565a00..dfb06177ff 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -944,7 +944,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 91fc6133e4..90908a78e2 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1417,7 +1417,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 91fc6133e4..90908a78e2 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1417,7 +1417,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index 1e8f10d17f..f3c03fe68b 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -943,7 +943,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index 8dfbc2b21a..27e43a875e 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -1026,7 +1026,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 6982dc8035..8fc17e9d8a 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1512,7 +1512,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index a739ec6b73..ccaf3af991 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -1025,7 +1025,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 4d6e8c8a7f..f77e36d1ea 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1255,7 +1255,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 0009fb007d..5e5cf92e53 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1498,7 +1498,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 74f9fe6dbe..3b53baae7a 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1254,7 +1254,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index d4d7a9e079..a4faf9112c 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1256,7 +1256,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index b948f32538..3e7ba22317 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1465,7 +1465,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index 3e22f5e9b3..a2fbea3b21 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1255,7 +1255,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 7a30c27b83..b945327d7a 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1256,7 +1256,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index ee71c658cb..1c00bbb899 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1395,7 +1395,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 8509032a62..c0d45ff56b 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1255,7 +1255,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index b43b607c39..7d5c0b114d 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1392,7 +1392,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index b79140038c..915970f0ca 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1500,7 +1500,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 509b5a6c33..3703b8b6f4 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1391,7 +1391,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 9114ece766..c76d4d112f 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1392,7 +1392,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index e2e40d7ca2..cf9ef74abe 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1500,7 +1500,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index 4a5a09c488..bb64a26754 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1391,7 +1391,8 @@ + + + +- qemu32 ++ qemu32 ++ qemu32-v1 + qemu64 + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch new file mode 100644 index 0000000..5b2388c --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Add-qemu64-v1-CPU-model.patch @@ -0,0 +1,658 @@ +From 420c80f7e9d9d6eed500ad45c53a9bf49a00d07e Mon Sep 17 00:00:00 2001 +Message-ID: <420c80f7e9d9d6eed500ad45c53a9bf49a00d07e.1734433246.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 5 Dec 2024 15:36:14 +0100 +Subject: [PATCH] cpu_map: Add qemu64-v1 CPU model + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 2c6a015a7f7bdeffc38d5a16c91283c16325bef0) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/index.xml | 1 + + src/cpu_map/meson.build | 1 + + src/cpu_map/x86_qemu64-v1.xml | 6 ++++++ + tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 3 ++- + tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 3 ++- + 43 files changed, 88 insertions(+), 40 deletions(-) + create mode 100644 src/cpu_map/x86_qemu64-v1.xml + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index 81d77e4dba..8077da260d 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -32,6 +32,7 @@ + + + ++ + + + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index d73a1b4feb..799a72df47 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -124,6 +124,7 @@ cpumap_data = [ + 'x86_phenom.xml', + 'x86_qemu32-v1.xml', + 'x86_qemu32.xml', ++ 'x86_qemu64-v1.xml', + 'x86_qemu64.xml', + 'x86_SandyBridge-IBRS.xml', + 'x86_SandyBridge-v1.xml', +diff --git a/src/cpu_map/x86_qemu64-v1.xml b/src/cpu_map/x86_qemu64-v1.xml +new file mode 100644 +index 0000000000..1ed9da14a7 +--- /dev/null ++++ b/src/cpu_map/x86_qemu64-v1.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +index da05a9358f..e6c0863d54 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +@@ -819,7 +819,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +index 296f4bce12..7f68ca79c7 100644 +--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +@@ -1433,7 +1433,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +index dd5df8de0d..13aef737e2 100644 +--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +@@ -818,7 +818,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +index 4330afb33a..734d1f3bb2 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +@@ -841,7 +841,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +index 873d4b7b1f..39f1aaf3f8 100644 +--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +@@ -1523,7 +1523,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +index f1f8362f52..3db605a87b 100644 +--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +@@ -840,7 +840,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +index 7e0ed073a2..c77b05c257 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +@@ -942,7 +942,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +index b93e3ca9ac..67b5a9f3d8 100644 +--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +@@ -1720,7 +1720,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +index 8c538a6568..daafd91079 100644 +--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +@@ -941,7 +941,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +index dc8fd0539b..6c15cae03d 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +@@ -948,7 +948,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +index e075cc7dca..2480513c4b 100644 +--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +@@ -1735,7 +1735,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +index d0955a30f2..914f011071 100644 +--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +@@ -947,7 +947,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +index 4f2d2a272d..f368716de9 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +@@ -975,7 +975,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +index fcb175557c..c3dba8ccd7 100644 +--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +@@ -1759,7 +1759,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +index 07fa015c26..4592e03dc4 100644 +--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +@@ -974,7 +974,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +index 7880718caf..39535a73ad 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +@@ -942,7 +942,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +index e34444f915..0694b5426e 100644 +--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +@@ -1707,7 +1707,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +index dd045555db..c36ebcf7fd 100644 +--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +@@ -941,7 +941,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +index 34527a0fc0..3d15c7dca5 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +@@ -947,7 +947,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +index 14f0bc7f87..bfb94bc389 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +@@ -1420,7 +1420,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +index 14f0bc7f87..bfb94bc389 100644 +--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +@@ -1420,7 +1420,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +index de7e039b84..2c3bca4a76 100644 +--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +@@ -946,7 +946,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +index eeee7b926c..bf2c489691 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +@@ -1029,7 +1029,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +index 882ef3ed4d..345f8177f2 100644 +--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +@@ -1515,7 +1515,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +index dee27a40c4..758ce18d38 100644 +--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +@@ -1028,7 +1028,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +index 14f9d0a3a5..4a478b678f 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +@@ -1258,7 +1258,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +index 1347de2c5b..e3dda5ff74 100644 +--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +@@ -1501,7 +1501,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +index 6855f75ba4..aa94c97499 100644 +--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +@@ -1257,7 +1257,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +index 63bce83ba5..f3ad13ff40 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +@@ -1259,7 +1259,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +index 6b4db43077..4aa6ddca4f 100644 +--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +@@ -1468,7 +1468,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +index b9449120d3..8ad3499c67 100644 +--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +@@ -1258,7 +1258,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +index 5b0f2f84be..b3325f4e36 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +@@ -1259,7 +1259,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +index 04049d17af..90a785ed55 100644 +--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +@@ -1398,7 +1398,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +index 4ec2b2e96d..9bac49c553 100644 +--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +@@ -1258,7 +1258,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +index 9e152d5b55..986c3936c0 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +@@ -1395,7 +1395,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +index 1c79f73ae2..9f4d2d8af8 100644 +--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +@@ -1503,7 +1503,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +index 0af8a79cb4..e8b70c7e0f 100644 +--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +@@ -1394,7 +1394,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +index 4cb0a22a9b..4ac90bad0d 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +@@ -1395,7 +1395,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +index 99858a0b91..94d866a5f0 100644 +--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +@@ -1503,7 +1503,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +index cfedba3e8e..84303bee0b 100644 +--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml ++++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +@@ -1394,7 +1394,8 @@ + + qemu32 + qemu32-v1 +- qemu64 ++ qemu64 ++ qemu64-v1 + + + +-- +2.47.1 diff --git a/SOURCES/libvirt-cpu_map-Sort-data-files-in-meson.build.patch b/SOURCES/libvirt-cpu_map-Sort-data-files-in-meson.build.patch new file mode 100644 index 0000000..8fe058a --- /dev/null +++ b/SOURCES/libvirt-cpu_map-Sort-data-files-in-meson.build.patch @@ -0,0 +1,73 @@ +From 9c52c91dd1d901dc23105c475ea01631315b827e Mon Sep 17 00:00:00 2001 +Message-ID: <9c52c91dd1d901dc23105c475ea01631315b827e.1734433245.git.jdenemar@redhat.com> +From: Jiri Denemark +Date: Thu, 28 Nov 2024 13:24:49 +0100 +Subject: [PATCH] cpu_map: Sort data files in meson.build + +Signed-off-by: Jiri Denemark +Reviewed-by: Michal Privoznik +(cherry picked from commit 50c6d727b6f0cc00333a1bc26925ab5f26f8f781) + +https://issues.redhat.com/browse/RHEL-70052 + +Signed-off-by: Jiri Denemark +--- + src/cpu_map/meson.build | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build +index 88d67f4cce..f659ef230e 100644 +--- a/src/cpu_map/meson.build ++++ b/src/cpu_map/meson.build +@@ -4,8 +4,8 @@ cpumap_data = [ + 'arm_cortex-a57.xml', + 'arm_cortex-a72.xml', + 'arm_Falkor.xml', +- 'arm_FT-2000plus.xml', + 'arm_features.xml', ++ 'arm_FT-2000plus.xml', + 'arm_Kunpeng-920.xml', + 'arm_Neoverse-N1.xml', + 'arm_Neoverse-N2.xml', +@@ -14,11 +14,11 @@ cpumap_data = [ + 'arm_ThunderX299xx.xml', + 'arm_vendors.xml', + 'index.xml', ++ 'ppc64_POWER10.xml', + 'ppc64_POWER6.xml', + 'ppc64_POWER7.xml', + 'ppc64_POWER8.xml', + 'ppc64_POWER9.xml', +- 'ppc64_POWER10.xml', + 'ppc64_POWERPC_e5500.xml', + 'ppc64_POWERPC_e6500.xml', + 'ppc64_vendors.xml', +@@ -54,13 +54,8 @@ cpumap_data = [ + 'x86_Dhyana-v1.xml', + 'x86_Dhyana-v2.xml', + 'x86_Dhyana.xml', +- 'x86_EPYC-IBPB.xml', +- 'x86_EPYC-v1.xml', +- 'x86_EPYC-v2.xml', +- 'x86_EPYC-v3.xml', +- 'x86_EPYC-v4.xml', +- 'x86_EPYC.xml', + 'x86_EPYC-Genoa.xml', ++ 'x86_EPYC-IBPB.xml', + 'x86_EPYC-Milan-v1.xml', + 'x86_EPYC-Milan-v2.xml', + 'x86_EPYC-Milan.xml', +@@ -69,6 +64,11 @@ cpumap_data = [ + 'x86_EPYC-Rome-v3.xml', + 'x86_EPYC-Rome-v4.xml', + 'x86_EPYC-Rome.xml', ++ 'x86_EPYC-v1.xml', ++ 'x86_EPYC-v2.xml', ++ 'x86_EPYC-v3.xml', ++ 'x86_EPYC-v4.xml', ++ 'x86_EPYC.xml', + 'x86_features.xml', + 'x86_GraniteRapids-v1.xml', + 'x86_GraniteRapids.xml', +-- +2.47.1 diff --git a/SOURCES/libvirt-docs-document-using-passt-backend-with-interface-type-vhostuser.patch b/SOURCES/libvirt-docs-document-using-passt-backend-with-interface-type-vhostuser.patch new file mode 100644 index 0000000..34d885f --- /dev/null +++ b/SOURCES/libvirt-docs-document-using-passt-backend-with-interface-type-vhostuser.patch @@ -0,0 +1,139 @@ +From 3bcec68251696b1255be7dc2504378b927ef5123 Mon Sep 17 00:00:00 2001 +Message-ID: <3bcec68251696b1255be7dc2504378b927ef5123.1739824250.git.jdenemar@redhat.com> +From: Laine Stump +Date: Fri, 14 Feb 2025 23:35:56 -0500 +Subject: [PATCH] docs: document using passt backend with +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Almost everything is already there (in the section for using passt +with type='user'), so we just need to point to that from the +type='vhostuser' section (and vice versa), and add a bit of glue. + +Also updated a few related details that have changed (e.g. default +model type for vhostuser is now 'virtio', and source type/mode are now +optional), and changed "vhost-user interface" to "vhost-user +connection" because the interface is a virtio interface, and +vhost-user is being used to connect that interface to the outside. + +Signed-off-by: Laine Stump +Reviewed-by: Ján Tomko +(cherry picked from commit 96fd17a99b514e585a94d43d40ab9a74907c7a5b) + +https://issues.redhat.com/browse/RHEL-69455 +Signed-off-by: Laine Stump +--- + docs/formatdomain.rst | 73 ++++++++++++++++++++++++++++++++++++------- + 1 file changed, 62 insertions(+), 11 deletions(-) + +diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst +index 577366b934..c077c09a39 100644 +--- a/docs/formatdomain.rst ++++ b/docs/formatdomain.rst +@@ -5131,6 +5131,15 @@ destined for the host toward the guest instead), and a socket between + passt and QEMU forwards that traffic on to the guest (and back out, + of course). + ++*(:since:`Since 11.1.0 (QEMU and KVM only)` you may prefer to use the ++passt backend with the more efficient and performant type='vhostuser' ++rather than type='user'. All the options related to passt in the ++paragraphs below here also apply when using the passt backend with ++type='vhostuser'; any other details specific to vhostuser are ++described* `here ++`__.) ++ ++ + Similar to SLIRP, passt has an internal DHCP server that provides a + requesting guest with one ipv4 and one ipv6 address. There are default + values for both of these, or you can use the ```` element +@@ -5823,7 +5832,7 @@ following attributes are available for the ``virtio`` NIC driver: + The optional ``queues`` attribute controls the number of queues to be used + for either `Multiqueue + virtio-net `__ or vhost-user (See +- `vhost-user interface`_) network interfaces. Use of multiple packet ++ `vhost-user connection`_) network interfaces. Use of multiple packet + processing queues requires the interface having the + ```` element. Each queue will potentially be handled by + a different processor, resulting in much higher throughput. +@@ -6267,8 +6276,8 @@ similarly named elements used to configure the guest side of the interface + (described above). + + +-vhost-user interface +-^^^^^^^^^^^^^^^^^^^^ ++vhost-user connection ++^^^^^^^^^^^^^^^^^^^^^ + + :since:`Since 1.2.7` the vhost-user enables the communication between a QEMU + virtual machine and other userspace process using the Virtio transport protocol. +@@ -6295,16 +6304,58 @@ plane is based on shared memory. + + ... + +-The ```` element has to be specified along with the type of char device. +-Currently, only type='unix' is supported, where the path (the directory path of +-the socket) and mode attributes are required. Both ``mode='server'`` and +-``mode='client'`` are supported. vhost-user requires the virtio model type, thus +-the ```` element is mandatory. :since:`Since 4.1.0` the element has an +-optional child element ``reconnect`` which configures reconnect timeout if the +-connection is lost. It has two attributes ``enabled`` (which accepts ``yes`` and +-``no``) and ``timeout`` which specifies the amount of seconds after which ++The ```` element has to be specified along with the type of ++char device. Currently, only type='unix' is supported, where the path ++(the directory path of the socket) and mode attributes are ++required. Both ``mode='server'`` and ``mode='client'`` are ++supported. (:since:`Since 11.1.0` the default source type for ++vhostuser interfaces is 'unix' and default mode is 'client', so those ++two attributes are now optional). ++ ++The vhost-user protocol only works with the virtio guest driver, so ++the ```` element ``type`` attribute is mandatory (:since:`Since ++11.1.0` the default model type for vhostuser interfaces is now ++'virtio' so ```` is no longer mandatory). :since:`Since 4.1.0` ++the ```` element has an optional child element ``reconnect`` ++which configures reconnect timeout if the connection is lost. It has ++two attributes ``enabled`` (which accepts ``yes`` and ``no``) and ++``timeout`` which specifies the amount of seconds after which + hypervisor tries to reconnect. + ++ ++vhost-user connection with passt backend ++^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ++ ++:since:`Since 11.1.0 (QEMU and KVM only)` passt can be used as the ++other end of the vhost-user connection. This is a compelling ++alternative, because passt provides all of its network connectivity ++without requiring any elevated privileges or capabilities, and ++vhost-user uses shared memory to make this unprivileged connection ++very high performance as well. You can set a type='vhostuser' ++interface to use passt as the backend by adding ````. When passt is the backend, only a single driver ++queue is supported, and the ```` path/type/mode are all ++implied to be "matching the passt process" so **must not** be ++specified. All of the passt options `described here ++`__, are also ++supported for ``type='vhostuser'`` with the passt backend, e.g. ++setting guest-side IP addresses with ```` and port forwarding with ++`` ++ ++ ++ ++ ++ ++ ++ ++ ... ++ ++ + Traffic filtering with NWFilter + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +-- +2.48.1 diff --git a/SOURCES/libvirt-docs-improve-type-user-docs-to-higlight-differences-between-SLIRP-and-passt.patch b/SOURCES/libvirt-docs-improve-type-user-docs-to-higlight-differences-between-SLIRP-and-passt.patch new file mode 100644 index 0000000..e027b71 --- /dev/null +++ b/SOURCES/libvirt-docs-improve-type-user-docs-to-higlight-differences-between-SLIRP-and-passt.patch @@ -0,0 +1,177 @@ +From 42b16d6b87ad5449f93cda5f31cde92d0cca074f Mon Sep 17 00:00:00 2001 +Message-ID: <42b16d6b87ad5449f93cda5f31cde92d0cca074f.1739824249.git.jdenemar@redhat.com> +From: Laine Stump +Date: Fri, 14 Feb 2025 22:43:03 -0500 +Subject: [PATCH] docs: improve type='user' docs to higlight differences + between SLIRP and passt +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reorganizes the section about and +describes the differences in behavior between SLIRP and passt. + +Resolves: https://issues.redhat.com/browse/RHEL-46601 +Signed-off-by: Laine Stump +Reviewed-by: Ján Tomko +(cherry picked from commit a47a89a9d335c111a9c2fbb3f4e1c3a13001e74b) + +https://issues.redhat.com/browse/RHEL-69455 +Signed-off-by: Laine Stump +--- + docs/formatdomain.rst | 116 ++++++++++++++++++++++++++++-------------- + 1 file changed, 78 insertions(+), 38 deletions(-) + +diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst +index 8d787ef59a..577366b934 100644 +--- a/docs/formatdomain.rst ++++ b/docs/formatdomain.rst +@@ -5072,25 +5072,34 @@ to the interface. + + ... + +-Userspace (SLIRP or passt) connection +-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ++Userspace connection using SLIRP ++^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +-The ``user`` type connects the guest interface to the outside via a ++The ``user`` interface type connects the guest interface to the outside via a + transparent userspace proxy that doesn't require any special system + privileges, making it usable in cases when libvirt itself is running + with no privileges (e.g. libvirt's "session mode" daemon, or when + libvirt is run inside an unprivileged container). + +-By default, this user proxy is done with QEMU's internal SLIRP driver +-which has DHCP & DNS services that give the guest IP addresses +-starting from ``10.0.2.15``, a default route of ``10.0.2.2`` and DNS +-server of ``10.0.2.3``. :since:`Since 3.8.0` it is possible to override +-the default network address by including an ``ip`` element specifying +-an IPv4 address in its one mandatory attribute, +-``address``. Optionally, a second ``ip`` element with a ``family`` +-attribute set to "ipv6" can be specified to add an IPv6 address to the +-interface. ``address``. Optionally, address ``prefix`` can be +-specified. ++By default, this user proxy is done with QEMU's SLIRP driver, a ++userspace proxy built into QEMU that has DHCP & DNS services that give ++the guest an IP address of ``10.0.2.15``, a default route of ++``10.0.2.2`` and DNS server at ``10.0.2.3``. ++ ++:since:`Since 3.8.0` it is possible to override the guest's default ++network address by including an ``ip`` element specifying an IPv4 ++address in its one mandatory attribute, ``address``. Optionally, a ++second ``ip`` element with a ``family`` attribute set to "ipv6" can be ++specified to add an IPv6 address to the interface. ``address``. ++Optionally, an address ``prefix`` can be specified. These settings are ++surprisingly **not** used by SLIRP to set the exact IP address; ++instead they are used to determine what network/subnet the guest's IP ++address should be on, and the guest will be given an address in that ++subnet, but the host portion of the address will still be "2.15". In ++the example below, for example, the guest will be given the IP address ++172.17.2.15 (**note that the '1.1' in the host portion of the address ++has been ignored**), default route of 172.17.2.2, and DNS server ++172.17.2.3. + + :: + +@@ -5100,34 +5109,65 @@ specified. + ... + + +- +- ++ ++ + + + ... + +-:since:`Since 9.0.0` an alternate backend implementation of the +-``user`` interface type can be selected by setting the interface's +-```` subelement ``type`` attribute to ``passt``. In this +-case, the passt transport (https://passt.top) is used. Similar to +-SLIRP, passt has an internal DHCP server that provides a requesting +-guest with one ipv4 and one ipv6 address; it then uses userspace +-proxies and a separate network namespace to provide outgoing +-UDP/TCP/ICMP sessions, and optionally redirect incoming traffic +-destined for the host toward the guest instead. +- +-When the passt backend is used, the ```` attribute +-``logFile`` can be used to tell the passt process for this interface +-where to write its message log, and the ```` attribute ``dev`` +-can tell it to use a particular host interface to derive the routes +-given to the guest for forwarding traffic upstream. Due to the design +-decisions of passt, if using SELinux, the log file is recommended to +-reside in the runtime directory of a user under which the passt +-process will run, most probably ``/run/user/$UID`` where ``$UID`` is +-the UID of the user, e.g. ``qemu``. Beware that libvirt does not +-create this directory if it does not already exist to avoid possible, +-however unlikely, issues, especially since this logfile attribute is +-meant mostly for debugging. ++Userspace connection using passt ++^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ++ ++:since:`Since 9.0.0 (QEMU and KVM only)` an alternate backend ++implementation of the ``user`` interface type can be selected by ++setting the interface's ```` subelement ``type`` attribute to ++``passt``. In this case, the passt transport `(details here) ++`__ is used. passt is run as a separate process ++from QEMU - the passt process handles the details of forwarding ++network traffic back and forth to the physical network (using ++userspace proxies and a separate network namespace to provide outgoing ++UDP/TCP/ICMP sessions, and optionally redirecting incoming traffic ++destined for the host toward the guest instead), and a socket between ++passt and QEMU forwards that traffic on to the guest (and back out, ++of course). ++ ++Similar to SLIRP, passt has an internal DHCP server that provides a ++requesting guest with one ipv4 and one ipv6 address. There are default ++values for both of these, or you can use the ```` element ++(described above, with behavioral differences as outlined below) to ++configure one IPv4 and one IPv6 address that passt's DHCP server can ++provide to the guest. ++ ++Unlike SLIRP, when no ``` address is specified, passt will by ++default provide the guest with an IP address, DNS server, etc. that ++are identical to those settings on the host itself (through the magic ++of the proxies and a separate network namespace, this doesn't create ++any conflict). ++ ++Also different from SLIRP's behavior: if you do specify IP ++address(es), the exact address and netmask/prefix you specify will be ++provided to the guest (i.e. passt doesn't interpret the settings ++as a network address like SLIRP does, but as a host address). In ++example given above, the guest IP would be set to exactly 172.17.1.1. ++ ++Just as with SLIRP, though, once traffic from the guest leaves the ++host towards the rest of the network, it will always appear as if it ++came from the host's IP. ++ ++There are a few other options that are configurable only for the passt ++backend. For example, the ```` attribute ``logFile`` can be ++used to tell the passt process for this interface where to write its ++message log, and the ```` attribute ``dev`` can tell it a ++particular host interface to use when deriving the routes given to the ++guest for forwarding traffic upstream. Due to the design decisions of ++passt, when using SELinux on the host, it is recommended that the log ++file reside in the runtime directory of the user under which the passt ++process will run, most probably ``/run/user/$UID`` (where ``$UID`` is ++the UID of that user), e.g. ``/run/user/1000``. Be aware that libvirt ++does not create this directory if it does not already exist to avoid ++possible, however unlikely, issues with orphaned directories or ++permissions, etc. The logfile attribute is meant mostly for debugging, ++so it shouldn't be set under normal circumstances. + + Additionally, when passt is used, multiple ```` elements + can be added to forward incoming network traffic for the host to this +@@ -5164,7 +5204,7 @@ ports **with the exception of some subset**. + + + +- ++ + + + +-- +2.48.1 diff --git a/SOURCES/libvirt-include-libvirt-domain-Add-message-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch b/SOURCES/libvirt-include-libvirt-domain-Add-message-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch new file mode 100644 index 0000000..9db6ec1 --- /dev/null +++ b/SOURCES/libvirt-include-libvirt-domain-Add-message-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch @@ -0,0 +1,69 @@ +From ebe771353b9511ec5850a1415b82399a53fa2c71 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Peter Krempa +Date: Fri, 24 Jan 2025 16:26:54 +0100 +Subject: [PATCH] include: libvirt-domain: Add 'message' @reason of + VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In case when the hypervisor does report the reason for the I/O error as +an unstable string to display to users we can add a @reason possibility +for the I/O error event noting that the error is available. + +Add 'message' as a reason enumeration value and document it +to instruct users to look at the logs or virDomainGetMessages(). + +The resulting event looks like: + + event 'io-error' for domain 'cd': /dev/mapper/errdev0 (virtio-disk0) report due to message + +Users then can look at the virDomainGetMessages() API: + + I/O error: disk='vda', index='1', path='/dev/mapper/errdev0', timestamp='2025-01-28 15:47:52.776+0000', message='Input/output error' + +Or in the VM log file: + + 2025-01-28 15:47:52.776+0000: IO error device='virtio-disk0' node-name='libvirt-1-storage' reason='Input/output error' + +Signed-off-by: Peter Krempa +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 97c47333cbdc2531260f7b11b1fa9ba828878343) + +https://issues.redhat.com/browse/RHEL-77884 +--- + include/libvirt/libvirt-domain.h | 4 ++++ + src/qemu/qemu_process.c | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h +index 1dc7b417c9..f026ce197c 100644 +--- a/include/libvirt/libvirt-domain.h ++++ b/include/libvirt/libvirt-domain.h +@@ -4782,6 +4782,10 @@ typedef void (*virConnectDomainEventIOErrorCallback)(virConnectPtr conn, + * - "enospc": The I/O error is known to be caused by an ENOSPC condition in + * the host. Resizing the disk source to be larger will allow the + * guest to be resumed as if nothing happened. ++ * - "message": The hypervisor reported a string description of the ++ * I/O error. The errors are usually logged into the ++ * domain log file or the last instance of the error ++ * string can be queried via virDomainGetMessages(). + * + * Since: 0.8.1 + */ +diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c +index 409734d948..b9d69649ca 100644 +--- a/src/qemu/qemu_process.c ++++ b/src/qemu/qemu_process.c +@@ -862,6 +862,8 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, + + if (nospace) + eventReason = "enospc"; ++ else if (reason) ++ eventReason = "message"; + + ioErrorEvent = virDomainEventIOErrorNewFromObj(vm, eventPath, eventAlias, action); + ioErrorEvent2 = virDomainEventIOErrorReasonNewFromObj(vm, eventPath, eventAlias, action, eventReason); +-- +2.48.1 diff --git a/SOURCES/libvirt-include-libvirt-domain-Reword-documentation-for-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch b/SOURCES/libvirt-include-libvirt-domain-Reword-documentation-for-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch new file mode 100644 index 0000000..51da4b0 --- /dev/null +++ b/SOURCES/libvirt-include-libvirt-domain-Reword-documentation-for-reason-of-VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON.patch @@ -0,0 +1,47 @@ +From 5def2eb78e1152a78533e27647eda2352f1dbc4b Mon Sep 17 00:00:00 2001 +Message-ID: <5def2eb78e1152a78533e27647eda2352f1dbc4b.1738940191.git.jdenemar@redhat.com> +From: Peter Krempa +Date: Mon, 27 Jan 2025 15:50:34 +0100 +Subject: [PATCH] include: libvirt-domain: Reword documentation for @reason of + VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Emphasise that it's an enumeration and convert the possibilities to a +list of values with explanation. + +Signed-off-by: Peter Krempa +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 3a3c5616eb2c50a58896f99f30d887937dab297a) + +https://issues.redhat.com/browse/RHEL-77884 +--- + include/libvirt/libvirt-domain.h | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h +index 92a32f1cde..1dc7b417c9 100644 +--- a/include/libvirt/libvirt-domain.h ++++ b/include/libvirt/libvirt-domain.h +@@ -4775,11 +4775,13 @@ typedef void (*virConnectDomainEventIOErrorCallback)(virConnectPtr conn, + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON with virConnectDomainEventRegisterAny() + * +- * If the I/O error is known to be caused by an ENOSPC condition in +- * the host (where resizing the disk to be larger will allow the guest +- * to be resumed as if nothing happened), @reason will be "enospc". +- * Otherwise, @reason will be "", although future strings may be added +- * if determination of other error types becomes possible. ++ * Although @reason is a string, it is considered to be an enumeration of the ++ * following values: ++ * ++ * - "" (empty string): unknown I/O error reason ++ * - "enospc": The I/O error is known to be caused by an ENOSPC condition in ++ * the host. Resizing the disk source to be larger will allow the ++ * guest to be resumed as if nothing happened. + * + * Since: 0.8.1 + */ +-- +2.48.1 diff --git a/SOURCES/libvirt-libxlDomainGetMessages-Add-existing-flags-to-virCheckFlags.patch b/SOURCES/libvirt-libxlDomainGetMessages-Add-existing-flags-to-virCheckFlags.patch new file mode 100644 index 0000000..390dd7b --- /dev/null +++ b/SOURCES/libvirt-libxlDomainGetMessages-Add-existing-flags-to-virCheckFlags.patch @@ -0,0 +1,37 @@ +From c417e164d2b225ea401093e33a853d827d8bd8ca Mon Sep 17 00:00:00 2001 +Message-ID: +From: Peter Krempa +Date: Tue, 28 Jan 2025 14:06:16 +0100 +Subject: [PATCH] libxlDomainGetMessages: Add existing flags to 'virCheckFlags' +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The two VIR_DOMAIN_MESSAGE_* flags were not listed in the virCheckFlags +check in 'libxl' but were present in 'test' and 'qemu' driver impls. + +Signed-off-by: Peter Krempa +Reviewed-by: Daniel P. Berrangé +(cherry picked from commit 042ea8630b1b35ce6d325df52fefa84bad94d027) + +https://issues.redhat.com/browse/RHEL-77884 +--- + src/libxl/libxl_driver.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c +index e72553603d..26d22550ae 100644 +--- a/src/libxl/libxl_driver.c ++++ b/src/libxl/libxl_driver.c +@@ -6575,7 +6575,8 @@ libxlDomainGetMessages(virDomainPtr dom, + virDomainObj *vm = NULL; + int ret = -1; + +- virCheckFlags(0, -1); ++ virCheckFlags(VIR_DOMAIN_MESSAGE_DEPRECATION | ++ VIR_DOMAIN_MESSAGE_TAINTING, -1); + + if (!(vm = libxlDomObjFromDomain(dom))) + return -1; +-- +2.48.1 diff --git a/SOURCES/libvirt-qemu-Add-support-for-direct-and-extended-tlbflush-features.patch b/SOURCES/libvirt-qemu-Add-support-for-direct-and-extended-tlbflush-features.patch new file mode 100644 index 0000000..57049f7 --- /dev/null +++ b/SOURCES/libvirt-qemu-Add-support-for-direct-and-extended-tlbflush-features.patch @@ -0,0 +1,108 @@ +From 64ca9249f100a61cf39e800ad67f0dd520aabb5d Mon Sep 17 00:00:00 2001 +Message-ID: <64ca9249f100a61cf39e800ad67f0dd520aabb5d.1737030652.git.jdenemar@redhat.com> +From: Martin Kletzander +Date: Fri, 20 Dec 2024 12:28:24 +0100 +Subject: [PATCH] qemu: Add support for direct and extended tlbflush features + +They require special handling since they are dependent on the basic +tlbflush feature itself and therefore are not handled automatically as +part of virDomainHyperv enum, just like the stimer-direct feature. + +Resolves: https://issues.redhat.com/browse/RHEL-7122 +Signed-off-by: Martin Kletzander +Reviewed-by: Michal Privoznik +(cherry picked from commit 247357cc292a83c8628592562cbb4fa621cdc5b0) + +https://issues.redhat.com/browse/RHEL-7122 + +Signed-off-by: Martin Kletzander +--- + src/qemu/qemu_command.c | 6 +++++ + src/qemu/qemu_process.c | 24 +++++++++++++++++++ + .../qemuxmlconfdata/hyperv.x86_64-latest.args | 2 +- + tests/qemuxmlconfdata/hyperv.xml | 5 +++- + 4 files changed, 35 insertions(+), 2 deletions(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index dcb9c4934e..1f28de6194 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -6350,6 +6350,12 @@ qemuBuildCpuCommandLine(virCommand *cmd, + if ((i == VIR_DOMAIN_HYPERV_STIMER) && + (def->hyperv_stimer_direct == VIR_TRISTATE_SWITCH_ON)) + virBufferAsprintf(&buf, ",%s=on", VIR_CPU_x86_HV_STIMER_DIRECT); ++ if (i == VIR_DOMAIN_HYPERV_TLBFLUSH) { ++ if (def->hyperv_tlbflush_direct == VIR_TRISTATE_SWITCH_ON) ++ virBufferAsprintf(&buf, ",%s=on", VIR_CPU_x86_HV_TLBFLUSH_DIRECT); ++ if (def->hyperv_tlbflush_extended == VIR_TRISTATE_SWITCH_ON) ++ virBufferAsprintf(&buf, ",%s=on", VIR_CPU_x86_HV_TLBFLUSH_EXT); ++ } + break; + + case VIR_DOMAIN_HYPERV_SPINLOCKS: +diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c +index bee7a39e4e..7297263d33 100644 +--- a/src/qemu/qemu_process.c ++++ b/src/qemu/qemu_process.c +@@ -4281,6 +4281,30 @@ qemuProcessVerifyHypervFeatures(virDomainDef *def, + "direct"); + return -1; + } ++ if (i == VIR_DOMAIN_HYPERV_TLBFLUSH) { ++ if (def->hyperv_tlbflush_direct == VIR_TRISTATE_SWITCH_ON) { ++ rc = virCPUDataCheckFeature(cpu, VIR_CPU_x86_HV_TLBFLUSH_DIRECT); ++ if (rc < 0) ++ return -1; ++ if (rc == 0) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, ++ _("host doesn't support hyperv tlbflush '%1$s' feature"), ++ "direct"); ++ return -1; ++ } ++ } ++ if (def->hyperv_tlbflush_extended == VIR_TRISTATE_SWITCH_ON) { ++ rc = virCPUDataCheckFeature(cpu, VIR_CPU_x86_HV_TLBFLUSH_EXT); ++ if (rc < 0) ++ return -1; ++ if (rc == 0) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, ++ _("host doesn't support hyperv tlbflush '%1$s' feature"), ++ "extended"); ++ return -1; ++ } ++ } ++ } + continue; + } + +diff --git a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args +index 2aafafb340..5a32b80e71 100644 +--- a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args ++++ b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args +@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ + -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ + -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \ + -accel tcg \ +--cpu 'qemu64,hv-relaxed=on,hv-vapic=on,hv-spinlocks=0x2fff,hv-vpindex=on,hv-runtime=on,hv-synic=on,hv-stimer=on,hv-reset=on,hv-vendor-id=KVM Hv,hv-frequencies=on,hv-reenlightenment=on,hv-tlbflush=on,hv-ipi=on,hv-evmcs=on,hv-avic=on,hv-emsr-bitmap=on,hv-xmm-input=on' \ ++-cpu 'qemu64,hv-relaxed=on,hv-vapic=on,hv-spinlocks=0x2fff,hv-vpindex=on,hv-runtime=on,hv-synic=on,hv-stimer=on,hv-reset=on,hv-vendor-id=KVM Hv,hv-frequencies=on,hv-reenlightenment=on,hv-tlbflush=on,hv-tlbflush-direct=on,hv-tlbflush-ext=on,hv-ipi=on,hv-evmcs=on,hv-avic=on,hv-emsr-bitmap=on,hv-xmm-input=on' \ + -m size=219136k \ + -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxmlconfdata/hyperv.xml b/tests/qemuxmlconfdata/hyperv.xml +index a1e3cbbdf8..8c323f6578 100644 +--- a/tests/qemuxmlconfdata/hyperv.xml ++++ b/tests/qemuxmlconfdata/hyperv.xml +@@ -22,7 +22,10 @@ + + + +- ++ ++ ++ ++ + + + +-- +2.47.1 diff --git a/SOURCES/libvirt-qemu-Don-t-leave-beingDestroyed-true-on-inactive-domain.patch b/SOURCES/libvirt-qemu-Don-t-leave-beingDestroyed-true-on-inactive-domain.patch deleted file mode 100644 index a630ae1..0000000 --- a/SOURCES/libvirt-qemu-Don-t-leave-beingDestroyed-true-on-inactive-domain.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 53b691e4d85f8a442f14ecf4b3bf0b17d607fb2b Mon Sep 17 00:00:00 2001 -Message-ID: <53b691e4d85f8a442f14ecf4b3bf0b17d607fb2b.1720800605.git.jdenemar@redhat.com> -From: Jiri Denemark -Date: Thu, 11 Jul 2024 13:49:09 +0200 -Subject: [PATCH] qemu: Don't leave beingDestroyed=true on inactive domain - -Recent commit v10.4.0-87-gd9935a5c4f made a reasonable change to only -reset beingDestroyed back to false when vm->def->id is reset to make -sure other code can detect a domain is (about to become) inactive. It -even added a comment saying any caller of qemuProcessBeginStopJob is -supposed to call qemuProcessStop to clear beingDestroyed. But not every -caller really does so because they first call qemuProcessBeginStopJob -and then check whether a domain is still running. If not the -qemuProcessStop call is skipped leaving beingDestroyed=true. In case of -a persistent domain this may block incoming migrations of such domain as -the migration code would think the domain died unexpectedly (even though -it's still running). - -The qemuProcessBeginStopJob function is a wrapper around -virDomainObjBeginJob, but virDomainObjEndJob was used directly for -cleanup. This patch introduces a new qemuProcessEndStopJob wrapper -around virDomainObjEndJob to properly undo everything -qemuProcessBeginStopJob did. - -https://issues.redhat.com/browse/RHEL-43309 - -Signed-off-by: Jiri Denemark -Reviewed-by: Peter Krempa -(cherry picked from commit bec903cae84c21850d47a1b4d3ab57ca81189519) -Signed-off-by: Jiri Denemark ---- - src/qemu/qemu_driver.c | 4 ++-- - src/qemu/qemu_process.c | 20 ++++++++++++++++---- - src/qemu/qemu_process.h | 1 + - 3 files changed, 19 insertions(+), 6 deletions(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index fc1704f4fc..d9073b2154 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -2115,7 +2115,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, - endjob: - if (ret == 0) - qemuDomainRemoveInactive(driver, vm, 0, false); -- virDomainObjEndJob(vm); -+ qemuProcessEndStopJob(vm); - - cleanup: - virDomainObjEndAPI(&vm); -@@ -3901,7 +3901,7 @@ processMonitorEOFEvent(virQEMUDriver *driver, - - endjob: - qemuDomainRemoveInactive(driver, vm, 0, false); -- virDomainObjEndJob(vm); -+ qemuProcessEndStopJob(vm); - } - - -diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c -index b9b6ccf1de..bea42d38c6 100644 ---- a/src/qemu/qemu_process.c -+++ b/src/qemu/qemu_process.c -@@ -8422,7 +8422,8 @@ qemuProcessKill(virDomainObj *vm, unsigned int flags) - * qemuProcessBeginStopJob: - * - * Stop all current jobs by killing the domain and start a new one for -- * qemuProcessStop. -+ * qemuProcessStop. The caller has to make sure qemuProcessEndStopJob is -+ * called to properly cleanup the job. - */ - int - qemuProcessBeginStopJob(virDomainObj *vm, -@@ -8449,8 +8450,9 @@ qemuProcessBeginStopJob(virDomainObj *vm, - goto error; - - /* priv->beingDestroyed is deliberately left set to 'true' here. Caller -- * is supposed to call qemuProcessStop, which will reset it after -- * 'vm->def->id' is set to -1 */ -+ * is supposed to call qemuProcessStop (which will reset it after -+ * 'vm->def->id' is set to -1) and/or qemuProcessEndStopJob to do proper -+ * cleanup. */ - return 0; - - error: -@@ -8459,6 +8461,16 @@ qemuProcessBeginStopJob(virDomainObj *vm, - } - - -+void -+qemuProcessEndStopJob(virDomainObj *vm) -+{ -+ if (!virDomainObjIsActive(vm)) -+ QEMU_DOMAIN_PRIVATE(vm)->beingDestroyed = false; -+ -+ virDomainObjEndJob(vm); -+} -+ -+ - void qemuProcessStop(virQEMUDriver *driver, - virDomainObj *vm, - virDomainShutoffReason reason, -@@ -8801,7 +8813,7 @@ qemuProcessAutoDestroy(virDomainObj *dom, - - qemuDomainRemoveInactive(driver, dom, 0, false); - -- virDomainObjEndJob(dom); -+ qemuProcessEndStopJob(dom); - - virObjectEventStateQueue(driver->domainEventState, event); - } -diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h -index c1ea949215..cb67bfcd2d 100644 ---- a/src/qemu/qemu_process.h -+++ b/src/qemu/qemu_process.h -@@ -169,6 +169,7 @@ typedef enum { - int qemuProcessBeginStopJob(virDomainObj *vm, - virDomainJob job, - bool forceKill); -+void qemuProcessEndStopJob(virDomainObj *vm); - void qemuProcessStop(virQEMUDriver *driver, - virDomainObj *vm, - virDomainShutoffReason reason, --- -2.45.2 diff --git a/SOURCES/libvirt-qemu-Enable-I-O-APIC-even-more-frequently.patch b/SOURCES/libvirt-qemu-Enable-I-O-APIC-even-more-frequently.patch new file mode 100644 index 0000000..7110dbe --- /dev/null +++ b/SOURCES/libvirt-qemu-Enable-I-O-APIC-even-more-frequently.patch @@ -0,0 +1,154 @@ +From 850e6f2459fa256a80988009a4fedfb9a52b9aed Mon Sep 17 00:00:00 2001 +Message-ID: <850e6f2459fa256a80988009a4fedfb9a52b9aed.1734700218.git.jdenemar@redhat.com> +From: Michal Privoznik +Date: Wed, 18 Dec 2024 11:07:26 +0100 +Subject: [PATCH] qemu: Enable I/O APIC even more frequently + +In my previous commit v10.10.0-48-g2d222ecf6e I've made us enable +I/O APIC when there is an IOMMU with EIM. This works well. What +does not work is case when there's just an IOMMU without EIM but +with 256+ vCPUS. Problem is that post parsing happens in two +stages: general domain post parse (where +qemuDomainDefEnableDefaultFeatures() is called) and then per +device post parse (where qemuDomainIOMMUDefPostParse() is +called). Now, in aforementioned case it is the device post parse +phase where EIM is enabled but the code that would enable +VIR_DOMAIN_FEATURE_IOAPIC has already run. + +To resolve this, make the domain post parse callback "foresee" +the future enabling of EIM so that it can turn on I/O APIC +beforehand. + +Resolves: https://issues.redhat.com/browse/RHEL-65844 +Fixes: 2d222ecf6e73614a400b830ac56e9aaa1bc55ecc +Signed-off-by: Michal Privoznik +Reviewed-by: Jiri Denemark +(cherry picked from commit 0162f2008e36df489f6f04e4d6002543acfa171d) +https://issues.redhat.com/browse/RHEL-65844 +Signed-off-by: Michal Privoznik +--- + src/qemu/qemu_postparse.c | 21 +++++++++--- + ...m-autoadd-v2.x86_64-latest.abi-update.args | 1 + + ...im-autoadd-v2.x86_64-latest.abi-update.xml | 1 + + .../intel-iommu-eim-autoadd-v2.xml | 32 +++++++++++++++++++ + tests/qemuxmlconftest.c | 1 + + 5 files changed, 51 insertions(+), 5 deletions(-) + create mode 120000 tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.args + create mode 120000 tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.xml + create mode 100644 tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.xml + +diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c +index f48f172c37..049a6ef2dc 100644 +--- a/src/qemu/qemu_postparse.c ++++ b/src/qemu/qemu_postparse.c +@@ -783,6 +783,15 @@ qemuDomainPstoreDefPostParse(virDomainPstoreDef *pstore, + } + + ++static bool ++qemuDomainNeedsIOMMUWithEIM(const virDomainDef *def) ++{ ++ return ARCH_IS_X86(def->os.arch) && ++ virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM && ++ qemuDomainIsQ35(def); ++} ++ ++ + static int + qemuDomainIOMMUDefPostParse(virDomainIOMMUDef *iommu, + const virDomainDef *def, +@@ -793,9 +802,7 @@ qemuDomainIOMMUDefPostParse(virDomainIOMMUDef *iommu, + * (EIM) is not explicitly turned off, let's enable it. If we didn't then + * guest will have troubles with interrupts. */ + if (parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE && +- ARCH_IS_X86(def->os.arch) && +- virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM && +- qemuDomainIsQ35(def) && ++ qemuDomainNeedsIOMMUWithEIM(def) && + iommu && iommu->model == VIR_DOMAIN_IOMMU_MODEL_INTEL) { + + /* eim requires intremap. */ +@@ -1548,9 +1555,13 @@ qemuDomainDefEnableDefaultFeatures(virDomainDef *def, + def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON; + } + +- /* IOMMU with intremap requires split I/O APIC */ ++ /* IOMMU with intremap requires split I/O APIC. But it may happen that ++ * domain already has IOMMU without inremap. This will be fixed in ++ * qemuDomainIOMMUDefPostParse() but there domain definition can't be ++ * modified so change it now. */ + if (def->iommu && +- def->iommu->intremap == VIR_TRISTATE_SWITCH_ON && ++ (def->iommu->intremap == VIR_TRISTATE_SWITCH_ON || ++ qemuDomainNeedsIOMMUWithEIM(def)) && + def->features[VIR_DOMAIN_FEATURE_IOAPIC] == VIR_DOMAIN_IOAPIC_NONE) { + def->features[VIR_DOMAIN_FEATURE_IOAPIC] = VIR_DOMAIN_IOAPIC_QEMU; + } +diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.args +new file mode 120000 +index 0000000000..a7fdee3d71 +--- /dev/null ++++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.args +@@ -0,0 +1 @@ ++intel-iommu-eim-autoadd.x86_64-latest.abi-update.args +\ No newline at end of file +diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.xml b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.xml +new file mode 120000 +index 0000000000..928ea1b4c8 +--- /dev/null ++++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.x86_64-latest.abi-update.xml +@@ -0,0 +1 @@ ++intel-iommu-eim-autoadd.x86_64-latest.abi-update.xml +\ No newline at end of file +diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.xml b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.xml +new file mode 100644 +index 0000000000..b39ee55786 +--- /dev/null ++++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd-v2.xml +@@ -0,0 +1,32 @@ ++ ++ QEMUGuest1 ++ c7a5fdbd-edaf-9455-926a-d65c16db1809 ++ 219100 ++ 219100 ++ 288 ++ ++ hvm ++ ++ ++ ++ qemu64 ++ ++ ++ destroy ++ restart ++ destroy ++ ++ /usr/bin/qemu-system-x86_64 ++ ++ ++ ++
++ ++ ++ ++ ++