Commit 2b294f6b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* pc-bios/optionrom/Makefile fix for -O0
* revert socket_connect change

# gpg: Signature made Tue 30 Aug 2016 15:36:59 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  optionrom: cope with multiple -O options
  Revert "Change net/socket.c to use socket_*() functions"

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 135a972b 336d5881

net/socket.c

+28 −27
Original line number Diff line number Diff line
@@ -489,30 +489,41 @@ static int net_socket_listen_init(NetClientState *peer, 
{

    NetClientState *nc;

    NetSocketState *s;

    SocketAddress *saddr;

    int ret;

    Error *local_error = NULL;

    struct sockaddr_in saddr;

    int fd, ret;



    saddr = socket_parse(host_str, &local_error);

    if (saddr == NULL) {

        error_report_err(local_error);

    if (parse_host_port(&saddr, host_str) < 0)

        return -1;



    fd = qemu_socket(PF_INET, SOCK_STREAM, 0);

    if (fd < 0) {

        perror("socket");

        return -1;

    }

    qemu_set_nonblock(fd);



    ret = socket_listen(saddr, &local_error);

    socket_set_fast_reuse(fd);



    ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));

    if (ret < 0) {

        error_report_err(local_error);

        perror("bind");

        closesocket(fd);

        return -1;

    }

    ret = listen(fd, 0);

    if (ret < 0) {

        perror("listen");

        closesocket(fd);

        return -1;

    }



    nc = qemu_new_net_client(&net_socket_info, peer, model, name);

    s = DO_UPCAST(NetSocketState, nc, nc);

    s->fd = -1;

    s->listen_fd = ret;

    s->listen_fd = fd;

    s->nc.link_down = true;



    qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);

    qapi_free_SocketAddress(saddr);

    return 0;

}
@@ -523,15 +534,10 @@ static int net_socket_connect_init(NetClientState *peer, 
{

    NetSocketState *s;

    int fd, connected, ret;

    char *addr_str;

    SocketAddress *saddr;

    Error *local_error = NULL;

    struct sockaddr_in saddr;



    saddr = socket_parse(host_str, &local_error);

    if (saddr == NULL) {

        error_report_err(local_error);

    if (parse_host_port(&saddr, host_str) < 0)

        return -1;

    }



    fd = qemu_socket(PF_INET, SOCK_STREAM, 0);

    if (fd < 0) {
@@ -539,9 +545,10 @@ static int net_socket_connect_init(NetClientState *peer, 
        return -1;

    }

    qemu_set_nonblock(fd);



    connected = 0;

    for(;;) {

        ret = socket_connect(saddr, &local_error, NULL, NULL);

        ret = connect(fd, (struct sockaddr *)&saddr, sizeof(saddr));

        if (ret < 0) {

            if (errno == EINTR || errno == EWOULDBLOCK) {

                /* continue */
@@ -550,7 +557,7 @@ static int net_socket_connect_init(NetClientState *peer, 
                       errno == EINVAL) {

                break;

            } else {

                error_report_err(local_error);

                perror("connect");

                closesocket(fd);

                return -1;

            }
@@ -562,15 +569,9 @@ static int net_socket_connect_init(NetClientState *peer, 
    s = net_socket_fd_init(peer, model, name, fd, connected);

    if (!s)

        return -1;



    addr_str = socket_address_to_string(saddr, &local_error);

    if (addr_str == NULL)

        return -1;



    snprintf(s->nc.info_str, sizeof(s->nc.info_str),

             "socket: connect to %s", addr_str);

    qapi_free_SocketAddress(saddr);

    g_free(addr_str);

             "socket: connect to %s:%d",

             inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));

    return 0;

}

pc-bios/optionrom/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -10,10 +10,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom) 
.PHONY : all clean build-all



# Compiling with no optimization creates ROMs that are too large

ifeq ($(filter -O%, $(CFLAGS)),)

override CFLAGS += -O2

endif

ifeq ($(filter -O%, $(CFLAGS)),-O0)

ifeq ($(lastword $(filter -O%, -O0 $(CFLAGS))),-O0)

override CFLAGS += -O2

endif