Skip to content
Snippets Groups Projects
Commit 145e4fe4 authored by Andrea Bolognani's avatar Andrea Bolognani
Browse files

patches: Add backports

Specifically

  backport/docs-Fix-typo-in-virt-qemu-sev-validate-1.patch
  backport/tools-Fix-interpreter-for-virt-qemu-sev-validate.patch
  backport/tools-Fix-style-issues-in-virt-qemu-sev-validate.patch

which address a number of issues in virt-qemu-sev-validate.
parent 4e5d7b6b
No related branches found
No related tags found
1 merge request!160Introduce libvirt-clients-qemu binary package
From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 8 Dec 2022 16:55:32 +0100
Subject: docs: Fix typo in virt-qemu-sev-validate(1)
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Spotted by Lintian (typo-in-manual-page tag).
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit a417571628704b38a31ecd07f0971a6ade986f75)
---
docs/manpages/virt-qemu-sev-validate.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/manpages/virt-qemu-sev-validate.rst b/docs/manpages/virt-qemu-sev-validate.rst
index f5f9286..fcbe84b 100644
--- a/docs/manpages/virt-qemu-sev-validate.rst
+++ b/docs/manpages/virt-qemu-sev-validate.rst
@@ -556,7 +556,7 @@ on the virtualization host. In that scenario the only three command
line parameters required are for the TIK, TEK and libvirt domain
name. It should be able to automatically determine all the other
information required. If it still reports a failure, this points
-very strongly to the TIK/TEK pair not maching the configured
+very strongly to the TIK/TEK pair not matching the configured
DH certificate and session blob.
The ``--debug`` flag will display hashes and/or hex dumps for various
From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 8 Dec 2022 16:57:23 +0100
Subject: tools: Fix interpreter for virt-qemu-sev-validate
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Go through env(1) instead of hardcoding the path to the Python
interpreter, as we already do for all other Python scripts.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit f6a19d7264bb26df8108805d3f28d71d7a597342)
---
tools/virt-qemu-sev-validate | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virt-qemu-sev-validate b/tools/virt-qemu-sev-validate
index 712a4e4..46a92aa 100755
--- a/tools/virt-qemu-sev-validate
+++ b/tools/virt-qemu-sev-validate
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
#
# SPDX-License-Identifier: LGPL-2.1-or-later
#
From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 8 Dec 2022 18:00:13 +0100
Subject: tools: Fix style issues in virt-qemu-sev-validate
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
The script had an incorrect interpreter line until commit
f6a19d7264bb, so the flake8 check would not realize it needed
to pick it up and these issues, some of which were present it
the very first version that was committed, were not being
reported.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit 6c4f5af9a07883ab3873884b8a44005a3e6d04e1)
---
tools/virt-qemu-sev-validate | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/virt-qemu-sev-validate b/tools/virt-qemu-sev-validate
index 46a92aa..3d8b292 100755
--- a/tools/virt-qemu-sev-validate
+++ b/tools/virt-qemu-sev-validate
@@ -849,7 +849,7 @@ class ConfidentialVM(abc.ABC):
secret64 = b64encode(secret_table_ciphertext).decode('utf8')
log.debug("Header: %s (%d bytes)", header64, len(header))
log.debug("Secret: %s (%d bytes)",
- secret64, len(secret_table_ciphertext))
+ secret64, len(secret_table_ciphertext))
return header64, secret64
@@ -955,7 +955,7 @@ class LibvirtConfidentialVM(ConfidentialVM):
self.dom = self.conn.lookupByName(id_name_uuid)
log.debug("VM: id=%d name=%s uuid=%s",
- self.dom.ID(), self.dom.name(), self.dom.UUIDString())
+ self.dom.ID(), self.dom.name(), self.dom.UUIDString())
if not self.dom.isActive():
raise InvalidStateException(
@@ -1331,5 +1331,6 @@ def main():
print("ERROR: %s" % e, file=sys.stderr)
sys.exit(6)
+
if __name__ == "__main__":
main()
backport/docs-Fix-typo-in-virt-qemu-sev-validate-1.patch
backport/tools-Fix-interpreter-for-virt-qemu-sev-validate.patch
backport/tools-Fix-style-issues-in-virt-qemu-sev-validate.patch
forward/Skip-vircgrouptest.patch
forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment