From 87847dbf8cf78cb9dae5245b68d6f302393e0d83 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 11:59:22 +0000 Subject: [PATCH] import CS virt-manager-4.1.0-5.el9 --- ...efault-TPM-for-cloud-init-install-ph.patch | 150 ++++ ...d-more-cloud-init-and-TPM-test-cases.patch | 653 ++++++++++++++++++ SPECS/virt-manager.spec | 7 +- 3 files changed, 809 insertions(+), 1 deletion(-) create mode 100644 SOURCES/virt-manager-installer-drop-default-TPM-for-cloud-init-install-ph.patch create mode 100644 SOURCES/virt-manager-tests-Add-more-cloud-init-and-TPM-test-cases.patch diff --git a/SOURCES/virt-manager-installer-drop-default-TPM-for-cloud-init-install-ph.patch b/SOURCES/virt-manager-installer-drop-default-TPM-for-cloud-init-install-ph.patch new file mode 100644 index 0000000..aa587d9 --- /dev/null +++ b/SOURCES/virt-manager-installer-drop-default-TPM-for-cloud-init-install-ph.patch @@ -0,0 +1,150 @@ +From 7867228f70cd716afe35e9d60a5fc9793c7e7f96 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Tue, 12 Sep 2023 12:01:09 -0400 +Subject: [PATCH 2/2] installer: drop default TPM for --cloud-init install + phase + +When shim in the guest sees unpopulated EFI NVRAM, like when +we create a new UEFI VM, it invokes fallback.efi to populate +initial NVRAM boot entries. When the guest also has a TPM device, +shim will do a one time VM reset. This reset throws off the +reboot detection that is central to virt-install's install +process. + +The main install case that this will usually be relevant is +the combo of UEFI and --cloud-init. The latter usually implies +use of a distro cloud image, which will be using shim, and the +--cloud-init process requires a multi stage install compared +to just a plain import install. + +For that case, we disable the default TPM device for the first +boot. + +https://bugzilla.redhat.com/show_bug.cgi?id=2133525 + +Signed-off-by: Cole Robinson + +Resolves: https://issues.redhat.com/browse/RHEL-1705 + +(cherry picked from commit ec434948a8384541c56bfa04e4985f4fc709bc76) +Signed-off-by: Jonathon Jongsma +--- + .../virt-install-aarch64-cloud-init.xml | 3 -- + .../virt-install-cloud-init-options1.xml | 3 -- + virtinst/guest.py | 2 ++ + virtinst/install/installer.py | 31 +++++++++++++++++-- + 4 files changed, 31 insertions(+), 8 deletions(-) + +diff --git a/tests/data/cli/compare/virt-install-aarch64-cloud-init.xml b/tests/data/cli/compare/virt-install-aarch64-cloud-init.xml +index e4a50cf4c..18c417662 100644 +--- a/tests/data/cli/compare/virt-install-aarch64-cloud-init.xml ++++ b/tests/data/cli/compare/virt-install-aarch64-cloud-init.xml +@@ -49,9 +49,6 @@ + + + +- +- +- + + + /dev/urandom +diff --git a/tests/data/cli/compare/virt-install-cloud-init-options1.xml b/tests/data/cli/compare/virt-install-cloud-init-options1.xml +index cd5426049..110730dd3 100644 +--- a/tests/data/cli/compare/virt-install-cloud-init-options1.xml ++++ b/tests/data/cli/compare/virt-install-cloud-init-options1.xml +@@ -71,9 +71,6 @@ chpasswd: + + + +- +- +- + + + /dev/urandom +diff --git a/virtinst/guest.py b/virtinst/guest.py +index e66360223..0f5a93d08 100644 +--- a/virtinst/guest.py ++++ b/virtinst/guest.py +@@ -211,6 +211,7 @@ class Guest(XMLBuilder): + self.skip_default_graphics = False + self.skip_default_rng = False + self.skip_default_tpm = False ++ self.have_default_tpm = False + self.x86_cpu_default = self.cpu.SPECIAL_MODE_APP_DEFAULT + + # qemu 6.1, fairly new when we added this option, has an unfortunate +@@ -1060,6 +1061,7 @@ class Guest(XMLBuilder): + dev = DeviceTpm(self.conn) + dev.type = DeviceTpm.TYPE_EMULATOR + self.add_device(dev) ++ self.have_default_tpm = True + + def _add_default_memballoon(self): + if self.devices.memballoon: +diff --git a/virtinst/install/installer.py b/virtinst/install/installer.py +index df74eaffa..c005e77bd 100644 +--- a/virtinst/install/installer.py ++++ b/virtinst/install/installer.py +@@ -564,13 +564,38 @@ class Installer(object): + # guest install handling # + ########################## + +- def _build_postboot_xml(self, final_xml, meter): ++ def _build_postboot_xml(self, guest_ro, final_xml, meter): + initial_guest = Guest(self.conn, parsexml=final_xml) + self._alter_bootconfig(initial_guest) + self._alter_install_resources(initial_guest, meter) + if self.has_cloudinit(): + initial_guest.set_smbios_serial_cloudinit() + ++ # When shim in the guest sees unpopulated EFI NVRAM, like when ++ # we create a new UEFI VM, it invokes fallback.efi to populate ++ # initial NVRAM boot entries. When the guest also has a TPM device, ++ # shim will do a one time VM reset. This reset throws off the ++ # reboot detection that is central to virt-install's install ++ # process. ++ # ++ # The main install case that this will usually be relevant is ++ # the combo of UEFI and --cloud-init. The latter usually implies ++ # use of a distro cloud image, which will be using shim, and the ++ # --cloud-init process requires a multi stage install compared ++ # to just a plain import install. ++ # ++ # For that case, we disable the default TPM device for the first ++ # boot. ++ if (guest_ro.have_default_tpm and ++ guest_ro.is_uefi() and ++ len(initial_guest.devices.tpm)): ++ log.debug( ++ "combo of default TPM, UEFI, and cloudinit is " ++ "used. assuming this VM is using a linux distro " ++ "cloud image with shim in the boot path. disabling " ++ "TPM for the first boot") ++ initial_guest.remove_device(initial_guest.devices.tpm[0]) ++ + final_guest = Guest(self.conn, parsexml=final_xml) + self._remove_install_cdrom_media(final_guest) + self._remove_unattended_install_cdrom_device(final_guest) +@@ -581,7 +606,8 @@ class Installer(object): + initial_xml = None + final_xml = guest.get_xml() + if self._requires_postboot_xml_changes(): +- initial_xml, final_xml = self._build_postboot_xml(final_xml, meter) ++ initial_xml, final_xml = self._build_postboot_xml( ++ guest, final_xml, meter) + final_xml = self._pre_reinstall_xml or final_xml + + log.debug("Generated initial_xml: %s", +@@ -680,6 +706,7 @@ class Installer(object): + # All installer XML alterations are made on this guest instance, + # so the user_guest instance is left intact + guest = Guest(self.conn, parsexml=user_guest.get_xml()) ++ guest.have_default_tpm = user_guest.have_default_tpm + + try: + self._prepare(guest, meter) +-- +2.41.0 + diff --git a/SOURCES/virt-manager-tests-Add-more-cloud-init-and-TPM-test-cases.patch b/SOURCES/virt-manager-tests-Add-more-cloud-init-and-TPM-test-cases.patch new file mode 100644 index 0000000..937d583 --- /dev/null +++ b/SOURCES/virt-manager-tests-Add-more-cloud-init-and-TPM-test-cases.patch @@ -0,0 +1,653 @@ +From c8d1097fdaf7640c9dc78095076e584d38fbf6e5 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Tue, 12 Sep 2023 11:57:27 -0400 +Subject: [PATCH 1/2] tests: Add more cloud-init and TPM test cases + +Signed-off-by: Cole Robinson + +Resolves: https://issues.redhat.com/browse/RHEL-1705 + +(cherry picked from commit fca6de3950d41ccc1c4895c42073c840c45f01ab) +Signed-off-by: Jonathon Jongsma +--- + .../data/capabilities/kvm-aarch64-domcaps.xml | 14 ++ + .../virt-install-aarch64-cloud-init.xml | 136 ++++++++++++++++++ + ...t-install-aarch64-firmware-no-override.xml | 6 + + .../compare/virt-install-aarch64-kvm-gic.xml | 3 + + .../virt-install-aarch64-kvm-import.xml | 3 + + .../virt-install-cloud-init-default.xml | 127 +++++++++++----- + .../virt-install-cloud-init-options1.xml | 131 +++++++++++------ + tests/test_cli.py | 6 +- + 8 files changed, 346 insertions(+), 80 deletions(-) + create mode 100644 tests/data/cli/compare/virt-install-aarch64-cloud-init.xml + +diff --git a/tests/data/capabilities/kvm-aarch64-domcaps.xml b/tests/data/capabilities/kvm-aarch64-domcaps.xml +index 432bdb537..9c244bbdd 100644 +--- a/tests/data/capabilities/kvm-aarch64-domcaps.xml ++++ b/tests/data/capabilities/kvm-aarch64-domcaps.xml +@@ -62,6 +62,20 @@ + + + ++ ++ ++ tpm-tis ++ ++ ++ passthrough ++ emulator ++ external ++ ++ ++ 1.2 ++ 2.0 ++ ++ + + + +diff --git a/tests/data/cli/compare/virt-install-aarch64-cloud-init.xml b/tests/data/cli/compare/virt-install-aarch64-cloud-init.xml +new file mode 100644 +index 000000000..e4a50cf4c +--- /dev/null ++++ b/tests/data/cli/compare/virt-install-aarch64-cloud-init.xml +@@ -0,0 +1,136 @@ ++ ++ fedora28 ++ 00000000-1111-2222-3333-444444444444 ++ ++ ++ ++ ++ ++ 65536 ++ 65536 ++ 2 ++ ++ hvm ++ /usr/share/AAVMF/AAVMF_CODE.fd ++ ++ ++ ++ ++ ++ /usr/bin/qemu-system-aarch64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ /dev/urandom ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ds=nocloud ++ ++ ++ destroy ++ ++ ++ fedora28 ++ 00000000-1111-2222-3333-444444444444 ++ ++ ++ ++ ++ ++ 65536 ++ 65536 ++ 2 ++ ++ hvm ++ /usr/share/AAVMF/AAVMF_CODE.fd ++ ++ ++ ++ ++ ++ /usr/bin/qemu-system-aarch64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ /dev/urandom ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/data/cli/compare/virt-install-aarch64-firmware-no-override.xml b/tests/data/cli/compare/virt-install-aarch64-firmware-no-override.xml +index b6fe84e67..cef9e6cde 100644 +--- a/tests/data/cli/compare/virt-install-aarch64-firmware-no-override.xml ++++ b/tests/data/cli/compare/virt-install-aarch64-firmware-no-override.xml +@@ -43,6 +43,9 @@ + + + ++ ++ ++ + + + /dev/urandom +@@ -95,6 +98,9 @@ + + + ++ ++ ++ + + + /dev/urandom +diff --git a/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml b/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml +index 92e17eda6..aa31ed9c1 100644 +--- a/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml ++++ b/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml +@@ -56,6 +56,9 @@ + + + ++ ++ ++ + + + /dev/urandom +diff --git a/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml b/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml +index 5203cb807..1e4b26e51 100644 +--- a/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml ++++ b/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml +@@ -51,6 +51,9 @@ + + + ++ ++ ++ + +