56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
|
From b54e5e6df5d5bbe4dc0a206be9f6b6d971ce6f43 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Fri, 29 May 2020 05:54:17 -0400
|
||
|
|
Subject: [PATCH 35/42] s390x: protvirt: Fix stray error_report_err in
|
||
|
|
s390_machine_protect
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <20200529055420.16855-36-thuth@redhat.com>
|
||
|
|
Patchwork-id: 97042
|
||
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 35/38] s390x: protvirt: Fix stray error_report_err in s390_machine_protect
|
||
|
|
Bugzilla: 1828317
|
||
|
|
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
|
||
|
|
From: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
|
||
|
|
In case the protection of the machine fails at s390_pv_vm_enable(),
|
||
|
|
we'll currently report the local_error variable. Problem is that
|
||
|
|
there's no migration blocker error that we can report at this point so
|
||
|
|
the pointer is always NULL which leads to a SEGFAULT.
|
||
|
|
|
||
|
|
Let's remove the error report.
|
||
|
|
|
||
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
||
|
|
Fixes: 0141e1b47707 ("s390x: protvirt: Add migration blocker")
|
||
|
|
Message-Id: <20200326140505.2432-1-frankja@linux.ibm.com>
|
||
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
||
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
(cherry picked from commit 7152c9ecc6530ea145c122b0a58cc28802f630c6)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/s390x/s390-virtio-ccw.c | 1 -
|
||
|
|
1 file changed, 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
||
|
|
index b4ebe83766..c08e42bda1 100644
|
||
|
|
--- a/hw/s390x/s390-virtio-ccw.c
|
||
|
|
+++ b/hw/s390x/s390-virtio-ccw.c
|
||
|
|
@@ -360,7 +360,6 @@ static int s390_machine_protect(S390CcwMachineState *ms)
|
||
|
|
rc = s390_pv_vm_enable();
|
||
|
|
if (rc) {
|
||
|
|
qemu_balloon_inhibit(false);
|
||
|
|
- error_report_err(local_err);
|
||
|
|
migrate_del_blocker(pv_mig_blocker);
|
||
|
|
error_free_or_abort(&pv_mig_blocker);
|
||
|
|
return rc;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|