From: Cornelia Huck <cohuck@redhat.com>
To: Janosch Frank <frankja@linux.ibm.com>
Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org,
qemu-devel@nongnu.org, david@redhat.com
Subject: Re: [PATCH] s390x: protvirt: Fix stray error_report_err in s390_machine_protect
Date: Thu, 26 Mar 2020 17:55:51 +0100 [thread overview]
Message-ID: <20200326175551.542153aa.cohuck@redhat.com> (raw)
In-Reply-To: <20200326140505.2432-1-frankja@linux.ibm.com>
On Thu, 26 Mar 2020 10:05:05 -0400
Janosch Frank <frankja@linux.ibm.com> wrote:
> 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.
Yes, s390_pvm_vm_enable() will already moan on error.
>
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com>
> Fixes: 520935eedf941da3 ("s390x: protvirt: Add migration blocker")
Note to self: update commit ID before I send a pull request (I will at
least need to rebase for a headers update...)
> ---
> 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 3cf19c99f3468b7d..855ecf370d6e82fa 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -358,7 +358,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;
Thanks, applied.
next prev parent reply other threads:[~2020-03-26 16:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 14:05 [PATCH] s390x: protvirt: Fix stray error_report_err in s390_machine_protect Janosch Frank
2020-03-26 16:55 ` Cornelia Huck [this message]
2020-03-27 9:15 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200326175551.542153aa.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).