On 03/05/2012 12:03 PM, Amos Kong wrote:
> Use tcp_server_start in those two functions:
> tcp_start_incoming_migration()
> net_socket_listen_init()
>
> Signed-off-by: Amos Kong <akong@xxxxxxxxxx>
> ---
> migration-tcp.c | 21 +++++----------------
> net/socket.c | 23 +++--------------------
> 2 files changed, 8 insertions(+), 36 deletions(-)
>
> diff --git a/migration-tcp.c b/migration-tcp.c
> index 35a5781..ecadd10 100644
> --- a/migration-tcp.c
> +++ b/migration-tcp.c
> @@ -157,28 +157,17 @@ out2:
>
> int tcp_start_incoming_migration(const char *host_port)
> {
> - struct sockaddr_in addr;
> - int val;
> + int ret;
> int s;
>
> DPRINTF("Attempting to start an incoming migration\n");
>
> - if (parse_host_port(&addr, host_port) < 0) {
> - fprintf(stderr, "invalid host/port combination: %s\n", host_port);
> - return -EINVAL;
> - }
> -
> - s = qemu_socket(PF_INET, SOCK_STREAM, 0);
> - if (s == -1) {
> - return -socket_error();
> + ret = tcp_server_start(host_port, &s);
> + if (ret < 0) {
> + fprintf(stderr, "tcp_server_start: %s\n", strerror(-ret));
> + return ret;
> }
>
> - val = 1;
> - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val));
> -
> - if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
> - goto err;
> - }
> if (listen(s, 1) == -1) {
> goto err;
> }
> diff --git a/net/socket.c b/net/socket.c
> index 0bcf229..5feb3d2 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -403,31 +403,14 @@ static int net_socket_listen_init(VLANState *vlan,
> const char *host_str)
> {
> NetSocketListenState *s;
> - int fd, val, ret;
> - struct sockaddr_in saddr;
> -
> - if (parse_host_port(&saddr, host_str) < 0)
> - return -1;
> + int fd, ret;
>
> s = g_malloc0(sizeof(NetSocketListenState));
>
> - fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
> - if (fd < 0) {
> - perror("socket");
> - g_free(s);
> - return -1;
> - }
> - socket_set_nonblock(fd);
> -
> - /* allow fast reuse */
> - val = 1;
> - setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val));
> -
> - ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));
> + ret = tcp_server_start(host_str, &fd);
> if (ret < 0) {
> - perror("bind");
> + error_report("tcp_server_start: %s", strerror(-ret));
If the return value is always -1 this has no meaning
Orit
> g_free(s);
> - closesocket(fd);
> return -1;
> }
> ret = listen(fd, 0);
>
>
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
