[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 2/5] sockets: remove use of QemuOpts from soc
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v1 2/5] sockets: remove use of QemuOpts from socket_listen |
Date: |
Wed, 21 Oct 2015 17:54:11 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 |
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
- [Qemu-devel] [PATCH v1 0/5] Convert qemu-socket to use QAPI exclusively, Daniel P. Berrange, 2015/10/21
- [Qemu-devel] [PATCH v1 4/5] sockets: remove use of QemuOpts from socket_dgram, Daniel P. Berrange, 2015/10/21
- [Qemu-devel] [PATCH v1 2/5] sockets: remove use of QemuOpts from socket_listen, Daniel P. Berrange, 2015/10/21
- Re: [Qemu-devel] [PATCH v1 2/5] sockets: remove use of QemuOpts from socket_listen,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v1 3/5] sockets: remove use of QemuOpts from socket_connect, Daniel P. Berrange, 2015/10/21
- [Qemu-devel] [PATCH v1 1/5] sockets: remove use of QemuOpts from header file, Daniel P. Berrange, 2015/10/21
- [Qemu-devel] [PATCH v1 5/5] vnc: distiguish between ipv4/ipv6 omitted vs set to off, Daniel P. Berrange, 2015/10/21