diff --git a/3c6e8537-guest-fix-warning-message-when-machine-type-is-changed-for-secure-boot.patch b/3c6e8537-guest-fix-warning-message-when-machine-type-is-changed-for-secure-boot.patch new file mode 100644 index 00000000..f487bf6a --- /dev/null +++ b/3c6e8537-guest-fix-warning-message-when-machine-type-is-changed-for-secure-boot.patch @@ -0,0 +1,25 @@ +Subject: guest: fix warning message when machine type is changed for secure boot +From: Pavel Hrdina phrdina@redhat.com Mon Jul 8 10:44:43 2019 +0200 +Date: Mon Jul 8 10:57:46 2019 +0200: +Git: 3c6e85375d0cd87dcf8ac70b41db0d899851338e + +Introduced by commit <3586d1897>. + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1727811 + +Signed-off-by: Pavel Hrdina + +diff --git a/virtinst/guest.py b/virtinst/guest.py +index ef227d17..41357644 100644 +--- a/virtinst/guest.py ++++ b/virtinst/guest.py +@@ -586,7 +586,8 @@ class Guest(XMLBuilder): + self.os.loader_secure = True + if self.os.machine and "q35" not in self.os.machine: + log.warning("Changing machine type from '%s' to 'q35' " +- "which is required for UEFI secure boot.") ++ "which is required for UEFI secure boot.", ++ self.os.machine) + self.os.machine = "q35" + + def disable_hyperv_for_uefi(self): diff --git a/virt-manager.changes b/virt-manager.changes index 03847ae3..ac6febbd 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 10 14:21:53 MDT 2019 - carnold@suse.com + +- Upstream bug fix (bsc#1027942) + 3c6e8537-guest-fix-warning-message-when-machine-type-is-changed-for-secure-boot.patch + ------------------------------------------------------------------- Fri Jul 5 08:54:18 MDT 2019 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 01f1205f..4d93ed40 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -32,6 +32,7 @@ Source1: virt-install.rb Source2: virt-install.desktop Source3: virt-manager-supportconfig # Upstream Patches +Patch1: 3c6e8537-guest-fix-warning-message-when-machine-type-is-changed-for-secure-boot.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -164,6 +165,7 @@ machine). %prep %setup -q # Upstream Patches +%patch1 -p1 # SUSE Only %patch70 -p1 %patch71 -p1