37fd552490
- Synchronize with libvirt-10.5.0-4.el9 (RHEL-30177) - virt-host-validate: Allow longer list of CPU flags - vmx: Be even more lax when trying to comprehend serial ports - vmx: Do not require all ID data for VMWare Distributed Switch - tests: vhostuser: add virtiofsd json descriptor - tests: qemuxmlconf: adjust test case to new virtiofsd - qemu: fill capabilities for virtiofsd - qemu: do not use deprecated options for new virtiofsd - qemu: migration: allow migration for virtiofs - virt-host-validate: Drop extra "PASS" - qemu: Don't leave beingDestroyed=true on inactive domain Related: RHEL-30177
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From d1d455fe81027fee79666b3af2551e98b68b619b Mon Sep 17 00:00:00 2001
|
|
Message-ID: <d1d455fe81027fee79666b3af2551e98b68b619b.1720800605.git.jdenemar@redhat.com>
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Thu, 11 Jul 2024 09:32:40 +0200
|
|
Subject: [PATCH] virt-host-validate: Drop extra "PASS"
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
If virt-host-validate is ran on a SEV-SNP capable machine, an
|
|
extra "PASS" is printed out. This is because
|
|
virHostValidateAMDSev() prints "PASS" and then returns 1
|
|
(indicating success) which in turn makes the caller
|
|
(virHostValidateSecureGuests()) print "PASS" again. Just drop the
|
|
extra printing in the caller and let virHostValidateAMDSev() do
|
|
all the printing.
|
|
|
|
Fixes: 1a8f646f291775d2423ce4e4df62ad69f06ab827
|
|
Resolves: https://issues.redhat.com/browse/RHEL-46868
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit c9fa43c48cdb1b8505929e3287975445f3004f32)
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
tools/virt-host-validate-common.c | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
|
|
index a29a5b6d5f..591143c24d 100644
|
|
--- a/tools/virt-host-validate-common.c
|
|
+++ b/tools/virt-host-validate-common.c
|
|
@@ -488,11 +488,7 @@ int virHostValidateSecureGuests(const char *hvname,
|
|
return VIR_VALIDATE_FAILURE(level);
|
|
}
|
|
} else if (hasAMDSev) {
|
|
- int rc = virHostValidateAMDSev(hvname, level);
|
|
-
|
|
- if (rc > 0)
|
|
- virValidatePass();
|
|
- return rc;
|
|
+ return virHostValidateAMDSev(hvname, level);
|
|
}
|
|
|
|
virValidateFail(level,
|
|
--
|
|
2.45.2
|