Commit eba44e93 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging 



# gpg: Signature made Mon 06 Mar 2017 04:15:17 GMT
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  net/filter-mirror: Follow CODING_STYLE
  COLO-compare: Fix icmp and udp compare different packet always dump bug
  COLO-compare: Optimize compare_common and compare_tcp
  COLO-compare: Rename compare function and remove duplicate codes
  filter-rewriter: skip net_checksum_calculate() while offset = 0
  net/colo: fix memory double free error
  vmxnet3: VMStatify rx/tx q_descr and int_state
  vmxnet3: Convert ring values to uint32_t's
  net/colo-compare: Fix memory free error
  colo-compare: Fix removing fds been watched incorrectly in finalization
  char: remove the right fd been watched in qemu_chr_fe_set_handlers()
  colo-compare: kick compare thread to exit after some cleanup in finalization
  colo-compare: use g_timeout_source_new() to process the stale packets
  NetRxPkt: Remove code duplication in net_rx_pkt_pull_data()
  NetRxPkt: Account buffer with ETH header in IOV length
  NetRxPkt: Do not try to pull more data than present
  NetRxPkt: Fix memory corruption on VLAN header stripping
  eth: Extend vlan stripping functions
  net: Remove useless local var pkt

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 56b51708 f0aabd5c

chardev/char-fd.c

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static gboolean fd_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque) 
    ret = qio_channel_read(

        chan, (gchar *)buf, len, NULL);

    if (ret == 0) {

        remove_fd_in_watch(chr);

        remove_fd_in_watch(chr, NULL);

        qemu_chr_be_event(chr, CHR_EVENT_CLOSED);

        return FALSE;

    }
@@ -89,7 +89,7 @@ static void fd_chr_update_read_handler(Chardev *chr, 
{

    FDChardev *s = FD_CHARDEV(chr);



    remove_fd_in_watch(chr);

    remove_fd_in_watch(chr, NULL);

    if (s->ioc_in) {

        chr->fd_in_tag = io_add_watch_poll(chr, s->ioc_in,

                                           fd_chr_read_poll,
@@ -103,7 +103,7 @@ static void char_fd_finalize(Object *obj) 
    Chardev *chr = CHARDEV(obj);

    FDChardev *s = FD_CHARDEV(obj);



    remove_fd_in_watch(chr);

    remove_fd_in_watch(chr, NULL);

    if (s->ioc_in) {

        object_unref(OBJECT(s->ioc_in));

    }

chardev/char-io.c

+4 −4
Original line number Diff line number Diff line
@@ -127,14 +127,14 @@ guint io_add_watch_poll(Chardev *chr, 
    return tag;

}



static void io_remove_watch_poll(guint tag)

static void io_remove_watch_poll(guint tag, GMainContext *context)

{

    GSource *source;

    IOWatchPoll *iwp;



    g_return_if_fail(tag > 0);



    source = g_main_context_find_source_by_id(NULL, tag);

    source = g_main_context_find_source_by_id(context, tag);

    g_return_if_fail(source != NULL);



    iwp = io_watch_poll_from_source(source);
@@ -146,10 +146,10 @@ static void io_remove_watch_poll(guint tag) 
    g_source_destroy(&iwp->parent);

}



void remove_fd_in_watch(Chardev *chr)

void remove_fd_in_watch(Chardev *chr, GMainContext *context)

{

    if (chr->fd_in_tag) {

        io_remove_watch_poll(chr->fd_in_tag);

        io_remove_watch_poll(chr->fd_in_tag, context);

        chr->fd_in_tag = 0;

    }

}

chardev/char-io.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ guint io_add_watch_poll(Chardev *chr, 
                        gpointer user_data,

                        GMainContext *context);



void remove_fd_in_watch(Chardev *chr);

void remove_fd_in_watch(Chardev *chr, GMainContext *context);



int io_channel_send(QIOChannel *ioc, const void *buf, size_t len);

chardev/char-pty.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static void pty_chr_state(Chardev *chr, int connected) 
            g_source_remove(s->open_tag);

            s->open_tag = 0;

        }

        remove_fd_in_watch(chr);

        remove_fd_in_watch(chr, NULL);

        s->connected = 0;

        /* (re-)connect poll interval for idle guests: once per second.

         * We check more frequently in case the guests sends data to

chardev/char-socket.c

+2 −2
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static void tcp_chr_free_connection(Chardev *chr) 
    }



    tcp_set_msgfds(chr, NULL, 0);

    remove_fd_in_watch(chr);

    remove_fd_in_watch(chr, NULL);

    object_unref(OBJECT(s->sioc));

    s->sioc = NULL;

    object_unref(OBJECT(s->ioc));
@@ -498,7 +498,7 @@ static void tcp_chr_update_read_handler(Chardev *chr, 
        return;

    }



    remove_fd_in_watch(chr);

    remove_fd_in_watch(chr, NULL);

    if (s->ioc) {

        chr->fd_in_tag = io_add_watch_poll(chr, s->ioc,

                                           tcp_chr_read_poll,