From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58373)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1ZoviW-0007vV-Be
	for qemu-devel@nongnu.org; Wed, 21 Oct 2015 11:54:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1ZoviS-0000Rc-E9
	for qemu-devel@nongnu.org; Wed, 21 Oct 2015 11:54:20 -0400
Received: from mx1.redhat.com ([209.132.183.28]:52610)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1ZoviS-0000RM-9c
	for qemu-devel@nongnu.org; Wed, 21 Oct 2015 11:54:16 -0400
Received: from int-mx13.intmail.prod.int.phx2.redhat.com
	(int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
	by mx1.redhat.com (Postfix) with ESMTPS id 6175685544
	for <qemu-devel@nongnu.org>; Wed, 21 Oct 2015 15:54:15 +0000 (UTC)
References: <1445442218-32183-1-git-send-email-berrange@redhat.com>
	<1445442218-32183-3-git-send-email-berrange@redhat.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <5627B523.9090409@redhat.com>
Date: Wed, 21 Oct 2015 17:54:11 +0200
MIME-Version: 1.0
In-Reply-To: <1445442218-32183-3-git-send-email-berrange@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v1 2/5] sockets: remove use of QemuOpts
	from socket_listen
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Daniel P. Berrange" <berrange@redhat.com>, qemu-devel@nongnu.org



On 21/10/2015 17:43, Daniel P. Berrange wrote:
> +    }
> +    if (addr->has_ipv6 && addr->ipv6) {
> +        g_printerr("One\n");
> +        return PF_INET6;
> +    }
> +    if (addr->has_ipv4 && addr->ipv4) {
> +        g_printerr("Two\n");
> +        return PF_INET;
> +    }
> +    if (addr->has_ipv6 && !addr->ipv6) {
> +        g_printerr("Three\n");
> +        return PF_INET;
> +    }
> +    if (addr->has_ipv4 && !addr->ipv4) {
> +        g_printerr("Four\n");
> +        return PF_INET6;
> +    }
> +    g_printerr("Five %d %d %d %d\n",
> +               addr->has_ipv4, addr->ipv4,
> +               addr->has_ipv6, addr->ipv6);
> +    return PF_UNSPEC;
> +}
> +

Apart from the extra debugging output, I think you can merge as

    if ((addr->has_ipv6 && addr->ipv6) || (addr->has_ipv4 && !addr->ipv4)=
) {
        return PF_INET6;
    }
    if ((addr->has_ipv4 && addr->ipv4) || (addr->has_ipv6 && !addr->ipv6)=
) {
        return PF_INET;
    }
    return PF_UNSPEC;

where the order of the first two is important.

Paolo