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