From patchwork Mon Sep 12 19:03:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 9327629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 381ED6048B for ; Mon, 12 Sep 2016 19:04:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 209E428E8F for ; Mon, 12 Sep 2016 19:04:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 136F028E91; Mon, 12 Sep 2016 19:04:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_HK_NAME_DR autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9528928E8F for ; Mon, 12 Sep 2016 19:04:31 +0000 (UTC) Received: from localhost ([::1]:44685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjWWs-0004IT-0T for patchwork-qemu-devel@patchwork.kernel.org; Mon, 12 Sep 2016 15:04:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjWWP-0004I1-ME for qemu-devel@nongnu.org; Mon, 12 Sep 2016 15:04:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjWWM-0002Pf-9i for qemu-devel@nongnu.org; Mon, 12 Sep 2016 15:04:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34380) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjWWM-0002PU-3n for qemu-devel@nongnu.org; Mon, 12 Sep 2016 15:03:58 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E384DC0BFD26 for ; Mon, 12 Sep 2016 19:03:56 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-116-72.ams2.redhat.com [10.36.116.72]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8CJ3tWO008333; Mon, 12 Sep 2016 15:03:55 -0400 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, berrange@redhat.com, quintela@redhat.com, amit.shah@redhat.com Date: Mon, 12 Sep 2016 20:03:54 +0100 Message-Id: <1473707034-31147-1-git-send-email-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 12 Sep 2016 19:03:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] migration: Fix seg with missing port X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Dr. David Alan Gilbert" The command : migrate tcp:localhost: currently segs; fix it so it now says: error parsing address 'localhost:' and the same for -incoming. (We know that errp is non-null; callers use a local_err). Signed-off-by: Dr. David Alan Gilbert --- migration/socket.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/migration/socket.c b/migration/socket.c index 00de1fe..6e82924 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -113,7 +113,9 @@ void tcp_start_outgoing_migration(MigrationState *s, Error **errp) { SocketAddress *saddr = tcp_build_address(host_port, errp); - socket_start_outgoing_migration(s, saddr, errp); + if (!*errp) { + socket_start_outgoing_migration(s, saddr, errp); + } } void unix_start_outgoing_migration(MigrationState *s, @@ -175,7 +177,9 @@ static void socket_start_incoming_migration(SocketAddress *saddr, void tcp_start_incoming_migration(const char *host_port, Error **errp) { SocketAddress *saddr = tcp_build_address(host_port, errp); - socket_start_incoming_migration(saddr, errp); + if (!*errp) { + socket_start_incoming_migration(saddr, errp); + } } void unix_start_incoming_migration(const char *path, Error **errp)