yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-pc-bios-s390-ccw-main-Remove-superfluous-call-to-ena.patch

f66865
From 541d06b7dc1cd3ad4722850f3a7f5df12b8d6fba Mon Sep 17 00:00:00 2001
f66865
From: Thomas Huth <thuth@redhat.com>
f66865
Date: Fri, 9 Oct 2020 10:08:48 -0400
f66865
Subject: [PATCH 12/14] pc-bios/s390-ccw/main: Remove superfluous call to
f66865
 enable_subchannel()
f66865
f66865
RH-Author: Thomas Huth <thuth@redhat.com>
f66865
Message-id: <20201009100849.264994-9-thuth@redhat.com>
f66865
Patchwork-id: 98602
f66865
O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 8/9] pc-bios/s390-ccw/main: Remove superfluous call to enable_subchannel()
f66865
Bugzilla: 1846975
f66865
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
f66865
RH-Acked-by: David Hildenbrand <david@redhat.com>
f66865
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
f66865
f66865
enable_subchannel() is already done during is_dev_possibly_bootable()
f66865
(which is called from find_boot_device() -> find_subch()), so there
f66865
is no need to do this again in the main() function.
f66865
f66865
Message-Id: <20200806105349.632-9-thuth@redhat.com>
f66865
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
f66865
Signed-off-by: Thomas Huth <thuth@redhat.com>
f66865
(cherry picked from commit 49d4388ec03fd8c7701b907a4e11c437a28f8572)
f66865
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
f66865
---
f66865
 pc-bios/s390-ccw/main.c | 1 -
f66865
 1 file changed, 1 deletion(-)
f66865
f66865
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
f66865
index b5c721c395..e3a1a3053d 100644
f66865
--- a/pc-bios/s390-ccw/main.c
f66865
+++ b/pc-bios/s390-ccw/main.c
f66865
@@ -289,7 +289,6 @@ int main(void)
f66865
     boot_setup();
f66865
     if (have_iplb) {
f66865
         find_boot_device();
f66865
-        enable_subchannel(blk_schid);
f66865
         ipl_boot_device();
f66865
     } else {
f66865
         probe_boot_device();
f66865
-- 
f66865
2.27.0
f66865