The following changes since commit cda4a338c4243fa3bff4498b935340ac7121cc76:

tcg/tci: Add TCG_TARGET_DEFAULT_MO (2017-09-07 18:57:34 +0100)

for you to fetch changes up to 861d51e62bb197b43606f888dbefbabebaf0d854:

colo-compare: Update the COLO document to add the IOThread configuration (2017-09-08 09:34:40 +0800)

Kamil Rytarowski (1):

e1000: Rename the SEC symbol to SEQEC

Mao Zhongyi (8):

net/rocker: Remove the dead error handling

net/rocker: Plug memory leak in pci_rocker_init()

net/rocker: Convert to realize()

net/rocker: Fix the unusual macro name

net/socket: Don't treat odd socket type as SOCK_STREAM

net/socket: Convert several helper functions to Error

net/net: Convert parse_host_port() to Error

net/socket: Improve -net socket error reporting

Matt Parker (1):

net: rtl8139: do not use old_mmio accesses

Wang Yong (3):

qemu-iothread: IOThread supports the GMainContext event loop

colo-compare: Use IOThread to Check old packet regularly and Process pactkets of the primary

colo-compare: Update the COLO document to add the IOThread configuration

Zhang Chen (5):

net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net

MAINTAINERS: Update mail address for COLO Proxy

net/colo-compare.c: Optimize unpredictable tcp options comparison

net/colo-compare.c: Adjust net queue pop order for performance

net/colo-compare.c: Fix comments and scheme

MAINTAINERS | 2 +-

docs/colo-proxy.txt | 3 +-

hw/net/e1000.c | 4 +-

hw/net/e1000_regs.h | 2 +-

hw/net/e1000e_core.c | 2 +-

hw/net/e1000x_common.h | 2 +-

hw/net/rocker/rocker.c | 94 ++++++----------------

hw/net/rocker/rocker_desc.c | 10 ---

hw/net/rocker/rocker_fp.c | 4 -

hw/net/rocker/rocker_of_dpa.c | 20 -----

hw/net/rocker/rocker_world.c | 12 ++-

hw/net/rtl8139.c | 53 +-----------

include/qemu/sockets.h | 3 +-

include/sysemu/iothread.h | 4 +

iothread.c | 45 +++++++++++

net/colo-compare.c | 183 ++++++++++++++++++++++++------------------

net/filter-rewriter.c | 6 +-

net/net.c | 22 +++--

net/socket.c | 156 +++++++++++++++++++----------------

19 files changed, 304 insertions(+), 323 deletions(-)

From: Wang Yong <wang.yong155@zte.com.cn>

Update colo-proxy.txt,add IOThread configuration.

Later we have to configure IOThread,if not COLO can not work.

Reviewed-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Signed-off-by: Wang Yong <wang.yong155@zte.com.cn>

Signed-off-by: Wang Guang <wang.guang55@zte.com.cn>

docs/colo-proxy.txt | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt

--- a/docs/colo-proxy.txt

+++ b/docs/colo-proxy.txt

@@ -XXX,XX +XXX,XX @@ Primary(ip:3.3.3.3):

-chardev socket,id=compare0-0,host=3.3.3.3,port=9001

-chardev socket,id=compare_out,host=3.3.3.3,port=9005,server,nowait

-chardev socket,id=compare_out0,host=3.3.3.3,port=9005

+-object iothread,id=iothread1

-object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0

-object filter-redirector,netdev=hn0,id=redire0,queue=rx,indev=compare_out

-object filter-redirector,netdev=hn0,id=redire1,queue=rx,outdev=compare0

--object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0

+-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1

Secondary(ip:3.3.3.8):

-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

The rocker device still implements the old PCIDeviceClass .init()

instead of the new .realize(). All devices need to be converted to

.realize().

.init() reports errors with fprintf() and return 0 on success, negative

number on failure. Meanwhile, when -device rocker fails, it first report

a specific error, then a generic one, like this:

$ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=qemu-rocker

rocker: name too long; please shorten to at most 9 chars

qemu-system-x86_64: -device rocker,name=qemu-rocker: Device initialization failed

Now, convert it to .realize() that passes errors to its callers via its

errp argument. Also avoid the superfluous second error message. After

the patch, effect like this:

$ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=qemu-rocker

qemu-system-x86_64: -device rocker,name=qemu-rocker: name too long; please shorten to at most 9 chars

Cc: jasowang@redhat.com

Cc: jiri@resnulli.us

Cc: armbru@redhat.com

Cc: f4bug@amsat.org

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

hw/net/rocker/rocker.c | 27 +++++++++++----------------

1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c

--- a/hw/net/rocker/rocker.c

+++ b/hw/net/rocker/rocker.c

@@ -XXX,XX +XXX,XX @@ rollback:

return err;

-static int rocker_msix_init(Rocker *r)

+static int rocker_msix_init(Rocker *r, Error **errp)

PCIDevice *dev = PCI_DEVICE(r);

int err;

- Error *local_err = NULL;

err = msix_init(dev, ROCKER_MSIX_VEC_COUNT(r->fp_ports),

&r->msix_bar,

ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_TABLE_OFFSET,

&r->msix_bar,

ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_PBA_OFFSET,

- 0, &local_err);

+ 0, errp);

if (err) {

- error_report_err(local_err);

return err;

@@ -XXX,XX +XXX,XX @@ static World *rocker_world_type_by_name(Rocker *r, const char *name)

return NULL;

-static int pci_rocker_init(PCIDevice *dev)

+static void pci_rocker_realize(PCIDevice *dev, Error **errp)

Rocker *r = to_rocker(dev);

const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

r->world_dflt = rocker_world_type_by_name(r, r->world_name);

if (!r->world_dflt) {

- fprintf(stderr,

- "rocker: requested world \"%s\" does not exist\n",

+ error_setg(errp,

+ "invalid argument requested world %s does not exist",

r->world_name);

- err = -EINVAL;

goto err_world_type_by_name;

From: Wang Yong <wang.yong155@zte.com.cn>

Remove the task which check old packet in the comparing thread,

then use IOthread context timer to handle it.

Process pactkets in the IOThread which arrived over the socket.

we use iothread_get_g_main_context to create a new g_main_loop in

the IOThread.then the packets from the primary and the secondary

are processed in the IOThread.

Finally remove the colo-compare thread using the IOThread instead.

Reviewed-by: Zhang Chen<zhangchen.fnst@cn.fujitsu.com>

Signed-off-by: Wang Yong <wang.yong155@zte.com.cn>

Signed-off-by: Wang Guang <wang.guang55@zte.com.cn>

net/colo-compare.c | 83 +++++++++++++++++++++++++++++-------------------------

1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c

--- a/net/colo-compare.c

+++ b/net/colo-compare.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/sockets.h"

#include "qapi-visit.h"

#include "net/colo.h"

+#include "sysemu/iothread.h"

#define TYPE_COLO_COMPARE "colo-compare"

#define COLO_COMPARE(obj) \

@@ -XXX,XX +XXX,XX @@ typedef struct CompareState {

GQueue conn_list;

/* Record the connection without repetition */

GHashTable *connection_track_table;

- /* This thread just do packet compare job */

- QemuThread thread;

+ IOThread *iothread;

GMainContext *worker_context;

- GMainLoop *compare_loop;

+ QEMUTimer *packet_check_timer;

} CompareState;

typedef struct CompareClass {

@@ -XXX,XX +XXX,XX @@ static void compare_sec_chr_in(void *opaque, const uint8_t *buf, int size)

* Check old packet regularly so it can watch for any packets

* that the secondary hasn't produced equivalents of.

*/

-static gboolean check_old_packet_regular(void *opaque)

+static void check_old_packet_regular(void *opaque)

{

CompareState *s = opaque;

/* if have old packet we will notify checkpoint */

colo_old_packet_check(s);

+ timer_mod(s->packet_check_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +

+ REGULAR_PACKET_CHECK_MS);

+}

+

+static void colo_compare_timer_init(CompareState *s)

+{

+ AioContext *ctx = iothread_get_aio_context(s->iothread);

- return TRUE;

+ s->packet_check_timer = aio_timer_new(ctx, QEMU_CLOCK_VIRTUAL,

+ SCALE_MS, check_old_packet_regular,

+ s);

+ timer_mod(s->packet_check_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +

+ REGULAR_PACKET_CHECK_MS);

}

-static void *colo_compare_thread(void *opaque)

+static void colo_compare_timer_del(CompareState *s)

{

- CompareState *s = opaque;

- GSource *timeout_source;

+ if (s->packet_check_timer) {

+ timer_del(s->packet_check_timer);

+ timer_free(s->packet_check_timer);

+ s->packet_check_timer = NULL;

+ }

+ }

- s->worker_context = g_main_context_new();

+static void colo_compare_iothread(CompareState *s)

+{

+ object_ref(OBJECT(s->iothread));

+ s->worker_context = iothread_get_g_main_context(s->iothread);

qemu_chr_fe_set_handlers(&s->chr_pri_in, compare_chr_can_read,

compare_pri_chr_in, NULL, NULL,

@@ -XXX,XX +XXX,XX @@ static void *colo_compare_thread(void *opaque)

compare_sec_chr_in, NULL, NULL,

s, s->worker_context, true);

- s->compare_loop = g_main_loop_new(s->worker_context, FALSE);

-

- /* To kick any packets that the secondary doesn't match */

- timeout_source = g_timeout_source_new(REGULAR_PACKET_CHECK_MS);

- g_source_set_callback(timeout_source,

- (GSourceFunc)check_old_packet_regular, s, NULL);

- g_source_attach(timeout_source, s->worker_context);

-

- g_main_loop_run(s->compare_loop);

-

- g_source_unref(timeout_source);

- g_main_loop_unref(s->compare_loop);

- g_main_context_unref(s->worker_context);

- return NULL;

+ colo_compare_timer_init(s);

}

static char *compare_get_pri_indev(Object *obj, Error **errp)

@@ -XXX,XX +XXX,XX @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)

{

CompareState *s = COLO_COMPARE(uc);

Chardev *chr;

- char thread_name[64];

- static int compare_id;

- if (!s->pri_indev || !s->sec_indev || !s->outdev) {

+ if (!s->pri_indev || !s->sec_indev || !s->outdev || !s->iothread) {

error_setg(errp, "colo compare needs 'primary_in' ,"

- "'secondary_in','outdev' property set");

+ "'secondary_in','outdev','iothread' property set");

return;

} else if (!strcmp(s->pri_indev, s->outdev) ||

!strcmp(s->sec_indev, s->outdev) ||

@@ -XXX,XX +XXX,XX @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)

g_free,

connection_destroy);

- sprintf(thread_name, "colo-compare %d", compare_id);

- qemu_thread_create(&s->thread, thread_name,

- colo_compare_thread, s,

- QEMU_THREAD_JOINABLE);

- compare_id++;

-

+ colo_compare_iothread(s);

return;

}

@@ -XXX,XX +XXX,XX @@ static void colo_compare_init(Object *obj)

object_property_add_str(obj, "outdev",

compare_get_outdev, compare_set_outdev,

NULL);

+ object_property_add_link(obj, "iothread", TYPE_IOTHREAD,

+ (Object **)&s->iothread,

+ object_property_allow_set_link,

+ OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL);

s->vnet_hdr = false;

object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr,

@@ -XXX,XX +XXX,XX @@ static void colo_compare_finalize(Object *obj)

qemu_chr_fe_deinit(&s->chr_pri_in, false);

qemu_chr_fe_deinit(&s->chr_sec_in, false);

qemu_chr_fe_deinit(&s->chr_out, false);

-

- g_main_loop_quit(s->compare_loop);

- qemu_thread_join(&s->thread);

-

+ if (s->iothread) {

+ colo_compare_timer_del(s);

+ }

/* Release all unhandled packets after compare thead exited */

g_queue_foreach(&s->conn_list, colo_flush_packets, s);

g_queue_clear(&s->conn_list);

- g_hash_table_destroy(s->connection_track_table);

+ if (s->connection_track_table) {

+ g_hash_table_destroy(s->connection_track_table);

+ if (s->iothread) {

+ object_unref(OBJECT(s->iothread));

+ }

g_free(s->pri_indev);

g_free(s->sec_indev);

g_free(s->outdev);

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Memory allocation functions like world_alloc, desc_ring_alloc etc,

they are all wrappers around g_malloc, g_new etc. But g_malloc and

similar functions doesn't return null. Because they ignore the fact

that g_malloc() of 0 bytes returns null. So error checks for these

allocation failure are superfluous. Now, remove them entirely.

Cc: jasowang@redhat.com

Cc: jiri@resnulli.us

Cc: armbru@redhat.com

Cc: f4bug@amsat.org

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

hw/net/rocker/rocker.c | 47 +------------------------------------------

hw/net/rocker/rocker_desc.c | 10 ---------

hw/net/rocker/rocker_fp.c | 4 ----

hw/net/rocker/rocker_of_dpa.c | 20 ------------------

hw/net/rocker/rocker_world.c | 12 +++++------

5 files changed, 6 insertions(+), 87 deletions(-)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c

--- a/hw/net/rocker/rocker.c

+++ b/hw/net/rocker/rocker.c

@@ -XXX,XX +XXX,XX @@ static int tx_consume(Rocker *r, DescInfo *info)

}

iov[iovcnt].iov_len = frag_len;

iov[iovcnt].iov_base = g_malloc(frag_len);

- if (!iov[iovcnt].iov_base) {

- err = -ROCKER_ENOMEM;

- goto err_no_mem;

- }

pci_dma_read(dev, frag_addr, iov[iovcnt].iov_base,

iov[iovcnt].iov_len);

@@ -XXX,XX +XXX,XX @@ static int tx_consume(Rocker *r, DescInfo *info)

err = fp_port_eg(r->fp_port[port], iov, iovcnt);

err_too_many_frags:

-err_no_mem:

err_bad_attr:

for (i = 0; i < ROCKER_TX_FRAGS_MAX; i++) {

g_free(iov[i].iov_base);

@@ -XXX,XX +XXX,XX @@ int rx_produce(World *world, uint32_t pport,

*/

data = g_malloc(data_size);

- if (!data) {

- err = -ROCKER_ENOMEM;

- goto out;

- }

+

iov_to_buf(iov, iovcnt, 0, data, data_size);

pci_dma_write(dev, frag_addr, data, data_size);

g_free(data);

@@ -XXX,XX +XXX,XX @@ static void rocker_test_dma_ctrl(Rocker *r, uint32_t val)

buf = g_malloc(r->test_dma_size);

- if (!buf) {

- DPRINTF("test dma buffer alloc failed");

- return;

- }

-

switch (val) {

case ROCKER_TEST_DMA_CTRL_CLEAR:

memset(buf, 0, r->test_dma_size);

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

r->worlds[ROCKER_WORLD_TYPE_OF_DPA] = of_dpa_world_alloc(r);

- for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {

- if (!r->worlds[i]) {

- err = -ENOMEM;

- goto err_world_alloc;

- }

- }

-

if (!r->world_name) {

r->world_name = g_strdup(world_name(r->worlds[ROCKER_WORLD_TYPE_OF_DPA]));

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

r->rings = g_new(DescRing *, rocker_pci_ring_count(r));

- if (!r->rings) {

- goto err_rings_alloc;

- }

/* Rings are ordered like this:

* - command ring

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

* .....

*/

- err = -ENOMEM;

for (i = 0; i < rocker_pci_ring_count(r); i++) {

DescRing *ring = desc_ring_alloc(r, i);

- if (!ring) {

- goto err_ring_alloc;

- }

-

if (i == ROCKER_RING_CMD) {

desc_ring_set_consume(ring, cmd_consume, ROCKER_MSIX_VEC_CMD);

} else if (i == ROCKER_RING_EVENT) {

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

fp_port_alloc(r, r->name, &r->fp_start_macaddr,

i, &r->fp_ports_peers[i]);

- if (!port) {

- goto err_port_alloc;

- }

-

r->fp_port[i] = port;

fp_port_set_world(port, r->world_dflt);

}

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

return 0;

-err_port_alloc:

- for (--i; i >= 0; i--) {

- FpPort *port = r->fp_port[i];

- fp_port_free(port);

- }

- i = rocker_pci_ring_count(r);

-err_ring_alloc:

- for (--i; i >= 0; i--) {

- desc_ring_free(r->rings[i]);

- }

- g_free(r->rings);

-err_rings_alloc:

err_duplicate:

rocker_msix_uninit(r);

err_msix_init:

object_unparent(OBJECT(&r->msix_bar));

object_unparent(OBJECT(&r->mmio));

err_world_type_by_name:

-err_world_alloc:

for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {

if (r->worlds[i]) {

world_free(r->worlds[i]);

diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rocker/rocker_desc.c

+++ b/hw/net/rocker/rocker_desc.c

@@ -XXX,XX +XXX,XX @@ char *desc_get_buf(DescInfo *info, bool read_only)

info->buf_size = size;

}

- if (!info->buf) {

- return NULL;

- }

-

pci_dma_read(dev, le64_to_cpu(info->desc.buf_addr), info->buf, size);

return info->buf;

@@ -XXX,XX +XXX,XX @@ bool desc_ring_set_size(DescRing *ring, uint32_t size)

ring->head = ring->tail = 0;

ring->info = g_renew(DescInfo, ring->info, size);

- if (!ring->info) {

memset(ring->info, 0, size * sizeof(DescInfo));

@@ -XXX,XX +XXX,XX @@ DescRing *desc_ring_alloc(Rocker *r, int index)

DescRing *ring;

ring = g_new0(DescRing, 1);

- if (!ring) {

- return NULL;

- }

ring->r = r;

ring->index = index;

diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rocker/rocker_fp.c

+++ b/hw/net/rocker/rocker_fp.c

@@ -XXX,XX +XXX,XX @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name,

FpPort *port = g_new0(FpPort, 1);

- if (!port) {

- return NULL;

- }

-

port->r = r;

port->index = index;

port->pport = index + 1;

diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rocker/rocker_of_dpa.c

+++ b/hw/net/rocker/rocker_of_dpa.c

@@ -XXX,XX +XXX,XX @@ static OfDpaFlow *of_dpa_flow_alloc(uint64_t cookie)

int64_t now = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) / 1000;

flow = g_new0(OfDpaFlow, 1);

- if (!flow) {

- return NULL;

- }

flow->cookie = cookie;

flow->mask.tbl_id = 0xffffffff;

@@ -XXX,XX +XXX,XX @@ static OfDpaGroup *of_dpa_group_alloc(uint32_t id)

{

OfDpaGroup *group = g_new0(OfDpaGroup, 1);

- if (!group) {

- return NULL;

- }

-

group->id = id;

return group;

@@ -XXX,XX +XXX,XX @@ static int of_dpa_cmd_flow_add(OfDpa *of_dpa, uint64_t cookie,

flow = of_dpa_flow_alloc(cookie);

- if (!flow) {

- return -ROCKER_ENOMEM;

- }

err = of_dpa_cmd_flow_add_mod(of_dpa, flow, flow_tlvs);

if (err) {

@@ -XXX,XX +XXX,XX @@ static int of_dpa_cmd_add_l2_flood(OfDpa *of_dpa, OfDpaGroup *group,

rocker_tlv_get_le16(group_tlvs[ROCKER_TLV_OF_DPA_GROUP_COUNT]);

tlvs = g_new0(RockerTlv *, group->l2_flood.group_count + 1);

- if (!tlvs) {

- return -ROCKER_ENOMEM;

- }

g_free(group->l2_flood.group_ids);

group->l2_flood.group_ids =

g_new0(uint32_t, group->l2_flood.group_count);

- if (!group->l2_flood.group_ids) {

- err = -ROCKER_ENOMEM;

- goto err_out;

- }

rocker_tlv_parse_nested(tlvs, group->l2_flood.group_count,

group_tlvs[ROCKER_TLV_OF_DPA_GROUP_IDS]);

@@ -XXX,XX +XXX,XX @@ static int of_dpa_cmd_group_add(OfDpa *of_dpa, uint32_t group_id,

group = of_dpa_group_alloc(group_id);

- if (!group) {

- return -ROCKER_ENOMEM;

- }

err = of_dpa_cmd_group_do(of_dpa, group_id, group, group_tlvs);

if (err) {

diff --git a/hw/net/rocker/rocker_world.c b/hw/net/rocker/rocker_world.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rocker/rocker_world.c

+++ b/hw/net/rocker/rocker_world.c

@@ -XXX,XX +XXX,XX @@ World *world_alloc(Rocker *r, size_t sizeof_private,

{

World *w = g_malloc0(sizeof(World) + sizeof_private);

- if (w) {

- w->r = r;

- w->type = type;

- w->ops = ops;

- if (w->ops->init) {

- w->ops->init(w);

+ w->r = r;

+ w->type = type;

+ w->ops = ops;

+ if (w->ops->init) {

+ w->ops->init(w);

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

The packet_enqueue() use g_queue_push_tail() to

enqueue net packet, so it is more efficent way use

g_queue_pop_head() to get packet for compare.

That will improve the success rate of comparison.

In my test the performance of ftp put 1000M file

will increase 10%

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

net/colo-compare.c | 4 ++--

diff --git a/net/colo-compare.c b/net/colo-compare.c

--- a/net/colo-compare.c

+++ b/net/colo-compare.c

@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)

while (!g_queue_is_empty(&conn->primary_list) &&

!g_queue_is_empty(&conn->secondary_list)) {

- pkt = g_queue_pop_tail(&conn->primary_list);

+ pkt = g_queue_pop_head(&conn->primary_list);

switch (conn->ip_proto) {

case IPPROTO_TCP:

result = g_queue_find_custom(&conn->secondary_list,

@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)

* until next comparison.

*/

trace_colo_compare_main("packet different");

- g_queue_push_tail(&conn->primary_list, pkt);

+ g_queue_push_head(&conn->primary_list, pkt);

/* TODO: colo_notify_checkpoint();*/

break;

}

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Cc: berrange@redhat.com

Cc: kraxel@redhat.com

Cc: pbonzini@redhat.com

Cc: jasowang@redhat.com

Cc: armbru@redhat.com

Cc: eblake@redhat.com

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

include/qemu/sockets.h | 3 ++-

net/net.c | 22 +++++++++++++++++-----

net/socket.c | 22 +++++++++++++++-------

3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h

--- a/include/qemu/sockets.h

+++ b/include/qemu/sockets.h

@@ -XXX,XX +XXX,XX @@ void socket_listen_cleanup(int fd, Error **errp);

int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);

/* Old, ipv4 only bits. Don't use for new code. */

-int parse_host_port(struct sockaddr_in *saddr, const char *str);

+int parse_host_port(struct sockaddr_in *saddr, const char *str,

+ Error **errp);

int socket_init(void);

diff --git a/net/net.c b/net/net.c

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)

return 0;

-int parse_host_port(struct sockaddr_in *saddr, const char *str)

+int parse_host_port(struct sockaddr_in *saddr, const char *str,

+ Error **errp)

{

char buf[512];

struct hostent *he;

@@ -XXX,XX +XXX,XX @@ int parse_host_port(struct sockaddr_in *saddr, const char *str)

int port;

p = str;

- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0)

+ if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {

+ error_setg(errp, "host address '%s' doesn't contain ':' "

+ "separating host from port", str);

return -1;

+ }

saddr->sin_family = AF_INET;

if (buf[0] == '\0') {

saddr->sin_addr.s_addr = 0;

} else {

if (qemu_isdigit(buf[0])) {

- if (!inet_aton(buf, &saddr->sin_addr))

+ if (!inet_aton(buf, &saddr->sin_addr)) {

+ error_setg(errp, "host address '%s' is not a valid "

+ "IPv4 address", buf);

return -1;

+ }

} else {

- if ((he = gethostbyname(buf)) == NULL)

+ he = gethostbyname(buf);

+ if (he == NULL) {

+ error_setg(errp, "can't resolve host address '%s'", buf);

return - 1;

+ }

saddr->sin_addr = *(struct in_addr *)he->h_addr;

}

port = strtol(p, (char **)&r, 0);

- if (r == p)

+ if (r == p) {

+ error_setg(errp, "port number '%s' is invalid", p);

return -1;

+ }

saddr->sin_port = htons(port);

return 0;

}

diff --git a/net/socket.c b/net/socket.c

index XXXXXXX..XXXXXXX 100644

--- a/net/socket.c

+++ b/net/socket.c

@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,

*/

if (is_connected && mcast != NULL) {

- if (parse_host_port(&saddr, mcast) < 0) {

- error_setg(errp, "fd=%d failed parse_host_port()", fd);

+ if (parse_host_port(&saddr, mcast, errp) < 0) {

goto err;

}

/* must be bound */

@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,

NetSocketState *s;

struct sockaddr_in saddr;

int fd, ret;

+ Error *err = NULL;

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

+ if (parse_host_port(&saddr, host_str, &err) < 0) {

+ error_report_err(err);

return -1;

+ }

fd = qemu_socket(PF_INET, SOCK_STREAM, 0);

if (fd < 0) {

@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,

struct sockaddr_in saddr;

Error *err = NULL;

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

+ if (parse_host_port(&saddr, host_str, &err) < 0) {

+ error_report_err(err);

return -1;

+ }

fd = qemu_socket(PF_INET, SOCK_STREAM, 0);

if (fd < 0) {

@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,

struct in_addr localaddr, *param_localaddr;

Error *err = NULL;

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

+ if (parse_host_port(&saddr, host_str, &err) < 0) {

+ error_report_err(err);

return -1;

+ }

if (localaddr_str != NULL) {

if (inet_aton(localaddr_str, &localaddr) == 0)

@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,

struct sockaddr_in laddr, raddr;

Error *err = NULL;

- if (parse_host_port(&laddr, lhost) < 0) {

+ if (parse_host_port(&laddr, lhost, &err) < 0) {

+ error_report_err(err);

return -1;

}

- if (parse_host_port(&raddr, rhost) < 0) {

+ if (parse_host_port(&raddr, rhost, &err) < 0) {

+ error_report_err(err);

return -1;

}

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

pci_rocker_init() leaks a World when the name more than 9 chars,

then return a negative value directly, doesn't make a correct

cleanup. So add a new goto label to fix it.

Cc: jasowang@redhat.com

Cc: jiri@resnulli.us

Cc: armbru@redhat.com

Cc: f4bug@amsat.org

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

hw/net/rocker/rocker.c | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c

--- a/hw/net/rocker/rocker.c

+++ b/hw/net/rocker/rocker.c

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

fprintf(stderr,

"rocker: name too long; please shorten to at most %d chars\n",

MAX_ROCKER_NAME_LEN);

- return -EINVAL;

+ err = -EINVAL;

+ goto err_name_too_long;

if (memcmp(&r->fp_start_macaddr, &zero, sizeof(zero)) == 0) {

@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)

return 0;

+err_name_too_long:

err_duplicate:

rocker_msix_uninit(r);

err_msix_init:

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Because vnet_hdr have a offset to net packet, we must add it when use

virtio-net.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

net/filter-rewriter.c | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c

--- a/net/filter-rewriter.c

+++ b/net/filter-rewriter.c

@@ -XXX,XX +XXX,XX @@ static int handle_primary_tcp_pkt(NetFilterState *nf,

/* handle packets to the secondary from the primary */