From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66111C2BA83 for ; Thu, 13 Feb 2020 13:22:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2A313218AC for ; Thu, 13 Feb 2020 13:22:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Yqh4w2iT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A313218AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2ERY-0007ns-9i for qemu-devel@archiver.kernel.org; Thu, 13 Feb 2020 08:22:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46988) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2EQM-00064X-Gj for qemu-devel@nongnu.org; Thu, 13 Feb 2020 08:20:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2EQL-0007jt-HI for qemu-devel@nongnu.org; Thu, 13 Feb 2020 08:20:58 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59433 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j2EQL-0007jf-DB for qemu-devel@nongnu.org; Thu, 13 Feb 2020 08:20:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581600056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BR0NFF4kB4WALowFrUZKqMjz8zRgyClatayP7H8o15c=; b=Yqh4w2iT/pJ0nLc+E+A6Oa16CIazYBhfSm/r5+mozvvUVOSljItBpK/eCWcq4SpCFwJpsH O9OtpQ8cZ4a85iSVFbDHDOPz8yzCBCrrZAJR4ZtsSKYSpYz2uL8CGgPzkD+WRQLmDGvL6j Vt1qWtJJioc3Y7c79ErJBIn53DkHCuw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-87-3UWCgk0iNGO6MZLREOtZIA-1; Thu, 13 Feb 2020 08:20:55 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2335C184AED4 for ; Thu, 13 Feb 2020 13:20:54 +0000 (UTC) Received: from secure.mitica (ovpn-116-211.ams2.redhat.com [10.36.116.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FEA95C241; Thu, 13 Feb 2020 13:20:49 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 3/6] migration/rdma: rdma_accept_incoming_migration fix error handling Date: Thu, 13 Feb 2020 14:20:27 +0100 Message-Id: <20200213132030.57757-4-quintela@redhat.com> In-Reply-To: <20200213132030.57757-1-quintela@redhat.com> References: <20200213132030.57757-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: 3UWCgk0iNGO6MZLREOtZIA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" rdma_accept_incoming_migration is called from an fd handler and can't return an Error * anywhere. Currently it's leaking Error's in errp/local_err - there's no point putting them in there unless we can report them. Turn most into fprintf's, and the last into an error_reportf_err where it's coming up from another function. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/rdma.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 2379b8345b..f61587891b 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -3980,13 +3980,13 @@ static void rdma_accept_incoming_migration(void *op= aque) RDMAContext *rdma =3D opaque; int ret; QEMUFile *f; - Error *local_err =3D NULL, **errp =3D &local_err; + Error *local_err =3D NULL; =20 trace_qemu_rdma_accept_incoming_migration(); ret =3D qemu_rdma_accept(rdma); =20 if (ret) { - ERROR(errp, "RDMA Migration initialization failed!"); + fprintf(stderr, "RDMA ERROR: Migration initialization failed\n"); return; } =20 @@ -3998,13 +3998,16 @@ static void rdma_accept_incoming_migration(void *op= aque) =20 f =3D qemu_fopen_rdma(rdma, "rb"); if (f =3D=3D NULL) { - ERROR(errp, "could not qemu_fopen_rdma!"); + fprintf(stderr, "RDMA ERROR: could not qemu_fopen_rdma\n"); qemu_rdma_cleanup(rdma); return; } =20 rdma->migration_started_on_destination =3D 1; - migration_fd_process_incoming(f, errp); + migration_fd_process_incoming(f, &local_err); + if (local_err) { + error_reportf_err(local_err, "RDMA ERROR:"); + } } =20 void rdma_start_incoming_migration(const char *host_port, Error **errp) --=20 2.24.1