1f0277483b
- block: bugfix: Don't pause vm when NOSPACE EIO happened - block: enable cache mode of empty cdrom - block/mirror: fix file-system went to read-only after block-mirror - scsi-bus: fix incorrect call for blk_error_retry_reset_timeout() - scsi-bus: fix unmatched object_unref() - block: Add sanity check when setting retry parameters - block-backend: Stop retrying when draining - scsi-disk: Add support for retry on errors - scsi-bus: Refactor the code that retries requests - virtio_blk: Add support for retry on errors - block: Add error retry param setting - block-backend: Add timeout support for retry - block-backend: Enable retry action on errors - block-backend: Add device specific retry callback - block-backend: Introduce retry timer - qapi/block-core: Add retry option for error action - scsi: bugfix: fix division by zero - scsi: cdrom: Fix crash after remote cdrom detached - qemu-pr: fixed ioctl failed for multipath disk - scsi-disk: define props in scsi_block_disk to avoid memleaks - bugfix: fix possible memory leak - bugfix: fix some illegal memory access and memory leak - util/log: add CONFIG_DISABLE_QEMU_LOG macro - log: Add some logs on VM runtime path - bugfix: fix eventfds may double free when vm_id reused in ivshmem - hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() - hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() - qemu-img create: 'cache' paramter only use for reg file image - qemu-img: add qemu-img direct create - qemu-img block: set zero flags only when discard_zeros of the block supported - Revert "file-posix: Remove unused s->discard_zeroes" - pcie_sriov: Validate NumVFs (CVE-2024-26327) - hw/nvme: Use pcie_sriov_num_vfs() (CVE-2024-26328) - hw/acpi/cpu: Use CPUState typedef - target/i386/sev: Fix missing ERRP_GUARD() for error_prepend() - virtio-gpu: remove needless condition - hw/i2c/smbus_slave: Add object path on error prints - vfio/pci: Ascend710 change to bar2 quirk - vfio/pci: Ascend910 need 4Bytes quirk in bar0 - vfio/pci: Ascend710 need 4Bytes quirk in bar0 - vfio/pci: Ascend310 need 4Bytes quirk in bar4 - chardev/char-socket: Fix TLS io channels sending too much data to the backend - i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - blkio: Respect memory-alignment for bounce buffer allocations - virtio-gpu: Correct virgl_renderer_resource_get_info() error check - hw/usb: Style cleanup - tests/qemu-iotests: resolved the problem that the 108 test cases in the container fail Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 404d45bf9147058a475a8031c454a6c8e0acc123)
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From bf3d3ecf9ff5808d1f03e83a363c8295f7abad76 Mon Sep 17 00:00:00 2001
|
|
From: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Date: Wed, 24 Jan 2024 21:40:16 -0500
|
|
Subject: [PATCH] i386/cpuid: Move leaf 7 to correct group
|
|
|
|
commit 0729857c707535847d7fe31d3d91eb8b2a118e3c upstream.
|
|
|
|
CPUID leaf 7 was grouped together with SGX leaf 0x12 by commit
|
|
b9edbadefb9e ("i386: Propagate SGX CPUID sub-leafs to KVM") by mistake.
|
|
|
|
SGX leaf 0x12 has its specific logic to check if subleaf (starting from 2)
|
|
is valid or not by checking the bit 0:3 of corresponding EAX is 1 or
|
|
not.
|
|
|
|
Leaf 7 follows the logic that EAX of subleaf 0 enumerates the maximum
|
|
valid subleaf.
|
|
|
|
Fixes: b9edbadefb9e ("i386: Propagate SGX CPUID sub-leafs to KVM")
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Message-ID: <20240125024016.2521244-4-xiaoyao.li@intel.com>
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: Jason Zeng <jason.zeng@intel.com>
|
|
---
|
|
target/i386/kvm/kvm.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
|
|
index e68eb8f5e6..a0bc9ea7b1 100644
|
|
--- a/target/i386/kvm/kvm.c
|
|
+++ b/target/i386/kvm/kvm.c
|
|
@@ -1955,7 +1955,6 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
|
c = &cpuid_data.entries[cpuid_i++];
|
|
}
|
|
break;
|
|
- case 0x7:
|
|
case 0x12:
|
|
for (j = 0; ; j++) {
|
|
c->function = i;
|
|
@@ -1975,6 +1974,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
|
c = &cpuid_data.entries[cpuid_i++];
|
|
}
|
|
break;
|
|
+ case 0x7:
|
|
case 0x14:
|
|
case 0x1d:
|
|
case 0x1e: {
|
|
--
|
|
2.27.0
|
|
|