50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
|
From 070dda07559a7488c62fc80a8c79e8baaee125eb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Date: Wed, 3 Jul 2024 10:37:23 +0200
|
||
|
|
Subject: [PATCH 087/100] target/i386: SEV: fix formatting of CPUID mismatch
|
||
|
|
message
|
||
|
|
|
||
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
RH-MergeRequest: 245: SEV-SNP support
|
||
|
|
RH-Jira: RHEL-39544
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-Acked-by: Bandan Das <bdas@redhat.com>
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
RH-Commit: [87/91] 36bc2cc80d5ffc1ceeb1836540660ff45885a818 (bonzini/rhel-qemu-kvm)
|
||
|
|
|
||
|
|
Fixes: 70943ad8e4d ("i386/sev: Add support for SNP CPUID validation", 2024-06-05)
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
(cherry picked from commit f45ef010e19fe86314bffd5d5c9d5d77f4ce8103)
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
---
|
||
|
|
target/i386/sev.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/sev.c b/target/i386/sev.c
|
||
|
|
index c40562dce3..37de80adc7 100644
|
||
|
|
--- a/target/i386/sev.c
|
||
|
|
+++ b/target/i386/sev.c
|
||
|
|
@@ -839,7 +839,7 @@ sev_snp_cpuid_report_mismatches(SnpCpuidInfo *old,
|
||
|
|
size_t i;
|
||
|
|
|
||
|
|
if (old->count != new->count) {
|
||
|
|
- error_report("SEV-SNP: CPUID validation failed due to count mismatch,"
|
||
|
|
+ error_report("SEV-SNP: CPUID validation failed due to count mismatch, "
|
||
|
|
"provided: %d, expected: %d", old->count, new->count);
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
@@ -851,8 +851,8 @@ sev_snp_cpuid_report_mismatches(SnpCpuidInfo *old,
|
||
|
|
new_func = &new->entries[i];
|
||
|
|
|
||
|
|
if (memcmp(old_func, new_func, sizeof(SnpCpuidFunc))) {
|
||
|
|
- error_report("SEV-SNP: CPUID validation failed for function 0x%x, index: 0x%x"
|
||
|
|
- "provided: eax:0x%08x, ebx: 0x%08x, ecx: 0x%08x, edx: 0x%08x"
|
||
|
|
+ error_report("SEV-SNP: CPUID validation failed for function 0x%x, index: 0x%x, "
|
||
|
|
+ "provided: eax:0x%08x, ebx: 0x%08x, ecx: 0x%08x, edx: 0x%08x, "
|
||
|
|
"expected: eax:0x%08x, ebx: 0x%08x, ecx: 0x%08x, edx: 0x%08x",
|
||
|
|
old_func->eax_in, old_func->ecx_in,
|
||
|
|
old_func->eax, old_func->ebx, old_func->ecx, old_func->edx,
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|