Series comparison

-[Qemu-devel] [PULL 00/18] Net patches
+[Qemu-devel] [PULL V2 0/8] Net patches
-The following changes since commit cda4a338c4243fa3bff4498b935340ac7121cc76:
+The following changes since commit 32c7e0ab755745e961f1772e95cac381cc68769d:
-  tcg/tci: Add TCG_TARGET_DEFAULT_MO (2017-09-07 18:57:34 +0100)
+  Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170421' into staging (2017-04-21 15:59:27 +0100)
 are available in the git repository at:
   https://github.com/jasowang/qemu.git tags/net-pull-request
-for you to fetch changes up to 861d51e62bb197b43606f888dbefbabebaf0d854:
+for you to fetch changes up to 0fc8aec7de64f2bf83a274a2a38b938ce03425d2:
-  colo-compare: Update the COLO document to add the IOThread configuration (2017-09-08 09:34:40 +0800)
+  COLO-compare: Optimize tcp compare trace event (2017-04-25 19:17:25 +0800)
 ----------------------------------------------------------------
+Changes from V1:
+- Fix clang warnings
 ----------------------------------------------------------------
-Kamil Rytarowski (1):
+Cédric Le Goater (5):
-      e1000: Rename the SEC symbol to SEQEC
+      hw/net: add MII definitions
       net: add FTGMAC100 support
       net/ftgmac100: add a 'aspeed' property
       aspeed: add a FTGMAC100 nic
       slirp: add a fake NC-SI backend
-Mao Zhongyi (8):
+Zhang Chen (3):
-      net/rocker: Remove the dead error handling
+      colo-compare: Fix old packet check bug.
-      net/rocker: Plug memory leak in pci_rocker_init()
+      COLO-compare: Optimize tcp compare for option field
-      net/rocker: Convert to realize()
+      COLO-compare: Optimize tcp compare trace event
       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):
+ default-configs/arm-softmmu.mak |    1 +
-      net: rtl8139: do not use old_mmio accesses
+ hw/arm/aspeed_soc.c             |   21 +
+ hw/net/Makefile.objs            |    1 +
-Wang Yong (3):
+ hw/net/ftgmac100.c              | 1016 +++++++++++++++++++++++++++++++++++++++
-      qemu-iothread: IOThread supports the GMainContext event loop
+ include/hw/arm/aspeed_soc.h     |    2 +
-      colo-compare: Use IOThread to Check old packet regularly and Process pactkets of the primary
+ include/hw/net/ftgmac100.h      |   64 +++
-      colo-compare: Update the COLO document to add the IOThread configuration
+ include/hw/net/mii.h            |   71 ++-
+ include/net/eth.h               |    1 +
-Zhang Chen (5):
+ net/colo-compare.c              |   69 ++-
-      net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net
+ net/trace-events                |    3 +-
-      MAINTAINERS: Update mail address for COLO Proxy
+ slirp/Makefile.objs             |    2 +-
-      net/colo-compare.c: Optimize unpredictable tcp options comparison
+ slirp/ncsi-pkt.h                |  419 ++++++++++++++++
-      net/colo-compare.c: Adjust net queue pop order for performance
+ slirp/ncsi.c                    |  130 +++++
-      net/colo-compare.c: Fix comments and scheme
+ slirp/slirp.c                   |    4 +
+ slirp/slirp.h                   |    3 +
- MAINTAINERS                   |   2 +-
+files changed, 1770 insertions(+), 37 deletions(-)
- docs/colo-proxy.txt           |   3 +-
+ create mode 100644 hw/net/ftgmac100.c
- hw/net/e1000.c                |   4 +-
+ create mode 100644 include/hw/net/ftgmac100.h
- hw/net/e1000_regs.h           |   2 +-
+ create mode 100644 slirp/ncsi-pkt.h
- hw/net/e1000e_core.c          |   2 +-
+ create mode 100644 slirp/ncsi.c
  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 +++++++++++++++++++----------------
 files changed, 304 insertions(+), 323 deletions(-)

-[Qemu-devel] [PULL 01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net
+Deleted patch
-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>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- net/filter-rewriter.c | 6 ++++--
-file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
-index XXXXXXX..XXXXXXX 100644
---- 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 */
-             tcp_pkt->th_ack = htonl(ntohl(tcp_pkt->th_ack) + conn->offset);
--            net_checksum_calculate((uint8_t *)pkt->data, pkt->size);
-+            net_checksum_calculate((uint8_t *)pkt->data + pkt->vnet_hdr_len,
-+                                   pkt->size - pkt->vnet_hdr_len);
-         }
-     }
-@@ -XXX,XX +XXX,XX @@ static int handle_secondary_tcp_pkt(NetFilterState *nf,
-             /* handle packets to the primary from the secondary*/
-             tcp_pkt->th_seq = htonl(ntohl(tcp_pkt->th_seq) - conn->offset);
--            net_checksum_calculate((uint8_t *)pkt->data, pkt->size);
-+            net_checksum_calculate((uint8_t *)pkt->data + pkt->vnet_hdr_len,
-+                                   pkt->size - pkt->vnet_hdr_len);
-         }
-     }
---
-.7.4

-[Qemu-devel] [PULL 02/18] net/rocker: Remove the dead error handling
+Deleted patch
-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>
-Signed-off-by: Jason Wang <jasowang@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 +++++------
-files changed, 6 insertions(+), 87 deletions(-)
-diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
-index XXXXXXX..XXXXXXX 100644
---- 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) {
--        return false;
--    }
-     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);
-     }
-     return w;
---
-.7.4

-[Qemu-devel] [PULL 15/18] net/colo-compare.c: Fix comments and scheme
+[Qemu-devel] [PULL V2 1/8] colo-compare: Fix old packet check bug.
 From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+If colo-compare find one old packet,we can notify colo-frame
+do checkpoint, no need continue find more old packet here.
 Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 59 ++++++++++++++++++++++++++++--------------------------
+ net/colo-compare.c | 15 +++++++++++----
-file changed, 31 insertions(+), 28 deletions(-)
+file changed, 11 insertions(+), 4 deletions(-)
 diff --git a/net/colo-compare.c b/net/colo-compare.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/colo-compare.c
 +++ b/net/colo-compare.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time)
- #define REGULAR_PACKET_CHECK_MS 3000
+     }
  }
 -static void colo_old_packet_check_one_conn(void *opaque,
 -                                           void *user_data)
 +static int colo_old_packet_check_one_conn(Connection *conn,
 +                                          void *user_data)
  {
 -    Connection *conn = opaque;
      GList *result = NULL;
      int64_t check_time = REGULAR_PACKET_CHECK_MS;
@@ -XXX,XX +XXX,XX @@ static void colo_old_packet_check_one_conn(void *opaque,
      if (result) {
          /* do checkpoint will flush old packet */
          /* TODO: colo_notify_checkpoint();*/
 +        return 0;
      }
 +
 +    return 1;
  }
  /*
--  + CompareState ++
+@@ -XXX,XX +XXX,XX @@ static void colo_old_packet_check(void *opaque)
--  |               |
+ {
--  +---------------+   +---------------+         +---------------+
+     CompareState *s = opaque;
--  |conn list      +--->conn           +--------->conn           |
--  +---------------+   +---------------+         +---------------+
+-    g_queue_foreach(&s->conn_list, colo_old_packet_check_one_conn, NULL);
 -  |               |     |           |             |          |
 -  +---------------+ +---v----+  +---v----+    +---v----+ +---v----+
 -                    |primary |  |secondary    |primary | |secondary
 -                    |packet  |  |packet  +    |packet  | |packet  +
 -                    +--------+  +--------+    +--------+ +--------+
 -                        |           |             |          |
 -                    +---v----+  +---v----+    +---v----+ +---v----+
 -                    |primary |  |secondary    |primary | |secondary
 -                    |packet  |  |packet  +    |packet  | |packet  +
 -                    +--------+  +--------+    +--------+ +--------+
 -                        |           |             |          |
 -                    +---v----+  +---v----+    +---v----+ +---v----+
 -                    |primary |  |secondary    |primary | |secondary
 -                    |packet  |  |packet  +    |packet  | |packet  +
 -                    +--------+  +--------+    +--------+ +--------+
 -*/
 + *  + CompareState ++
 + *  |               |
 + *  +---------------+   +---------------+         +---------------+
 + *  |   conn list   + - >      conn     + ------- >      conn     + -- > ......
 + *  +---------------+   +---------------+         +---------------+
 + *  |               |     |           |             |          |
 + *  +---------------+ +---v----+  +---v----+    +---v----+ +---v----+
 + *                    |primary |  |secondary    |primary | |secondary
 + *                    |packet  |  |packet  +    |packet  | |packet  +
 + *                    +--------+  +--------+    +--------+ +--------+
 + *                        |           |             |          |
 + *                    +---v----+  +---v----+    +---v----+ +---v----+
 + *                    |primary |  |secondary    |primary | |secondary
 + *                    |packet  |  |packet  +    |packet  | |packet  +
 + *                    +--------+  +--------+    +--------+ +--------+
 + *                        |           |             |          |
 + *                    +---v----+  +---v----+    +---v----+ +---v----+
 + *                    |primary |  |secondary    |primary | |secondary
 + *                    |packet  |  |packet  +    |packet  | |packet  +
 + *                    +--------+  +--------+    +--------+ +--------+
 + */
  typedef struct CompareState {
      Object parent;
@@ -XXX,XX +XXX,XX @@ typedef struct CompareState {
      SocketReadState sec_rs;
      bool vnet_hdr;
 -    /* connection list: the connections belonged to this NIC could be found
 -     * in this list.
 -     * element type: Connection
 +    /*
-+     * Record the connection that through the NIC
++     * If we find one old packet, stop finding job and notify
-+     * Element type: Connection
++     * COLO frame do checkpoint.
-      */
++     */
-     GQueue conn_list;
++    g_queue_find_custom(&s->conn_list, NULL,
--    /* hashtable to save connection */
++                        (GCompareFunc)colo_old_packet_check_one_conn);
-+    /* Record the connection without repetition */
+ }
-     GHashTable *connection_track_table;
--    /* compare thread, a thread for each NIC */
+ /*
 +    /* This thread just do packet compare job */
      QemuThread thread;
      GMainContext *worker_context;
@@ -XXX,XX +XXX,XX @@ static int colo_old_packet_check_one_conn(Connection *conn,
                                   (GCompareFunc)colo_old_packet_check_one);
      if (result) {
 -        /* do checkpoint will flush old packet */
 -        /* TODO: colo_notify_checkpoint();*/
 +        /* Do checkpoint will flush old packet */
 +        /*
 +         * TODO: Notify colo frame to do checkpoint.
 +         * colo_compare_inconsistent_notify();
 +         */
          return 0;
      }
 --
 .7.4

-[Qemu-devel] [PULL 03/18] net/rocker: Plug memory leak in pci_rocker_init()
+[Qemu-devel] [PULL V2 2/8] hw/net: add MII definitions
-From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
+From: Cédric Le Goater <clg@kaod.org>
-pci_rocker_init() leaks a World when the name more than 9 chars,
+This adds comments on the Basic mode control and status registers bit
-then return a negative value directly, doesn't make a correct
+definitions. It also adds a couple of bits for 1000BASE-T and the
-cleanup. So add a new goto label to fix it.
+RealTek 8211E PHY for the FTGMAC100 model to use.
-Cc: jasowang@redhat.com
+Signed-off-by: Cédric Le Goater <clg@kaod.org>
 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>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- hw/net/rocker/rocker.c | 4 +++-
+ include/hw/net/mii.h | 71 +++++++++++++++++++++++++++++++++++++++-------------
-file changed, 3 insertions(+), 1 deletion(-)
+file changed, 53 insertions(+), 18 deletions(-)
-diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
+diff --git a/include/hw/net/mii.h b/include/hw/net/mii.h
 index XXXXXXX..XXXXXXX 100644
---- a/hw/net/rocker/rocker.c
+--- a/include/hw/net/mii.h
-+++ b/hw/net/rocker/rocker.c
++++ b/include/hw/net/mii.h
-@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
+@@ -XXX,XX +XXX,XX @@
-         fprintf(stderr,
+ #define MII_H
-                 "rocker: name too long; please shorten to at most %d chars\n",
-                 MAX_ROCKER_NAME_LEN);
+ /* PHY registers */
--        return -EINVAL;
+-#define MII_BMCR            0
-+        err = -EINVAL;
+-#define MII_BMSR            1
-+        goto err_name_too_long;
+-#define MII_PHYID1          2
-     }
+-#define MII_PHYID2          3
+-#define MII_ANAR            4
-     if (memcmp(&r->fp_start_macaddr, &zero, sizeof(zero)) == 0) {
+-#define MII_ANLPAR          5
-@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
+-#define MII_ANER            6
++#define MII_BMCR            0  /* Basic mode control register */
-     return 0;
++#define MII_BMSR            1  /* Basic mode status register */
++#define MII_PHYID1          2  /* ID register 1 */
-+err_name_too_long:
++#define MII_PHYID2          3  /* ID register 2 */
- err_duplicate:
++#define MII_ANAR            4  /* Autonegotiation advertisement */
-     rocker_msix_uninit(r);
++#define MII_ANLPAR          5  /* Autonegotiation lnk partner abilities */
- err_msix_init:
++#define MII_ANER            6  /* Autonegotiation expansion */
 +#define MII_ANNP            7  /* Autonegotiation next page */
 +#define MII_ANLPRNP         8  /* Autonegotiation link partner rx next page */
 +#define MII_CTRL1000        9  /* 1000BASE-T control */
 +#define MII_STAT1000        10 /* 1000BASE-T status */
 +#define MII_MDDACR          13 /* MMD access control */
 +#define MII_MDDAADR         14 /* MMD access address data */
 +#define MII_EXTSTAT         15 /* Extended Status */
  #define MII_NSR             16
  #define MII_LBREMR          17
  #define MII_REC             18
@@ -XXX,XX +XXX,XX @@
  /* PHY registers fields */
  #define MII_BMCR_RESET      (1 << 15)
  #define MII_BMCR_LOOPBACK   (1 << 14)
 -#define MII_BMCR_SPEED      (1 << 13)
 -#define MII_BMCR_AUTOEN     (1 << 12)
 -#define MII_BMCR_FD         (1 << 8)
 +#define MII_BMCR_SPEED100   (1 << 13)  /* LSB of Speed (100) */
 +#define MII_BMCR_SPEED      MII_BMCR_SPEED100
 +#define MII_BMCR_AUTOEN     (1 << 12) /* Autonegotiation enable */
 +#define MII_BMCR_PDOWN      (1 << 11) /* Enable low power state */
 +#define MII_BMCR_ISOLATE    (1 << 10) /* Isolate data paths from MII */
 +#define MII_BMCR_ANRESTART  (1 << 9)  /* Auto negotiation restart */
 +#define MII_BMCR_FD         (1 << 8)  /* Set duplex mode */
 +#define MII_BMCR_CTST       (1 << 7)  /* Collision test */
 +#define MII_BMCR_SPEED1000  (1 << 6)  /* MSB of Speed (1000) */
 -#define MII_BMSR_100TX_FD   (1 << 14)
 -#define MII_BMSR_100TX_HD   (1 << 13)
 -#define MII_BMSR_10T_FD     (1 << 12)
 -#define MII_BMSR_10T_HD     (1 << 11)
 -#define MII_BMSR_MFPS       (1 << 6)
 -#define MII_BMSR_AN_COMP    (1 << 5)
 -#define MII_BMSR_AUTONEG    (1 << 3)
 -#define MII_BMSR_LINK_ST    (1 << 2)
 +#define MII_BMSR_100TX_FD   (1 << 14) /* Can do 100mbps, full-duplex */
 +#define MII_BMSR_100TX_HD   (1 << 13) /* Can do 100mbps, half-duplex */
 +#define MII_BMSR_10T_FD     (1 << 12) /* Can do 10mbps, full-duplex */
 +#define MII_BMSR_10T_HD     (1 << 11) /* Can do 10mbps, half-duplex */
 +#define MII_BMSR_100T2_FD   (1 << 10) /* Can do 100mbps T2, full-duplex */
 +#define MII_BMSR_100T2_HD   (1 << 9)  /* Can do 100mbps T2, half-duplex */
 +#define MII_BMSR_EXTSTAT    (1 << 8)  /* Extended status in register 15 */
 +#define MII_BMSR_MFPS       (1 << 6)  /* MII Frame Preamble Suppression */
 +#define MII_BMSR_AN_COMP    (1 << 5)  /* Auto-negotiation complete */
 +#define MII_BMSR_RFAULT     (1 << 4)  /* Remote fault */
 +#define MII_BMSR_AUTONEG    (1 << 3)  /* Able to do auto-negotiation */
 +#define MII_BMSR_LINK_ST    (1 << 2)  /* Link status */
 +#define MII_BMSR_JABBER     (1 << 1)  /* Jabber detected */
 +#define MII_BMSR_EXTCAP     (1 << 0)  /* Ext-reg capability */
 +#define MII_ANAR_PAUSE_ASYM (1 << 11) /* Try for asymetric pause */
 +#define MII_ANAR_PAUSE      (1 << 10) /* Try for pause */
  #define MII_ANAR_TXFD       (1 << 8)
  #define MII_ANAR_TX         (1 << 7)
  #define MII_ANAR_10FD       (1 << 6)
@@ -XXX,XX +XXX,XX @@
  #define MII_ANAR_CSMACD     (1 << 0)
  #define MII_ANLPAR_ACK      (1 << 14)
 +#define MII_ANLPAR_PAUSEASY (1 << 11) /* can pause asymmetrically */
 +#define MII_ANLPAR_PAUSE    (1 << 10) /* can pause */
  #define MII_ANLPAR_TXFD     (1 << 8)
  #define MII_ANLPAR_TX       (1 << 7)
  #define MII_ANLPAR_10FD     (1 << 6)
  #define MII_ANLPAR_10       (1 << 5)
  #define MII_ANLPAR_CSMACD   (1 << 0)
 +#define MII_ANER_NWAY       (1 << 0) /* Can do N-way auto-nego */
 +
 +#define MII_CTRL1000_FULL   (1 << 9)  /* 1000BASE-T full duplex */
 +#define MII_CTRL1000_HALF   (1 << 8)  /* 1000BASE-T half duplex */
 +
 +#define MII_STAT1000_FULL   (1 << 11) /* 1000BASE-T full duplex */
 +#define MII_STAT1000_HALF   (1 << 10) /* 1000BASE-T half duplex */
 +
  /* List of vendor identifiers */
  /* RealTek 8201 */
  #define RTL8201CP_PHYID1    0x0000
  #define RTL8201CP_PHYID2    0x8201
 +/* RealTek 8211E */
 +#define RTL8211E_PHYID1     0x001c
 +#define RTL8211E_PHYID2     0xc915
 +
  /* National Semiconductor DP83848 */
  #define DP83848_PHYID1      0x2000
  #define DP83848_PHYID2      0x5c90
 --
 .7.4

-[Qemu-devel] [PULL 18/18] colo-compare: Update the COLO document to add the IOThread configuration
+[Qemu-devel] [PULL V2 3/8] net: add FTGMAC100 support
-From: Wang Yong <wang.yong155@zte.com.cn>
+From: Cédric Le Goater <clg@kaod.org>
-Update colo-proxy.txt,add IOThread configuration.
+The FTGMAC100 device is an Ethernet controller with DMA function that
-Later we have to configure IOThread,if not COLO can not work.
+can be found on Aspeed SoCs (which include NCSI).
-Reviewed-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+It is fully compliant with IEEE 802.3 specification for 10/100 Mbps
-Signed-off-by: Wang Yong <wang.yong155@zte.com.cn>
+Ethernet and IEEE 802.3z specification for 1000 Mbps Ethernet and
-Signed-off-by: Wang Guang <wang.guang55@zte.com.cn>
+includes Reduced Media Independent Interface (RMII) and Reduced
 Gigabit Media Independent Interface (RGMII) interfaces. It adopts an
 AHB bus interface and integrates a link list DMA engine with direct
 M-Bus accesses for transmitting and receiving packets. It has
 independent TX/RX fifos, supports half and full duplex (1000 Mbps mode
 only supports full duplex), flow control for full duplex and
 backpressure for half duplex.
 The FTGMAC100 also implements IP, TCP, UDP checksum offloads and
 supports IEEE 802.1Q VLAN tag insertion and removal. It offers
 high-priority transmit queue for QoS and CoS applications
 This model is backed with a RealTek 8211E PHY which is the chip found
 on the AST2500 EVB. It is complete enough to satisfy two different
 Linux drivers and a U-Boot driver. Not supported features are :
  - IEEE 802.1Q VLAN
  - High Priority Transmit Queue
  - Wake-On-LAN functions
 The code is based on the Coldfire Fast Ethernet Controller model.
 Signed-off-by: Cédric Le Goater <clg@kaod.org>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- docs/colo-proxy.txt | 3 ++-
+ default-configs/arm-softmmu.mak |    1 +
-file changed, 2 insertions(+), 1 deletion(-)
+ hw/net/Makefile.objs            |    1 +
  hw/net/ftgmac100.c              | 1003 +++++++++++++++++++++++++++++++++++++++
  include/hw/net/ftgmac100.h      |   60 +++
 files changed, 1065 insertions(+)
  create mode 100644 hw/net/ftgmac100.c
  create mode 100644 include/hw/net/ftgmac100.h
-diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt
+diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
 index XXXXXXX..XXXXXXX 100644
---- a/docs/colo-proxy.txt
+--- a/default-configs/arm-softmmu.mak
-+++ b/docs/colo-proxy.txt
++++ b/default-configs/arm-softmmu.mak
-@@ -XXX,XX +XXX,XX @@ Primary(ip:3.3.3.3):
+@@ -XXX,XX +XXX,XX @@ CONFIG_LAN9118=y
- -chardev socket,id=compare0-0,host=3.3.3.3,port=9001
+ CONFIG_SMC91C111=y
- -chardev socket,id=compare_out,host=3.3.3.3,port=9005,server,nowait
+ CONFIG_ALLWINNER_EMAC=y
- -chardev socket,id=compare_out0,host=3.3.3.3,port=9005
+ CONFIG_IMX_FEC=y
-+-object iothread,id=iothread1
++CONFIG_FTGMAC100=y
- -object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0
+ CONFIG_DS1338=y
- -object filter-redirector,netdev=hn0,id=redire0,queue=rx,indev=compare_out
+ CONFIG_PFLASH_CFI01=y
- -object filter-redirector,netdev=hn0,id=redire1,queue=rx,outdev=compare0
+ CONFIG_PFLASH_CFI02=y
---object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0
+diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs
-+-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/net/Makefile.objs
- Secondary(ip:3.3.3.8):
++++ b/hw/net/Makefile.objs
- -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown
+@@ -XXX,XX +XXX,XX @@ common-obj-$(CONFIG_IMX_FEC) += imx_fec.o
  common-obj-$(CONFIG_CADENCE) += cadence_gem.o
  common-obj-$(CONFIG_STELLARIS_ENET) += stellaris_enet.o
  common-obj-$(CONFIG_LANCE) += lance.o
 +common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o
  obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
  obj-$(CONFIG_COLDFIRE) += mcf_fec.o
 diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/net/ftgmac100.c
@@ -XXX,XX +XXX,XX @@
 +/*
 + * Faraday FTGMAC100 Gigabit Ethernet
 + *
 + * Copyright (C) 2016-2017, IBM Corporation.
 + *
 + * Based on Coldfire Fast Ethernet Controller emulation.
 + *
 + * Copyright (c) 2007 CodeSourcery.
 + *
 + * This code is licensed under the GPL version 2 or later. See the
 + * COPYING file in the top-level directory.
 + */
 +
 +#include "qemu/osdep.h"
 +#include "hw/net/ftgmac100.h"
 +#include "sysemu/dma.h"
 +#include "qemu/log.h"
 +#include "net/checksum.h"
 +#include "net/eth.h"
 +#include "hw/net/mii.h"
 +
 +/* For crc32 */
 +#include <zlib.h>
 +
 +/*
 + * FTGMAC100 registers
 + */
 +#define FTGMAC100_ISR             0x00
 +#define FTGMAC100_IER             0x04
 +#define FTGMAC100_MAC_MADR        0x08
 +#define FTGMAC100_MAC_LADR        0x0c
 +#define FTGMAC100_MATH0           0x10
 +#define FTGMAC100_MATH1           0x14
 +#define FTGMAC100_NPTXPD          0x18
 +#define FTGMAC100_RXPD            0x1C
 +#define FTGMAC100_NPTXR_BADR      0x20
 +#define FTGMAC100_RXR_BADR        0x24
 +#define FTGMAC100_HPTXPD          0x28
 +#define FTGMAC100_HPTXR_BADR      0x2c
 +#define FTGMAC100_ITC             0x30
 +#define FTGMAC100_APTC            0x34
 +#define FTGMAC100_DBLAC           0x38
 +#define FTGMAC100_REVR            0x40
 +#define FTGMAC100_FEAR1           0x44
 +#define FTGMAC100_RBSR            0x4c
 +#define FTGMAC100_TPAFCR          0x48
 +
 +#define FTGMAC100_MACCR           0x50
 +#define FTGMAC100_MACSR           0x54
 +#define FTGMAC100_PHYCR           0x60
 +#define FTGMAC100_PHYDATA         0x64
 +#define FTGMAC100_FCR             0x68
 +
 +/*
 + * Interrupt status register & interrupt enable register
 + */
 +#define FTGMAC100_INT_RPKT_BUF    (1 << 0)
 +#define FTGMAC100_INT_RPKT_FIFO   (1 << 1)
 +#define FTGMAC100_INT_NO_RXBUF    (1 << 2)
 +#define FTGMAC100_INT_RPKT_LOST   (1 << 3)
 +#define FTGMAC100_INT_XPKT_ETH    (1 << 4)
 +#define FTGMAC100_INT_XPKT_FIFO   (1 << 5)
 +#define FTGMAC100_INT_NO_NPTXBUF  (1 << 6)
 +#define FTGMAC100_INT_XPKT_LOST   (1 << 7)
 +#define FTGMAC100_INT_AHB_ERR     (1 << 8)
 +#define FTGMAC100_INT_PHYSTS_CHG  (1 << 9)
 +#define FTGMAC100_INT_NO_HPTXBUF  (1 << 10)
 +
 +/*
 + * Automatic polling timer control register
 + */
 +#define FTGMAC100_APTC_RXPOLL_CNT(x)        ((x) & 0xf)
 +#define FTGMAC100_APTC_RXPOLL_TIME_SEL      (1 << 4)
 +#define FTGMAC100_APTC_TXPOLL_CNT(x)        (((x) >> 8) & 0xf)
 +#define FTGMAC100_APTC_TXPOLL_TIME_SEL      (1 << 12)
 +
 +/*
 + * PHY control register
 + */
 +#define FTGMAC100_PHYCR_MIIRD               (1 << 26)
 +#define FTGMAC100_PHYCR_MIIWR               (1 << 27)
 +
 +#define FTGMAC100_PHYCR_DEV(x)              (((x) >> 16) & 0x1f)
 +#define FTGMAC100_PHYCR_REG(x)              (((x) >> 21) & 0x1f)
 +
 +/*
 + * PHY data register
 + */
 +#define FTGMAC100_PHYDATA_MIIWDATA(x)       ((x) & 0xffff)
 +#define FTGMAC100_PHYDATA_MIIRDATA(x)       (((x) >> 16) & 0xffff)
 +
 +/*
 + * Feature Register
 + */
 +#define FTGMAC100_REVR_NEW_MDIO_INTERFACE   (1 << 31)
 +
 +/*
 + * MAC control register
 + */
 +#define FTGMAC100_MACCR_TXDMA_EN         (1 << 0)
 +#define FTGMAC100_MACCR_RXDMA_EN         (1 << 1)
 +#define FTGMAC100_MACCR_TXMAC_EN         (1 << 2)
 +#define FTGMAC100_MACCR_RXMAC_EN         (1 << 3)
 +#define FTGMAC100_MACCR_RM_VLAN          (1 << 4)
 +#define FTGMAC100_MACCR_HPTXR_EN         (1 << 5)
 +#define FTGMAC100_MACCR_LOOP_EN          (1 << 6)
 +#define FTGMAC100_MACCR_ENRX_IN_HALFTX   (1 << 7)
 +#define FTGMAC100_MACCR_FULLDUP          (1 << 8)
 +#define FTGMAC100_MACCR_GIGA_MODE        (1 << 9)
 +#define FTGMAC100_MACCR_CRC_APD          (1 << 10) /* not needed */
 +#define FTGMAC100_MACCR_RX_RUNT          (1 << 12)
 +#define FTGMAC100_MACCR_JUMBO_LF         (1 << 13)
 +#define FTGMAC100_MACCR_RX_ALL           (1 << 14)
 +#define FTGMAC100_MACCR_HT_MULTI_EN      (1 << 15)
 +#define FTGMAC100_MACCR_RX_MULTIPKT      (1 << 16)
 +#define FTGMAC100_MACCR_RX_BROADPKT      (1 << 17)
 +#define FTGMAC100_MACCR_DISCARD_CRCERR   (1 << 18)
 +#define FTGMAC100_MACCR_FAST_MODE        (1 << 19)
 +#define FTGMAC100_MACCR_SW_RST           (1 << 31)
 +
 +/*
 + * Transmit descriptor
 + */
 +#define FTGMAC100_TXDES0_TXBUF_SIZE(x)   ((x) & 0x3fff)
 +#define FTGMAC100_TXDES0_EDOTR           (1 << 15)
 +#define FTGMAC100_TXDES0_CRC_ERR         (1 << 19)
 +#define FTGMAC100_TXDES0_LTS             (1 << 28)
 +#define FTGMAC100_TXDES0_FTS             (1 << 29)
 +#define FTGMAC100_TXDES0_TXDMA_OWN       (1 << 31)
 +
 +#define FTGMAC100_TXDES1_VLANTAG_CI(x)   ((x) & 0xffff)
 +#define FTGMAC100_TXDES1_INS_VLANTAG     (1 << 16)
 +#define FTGMAC100_TXDES1_TCP_CHKSUM      (1 << 17)
 +#define FTGMAC100_TXDES1_UDP_CHKSUM      (1 << 18)
 +#define FTGMAC100_TXDES1_IP_CHKSUM       (1 << 19)
 +#define FTGMAC100_TXDES1_LLC             (1 << 22)
 +#define FTGMAC100_TXDES1_TX2FIC          (1 << 30)
 +#define FTGMAC100_TXDES1_TXIC            (1 << 31)
 +
 +/*
 + * Receive descriptor
 + */
 +#define FTGMAC100_RXDES0_VDBC            0x3fff
 +#define FTGMAC100_RXDES0_EDORR           (1 << 15)
 +#define FTGMAC100_RXDES0_MULTICAST       (1 << 16)
 +#define FTGMAC100_RXDES0_BROADCAST       (1 << 17)
 +#define FTGMAC100_RXDES0_RX_ERR          (1 << 18)
 +#define FTGMAC100_RXDES0_CRC_ERR         (1 << 19)
 +#define FTGMAC100_RXDES0_FTL             (1 << 20)
 +#define FTGMAC100_RXDES0_RUNT            (1 << 21)
 +#define FTGMAC100_RXDES0_RX_ODD_NB       (1 << 22)
 +#define FTGMAC100_RXDES0_FIFO_FULL       (1 << 23)
 +#define FTGMAC100_RXDES0_PAUSE_OPCODE    (1 << 24)
 +#define FTGMAC100_RXDES0_PAUSE_FRAME     (1 << 25)
 +#define FTGMAC100_RXDES0_LRS             (1 << 28)
 +#define FTGMAC100_RXDES0_FRS             (1 << 29)
 +#define FTGMAC100_RXDES0_RXPKT_RDY       (1 << 31)
 +
 +#define FTGMAC100_RXDES1_VLANTAG_CI      0xffff
 +#define FTGMAC100_RXDES1_PROT_MASK       (0x3 << 20)
 +#define FTGMAC100_RXDES1_PROT_NONIP      (0x0 << 20)
 +#define FTGMAC100_RXDES1_PROT_IP         (0x1 << 20)
 +#define FTGMAC100_RXDES1_PROT_TCPIP      (0x2 << 20)
 +#define FTGMAC100_RXDES1_PROT_UDPIP      (0x3 << 20)
 +#define FTGMAC100_RXDES1_LLC             (1 << 22)
 +#define FTGMAC100_RXDES1_DF              (1 << 23)
 +#define FTGMAC100_RXDES1_VLANTAG_AVAIL   (1 << 24)
 +#define FTGMAC100_RXDES1_TCP_CHKSUM_ERR  (1 << 25)
 +#define FTGMAC100_RXDES1_UDP_CHKSUM_ERR  (1 << 26)
 +#define FTGMAC100_RXDES1_IP_CHKSUM_ERR   (1 << 27)
 +
 +/*
 + * Receive and transmit Buffer Descriptor
 + */
 +typedef struct {
 +    uint32_t        des0;
 +    uint32_t        des1;
 +    uint32_t        des2;        /* not used by HW */
 +    uint32_t        des3;
 +} FTGMAC100Desc;
 +
 +/*
 + * Specific RTL8211E MII Registers
 + */
 +#define RTL8211E_MII_PHYCR        16 /* PHY Specific Control */
 +#define RTL8211E_MII_PHYSR        17 /* PHY Specific Status */
 +#define RTL8211E_MII_INER         18 /* Interrupt Enable */
 +#define RTL8211E_MII_INSR         19 /* Interrupt Status */
 +#define RTL8211E_MII_RXERC        24 /* Receive Error Counter */
 +#define RTL8211E_MII_LDPSR        27 /* Link Down Power Saving */
 +#define RTL8211E_MII_EPAGSR       30 /* Extension Page Select */
 +#define RTL8211E_MII_PAGSEL       31 /* Page Select */
 +
 +/*
 + * RTL8211E Interrupt Status
 + */
 +#define PHY_INT_AUTONEG_ERROR       (1 << 15)
 +#define PHY_INT_PAGE_RECV           (1 << 12)
 +#define PHY_INT_AUTONEG_COMPLETE    (1 << 11)
 +#define PHY_INT_LINK_STATUS         (1 << 10)
 +#define PHY_INT_ERROR               (1 << 9)
 +#define PHY_INT_DOWN                (1 << 8)
 +#define PHY_INT_JABBER              (1 << 0)
 +
 +/*
 + * Max frame size for the receiving buffer
 + */
 +#define FTGMAC100_MAX_FRAME_SIZE    10240
 +
 +/* Limits depending on the type of the frame
 + *
 + *   9216 for Jumbo frames (+ 4 for VLAN)
 + *   1518 for other frames (+ 4 for VLAN)
 + */
 +static int ftgmac100_max_frame_size(FTGMAC100State *s)
 +{
 +    return (s->maccr & FTGMAC100_MACCR_JUMBO_LF ? 9216 : 1518) + 4;
 +}
 +
 +static void ftgmac100_update_irq(FTGMAC100State *s)
 +{
 +    qemu_set_irq(s->irq, s->isr & s->ier);
 +}
 +
 +/*
 + * The MII phy could raise a GPIO to the processor which in turn
 + * could be handled as an interrpt by the OS.
 + * For now we don't handle any GPIO/interrupt line, so the OS will
 + * have to poll for the PHY status.
 + */
 +static void phy_update_irq(FTGMAC100State *s)
 +{
 +    ftgmac100_update_irq(s);
 +}
 +
 +static void phy_update_link(FTGMAC100State *s)
 +{
 +    /* Autonegotiation status mirrors link status.  */
 +    if (qemu_get_queue(s->nic)->link_down) {
 +        s->phy_status &= ~(MII_BMSR_LINK_ST | MII_BMSR_AN_COMP);
 +        s->phy_int |= PHY_INT_DOWN;
 +    } else {
 +        s->phy_status |= (MII_BMSR_LINK_ST | MII_BMSR_AN_COMP);
 +        s->phy_int |= PHY_INT_AUTONEG_COMPLETE;
 +    }
 +    phy_update_irq(s);
 +}
 +
 +static void ftgmac100_set_link(NetClientState *nc)
 +{
 +    phy_update_link(FTGMAC100(qemu_get_nic_opaque(nc)));
 +}
 +
 +static void phy_reset(FTGMAC100State *s)
 +{
 +    s->phy_status = (MII_BMSR_100TX_FD | MII_BMSR_100TX_HD | MII_BMSR_10T_FD |
 +                     MII_BMSR_10T_HD | MII_BMSR_EXTSTAT | MII_BMSR_MFPS |
 +                     MII_BMSR_AN_COMP | MII_BMSR_AUTONEG | MII_BMSR_LINK_ST |
 +                     MII_BMSR_EXTCAP);
 +    s->phy_control = (MII_BMCR_AUTOEN | MII_BMCR_FD | MII_BMCR_SPEED1000);
 +    s->phy_advertise = (MII_ANAR_PAUSE_ASYM | MII_ANAR_PAUSE | MII_ANAR_TXFD |
 +                        MII_ANAR_TX | MII_ANAR_10FD | MII_ANAR_10 |
 +                        MII_ANAR_CSMACD);
 +    s->phy_int_mask = 0;
 +    s->phy_int = 0;
 +}
 +
 +static uint32_t do_phy_read(FTGMAC100State *s, int reg)
 +{
 +    uint32_t val;
 +
 +    switch (reg) {
 +    case MII_BMCR: /* Basic Control */
 +        val = s->phy_control;
 +        break;
 +    case MII_BMSR: /* Basic Status */
 +        val = s->phy_status;
 +        break;
 +    case MII_PHYID1: /* ID1 */
 +        val = RTL8211E_PHYID1;
 +        break;
 +    case MII_PHYID2: /* ID2 */
 +        val = RTL8211E_PHYID2;
 +        break;
 +    case MII_ANAR: /* Auto-neg advertisement */
 +        val = s->phy_advertise;
 +        break;
 +    case MII_ANLPAR: /* Auto-neg Link Partner Ability */
 +        val = (MII_ANLPAR_ACK | MII_ANLPAR_PAUSE | MII_ANLPAR_TXFD |
 +               MII_ANLPAR_TX | MII_ANLPAR_10FD | MII_ANLPAR_10 |
 +               MII_ANLPAR_CSMACD);
 +        break;
 +    case MII_ANER: /* Auto-neg Expansion */
 +        val = MII_ANER_NWAY;
 +        break;
 +    case MII_CTRL1000: /* 1000BASE-T control  */
 +        val = (MII_CTRL1000_HALF | MII_CTRL1000_FULL);
 +        break;
 +    case MII_STAT1000: /* 1000BASE-T status  */
 +        val = MII_STAT1000_FULL;
 +        break;
 +    case RTL8211E_MII_INSR:  /* Interrupt status.  */
 +        val = s->phy_int;
 +        s->phy_int = 0;
 +        phy_update_irq(s);
 +        break;
 +    case RTL8211E_MII_INER:  /* Interrupt enable */
 +        val = s->phy_int_mask;
 +        break;
 +    case RTL8211E_MII_PHYCR:
 +    case RTL8211E_MII_PHYSR:
 +    case RTL8211E_MII_RXERC:
 +    case RTL8211E_MII_LDPSR:
 +    case RTL8211E_MII_EPAGSR:
 +    case RTL8211E_MII_PAGSEL:
 +        qemu_log_mask(LOG_UNIMP, "%s: reg %d not implemented\n",
 +                      __func__, reg);
 +        val = 0;
 +        break;
 +    default:
 +        qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset %d\n",
 +                      __func__, reg);
 +        val = 0;
 +        break;
 +    }
 +
 +    return val;
 +}
 +
 +#define MII_BMCR_MASK (MII_BMCR_LOOPBACK | MII_BMCR_SPEED100 |          \
 +                       MII_BMCR_SPEED | MII_BMCR_AUTOEN | MII_BMCR_PDOWN | \
 +                       MII_BMCR_FD | MII_BMCR_CTST)
 +#define MII_ANAR_MASK 0x2d7f
 +
 +static void do_phy_write(FTGMAC100State *s, int reg, uint32_t val)
 +{
 +    switch (reg) {
 +    case MII_BMCR:     /* Basic Control */
 +        if (val & MII_BMCR_RESET) {
 +            phy_reset(s);
 +        } else {
 +            s->phy_control = val & MII_BMCR_MASK;
 +            /* Complete autonegotiation immediately.  */
 +            if (val & MII_BMCR_AUTOEN) {
 +                s->phy_status |= MII_BMSR_AN_COMP;
 +            }
 +        }
 +        break;
 +    case MII_ANAR:     /* Auto-neg advertisement */
 +        s->phy_advertise = (val & MII_ANAR_MASK) | MII_ANAR_TX;
 +        break;
 +    case RTL8211E_MII_INER: /* Interrupt enable */
 +        s->phy_int_mask = val & 0xff;
 +        phy_update_irq(s);
 +        break;
 +    case RTL8211E_MII_PHYCR:
 +    case RTL8211E_MII_PHYSR:
 +    case RTL8211E_MII_RXERC:
 +    case RTL8211E_MII_LDPSR:
 +    case RTL8211E_MII_EPAGSR:
 +    case RTL8211E_MII_PAGSEL:
 +        qemu_log_mask(LOG_UNIMP, "%s: reg %d not implemented\n",
 +                      __func__, reg);
 +        break;
 +    default:
 +        qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset %d\n",
 +                      __func__, reg);
 +        break;
 +    }
 +}
 +
 +static int ftgmac100_read_bd(FTGMAC100Desc *bd, dma_addr_t addr)
 +{
 +    if (dma_memory_read(&address_space_memory, addr, bd, sizeof(*bd))) {
 +        qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to read descriptor @ 0x%"
 +                      HWADDR_PRIx "\n", __func__, addr);
 +        return -1;
 +    }
 +    bd->des0 = le32_to_cpu(bd->des0);
 +    bd->des1 = le32_to_cpu(bd->des1);
 +    bd->des2 = le32_to_cpu(bd->des2);
 +    bd->des3 = le32_to_cpu(bd->des3);
 +    return 0;
 +}
 +
 +static int ftgmac100_write_bd(FTGMAC100Desc *bd, dma_addr_t addr)
 +{
 +    FTGMAC100Desc lebd;
 +
 +    lebd.des0 = cpu_to_le32(bd->des0);
 +    lebd.des1 = cpu_to_le32(bd->des1);
 +    lebd.des2 = cpu_to_le32(bd->des2);
 +    lebd.des3 = cpu_to_le32(bd->des3);
 +    if (dma_memory_write(&address_space_memory, addr, &lebd, sizeof(lebd))) {
 +        qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to write descriptor @ 0x%"
 +                      HWADDR_PRIx "\n", __func__, addr);
 +        return -1;
 +    }
 +    return 0;
 +}
 +
 +static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring,
 +                            uint32_t tx_descriptor)
 +{
 +    int frame_size = 0;
 +    uint8_t *ptr = s->frame;
 +    uint32_t addr = tx_descriptor;
 +    uint32_t flags = 0;
 +    int max_frame_size = ftgmac100_max_frame_size(s);
 +
 +    while (1) {
 +        FTGMAC100Desc bd;
 +        int len;
 +
 +        if (ftgmac100_read_bd(&bd, addr) ||
 +            ((bd.des0 & FTGMAC100_TXDES0_TXDMA_OWN) == 0)) {
 +            /* Run out of descriptors to transmit.  */
 +            s->isr |= FTGMAC100_INT_NO_NPTXBUF;
 +            break;
 +        }
 +
 +        /* record transmit flags as they are valid only on the first
 +         * segment */
 +        if (bd.des0 & FTGMAC100_TXDES0_FTS) {
 +            flags = bd.des1;
 +        }
 +
 +        len = bd.des0 & 0x3FFF;
 +        if (frame_size + len > max_frame_size) {
 +            qemu_log_mask(LOG_GUEST_ERROR, "%s: frame too big : %d bytes\n",
 +                          __func__, len);
 +            len = max_frame_size - frame_size;
 +        }
 +
 +        if (dma_memory_read(&address_space_memory, bd.des3, ptr, len)) {
 +            qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to read packet @ 0x%x\n",
 +                          __func__, bd.des3);
 +            s->isr |= FTGMAC100_INT_NO_NPTXBUF;
 +            break;
 +        }
 +
 +        ptr += len;
 +        frame_size += len;
 +        if (bd.des0 & FTGMAC100_TXDES0_LTS) {
 +            if (flags & FTGMAC100_TXDES1_IP_CHKSUM) {
 +                net_checksum_calculate(s->frame, frame_size);
 +            }
 +            /* Last buffer in frame.  */
 +            qemu_send_packet(qemu_get_queue(s->nic), s->frame, frame_size);
 +            ptr = s->frame;
 +            frame_size = 0;
 +            if (flags & FTGMAC100_TXDES1_TXIC) {
 +                s->isr |= FTGMAC100_INT_XPKT_ETH;
 +            }
 +        }
 +
 +        if (flags & FTGMAC100_TXDES1_TX2FIC) {
 +            s->isr |= FTGMAC100_INT_XPKT_FIFO;
 +        }
 +        bd.des0 &= ~FTGMAC100_TXDES0_TXDMA_OWN;
 +
 +        /* Write back the modified descriptor.  */
 +        ftgmac100_write_bd(&bd, addr);
 +        /* Advance to the next descriptor.  */
 +        if (bd.des0 & FTGMAC100_TXDES0_EDOTR) {
 +            addr = tx_ring;
 +        } else {
 +            addr += sizeof(FTGMAC100Desc);
 +        }
 +    }
 +
 +    s->tx_descriptor = addr;
 +
 +    ftgmac100_update_irq(s);
 +}
 +
 +static int ftgmac100_can_receive(NetClientState *nc)
 +{
 +    FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc));
 +    FTGMAC100Desc bd;
 +
 +    if ((s->maccr & (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN))
 +         != (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN)) {
 +        return 0;
 +    }
 +
 +    if (ftgmac100_read_bd(&bd, s->rx_descriptor)) {
 +        return 0;
 +    }
 +    return !(bd.des0 & FTGMAC100_RXDES0_RXPKT_RDY);
 +}
 +
 +/*
 + * This is purely informative. The HW can poll the RW (and RX) ring
 + * buffers for available descriptors but we don't need to trigger a
 + * timer for that in qemu.
 + */
 +static uint32_t ftgmac100_rxpoll(FTGMAC100State *s)
 +{
 +    /* Polling times :
 +     *
 +     * Speed      TIME_SEL=0    TIME_SEL=1
 +     *
 +     *    10         51.2 ms      819.2 ms
 +     *   100         5.12 ms      81.92 ms
 +     *  1000        1.024 ms     16.384 ms
 +     */
 +    static const int div[] = { 20, 200, 1000 };
 +
 +    uint32_t cnt = 1024 * FTGMAC100_APTC_RXPOLL_CNT(s->aptcr);
 +    uint32_t speed = (s->maccr & FTGMAC100_MACCR_FAST_MODE) ? 1 : 0;
 +    uint32_t period;
 +
 +    if (s->aptcr & FTGMAC100_APTC_RXPOLL_TIME_SEL) {
 +        cnt <<= 4;
 +    }
 +
 +    if (s->maccr & FTGMAC100_MACCR_GIGA_MODE) {
 +        speed = 2;
 +    }
 +
 +    period = cnt / div[speed];
 +
 +    return period;
 +}
 +
 +static void ftgmac100_reset(DeviceState *d)
 +{
 +    FTGMAC100State *s = FTGMAC100(d);
 +
 +    /* Reset the FTGMAC100 */
 +    s->isr = 0;
 +    s->ier = 0;
 +    s->rx_enabled = 0;
 +    s->rx_ring = 0;
 +    s->rbsr = 0x640;
 +    s->rx_descriptor = 0;
 +    s->tx_ring = 0;
 +    s->tx_descriptor = 0;
 +    s->math[0] = 0;
 +    s->math[1] = 0;
 +    s->itc = 0;
 +    s->aptcr = 1;
 +    s->dblac = 0x00022f00;
 +    s->revr = 0;
 +    s->fear1 = 0;
 +    s->tpafcr = 0xf1;
 +
 +    s->maccr = 0;
 +    s->phycr = 0;
 +    s->phydata = 0;
 +    s->fcr = 0x400;
 +
 +    /* and the PHY */
 +    phy_reset(s);
 +}
 +
 +static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size)
 +{
 +    FTGMAC100State *s = FTGMAC100(opaque);
 +
 +    switch (addr & 0xff) {
 +    case FTGMAC100_ISR:
 +        return s->isr;
 +    case FTGMAC100_IER:
 +        return s->ier;
 +    case FTGMAC100_MAC_MADR:
 +        return (s->conf.macaddr.a[0] << 8)  | s->conf.macaddr.a[1];
 +    case FTGMAC100_MAC_LADR:
 +        return ((uint32_t) s->conf.macaddr.a[2] << 24) |
 +            (s->conf.macaddr.a[3] << 16) | (s->conf.macaddr.a[4] << 8) |
 +            s->conf.macaddr.a[5];
 +    case FTGMAC100_MATH0:
 +        return s->math[0];
 +    case FTGMAC100_MATH1:
 +        return s->math[1];
 +    case FTGMAC100_ITC:
 +        return s->itc;
 +    case FTGMAC100_DBLAC:
 +        return s->dblac;
 +    case FTGMAC100_REVR:
 +        return s->revr;
 +    case FTGMAC100_FEAR1:
 +        return s->fear1;
 +    case FTGMAC100_TPAFCR:
 +        return s->tpafcr;
 +    case FTGMAC100_FCR:
 +        return s->fcr;
 +    case FTGMAC100_MACCR:
 +        return s->maccr;
 +    case FTGMAC100_PHYCR:
 +        return s->phycr;
 +    case FTGMAC100_PHYDATA:
 +        return s->phydata;
 +
 +        /* We might want to support these one day */
 +    case FTGMAC100_HPTXPD: /* High Priority Transmit Poll Demand */
 +    case FTGMAC100_HPTXR_BADR: /* High Priority Transmit Ring Base Address */
 +    case FTGMAC100_MACSR: /* MAC Status Register (MACSR) */
 +        qemu_log_mask(LOG_UNIMP, "%s: read to unimplemented register 0x%"
 +                      HWADDR_PRIx "\n", __func__, addr);
 +        return 0;
 +    default:
 +        qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%"
 +                      HWADDR_PRIx "\n", __func__, addr);
 +        return 0;
 +    }
 +}
 +
 +static void ftgmac100_write(void *opaque, hwaddr addr,
 +                          uint64_t value, unsigned size)
 +{
 +    FTGMAC100State *s = FTGMAC100(opaque);
 +    int reg;
 +
 +    switch (addr & 0xff) {
 +    case FTGMAC100_ISR: /* Interrupt status */
 +        s->isr &= ~value;
 +        break;
 +    case FTGMAC100_IER: /* Interrupt control */
 +        s->ier = value;
 +        break;
 +    case FTGMAC100_MAC_MADR: /* MAC */
 +        s->conf.macaddr.a[0] = value >> 8;
 +        s->conf.macaddr.a[1] = value;
 +        break;
 +    case FTGMAC100_MAC_LADR:
 +        s->conf.macaddr.a[2] = value >> 24;
 +        s->conf.macaddr.a[3] = value >> 16;
 +        s->conf.macaddr.a[4] = value >> 8;
 +        s->conf.macaddr.a[5] = value;
 +        break;
 +    case FTGMAC100_MATH0: /* Multicast Address Hash Table 0 */
 +        s->math[0] = value;
 +        break;
 +    case FTGMAC100_MATH1: /* Multicast Address Hash Table 1 */
 +        s->math[1] = value;
 +        break;
 +    case FTGMAC100_ITC: /* TODO: Interrupt Timer Control */
 +        s->itc = value;
 +        break;
 +    case FTGMAC100_RXR_BADR: /* Ring buffer address */
 +        s->rx_ring = value;
 +        s->rx_descriptor = s->rx_ring;
 +        break;
 +
 +    case FTGMAC100_RBSR: /* DMA buffer size */
 +        s->rbsr = value;
 +        break;
 +
 +    case FTGMAC100_NPTXR_BADR: /* Transmit buffer address */
 +        s->tx_ring = value;
 +        s->tx_descriptor = s->tx_ring;
 +        break;
 +
 +    case FTGMAC100_NPTXPD: /* Trigger transmit */
 +        if ((s->maccr & (FTGMAC100_MACCR_TXDMA_EN | FTGMAC100_MACCR_TXMAC_EN))
 +            == (FTGMAC100_MACCR_TXDMA_EN | FTGMAC100_MACCR_TXMAC_EN)) {
 +            /* TODO: high priority tx ring */
 +            ftgmac100_do_tx(s, s->tx_ring, s->tx_descriptor);
 +        }
 +        if (ftgmac100_can_receive(qemu_get_queue(s->nic))) {
 +            qemu_flush_queued_packets(qemu_get_queue(s->nic));
 +        }
 +        break;
 +
 +    case FTGMAC100_RXPD: /* Receive Poll Demand Register */
 +        if (ftgmac100_can_receive(qemu_get_queue(s->nic))) {
 +            qemu_flush_queued_packets(qemu_get_queue(s->nic));
 +        }
 +        break;
 +
 +    case FTGMAC100_APTC: /* Automatic polling */
 +        s->aptcr = value;
 +
 +        if (FTGMAC100_APTC_RXPOLL_CNT(s->aptcr)) {
 +            ftgmac100_rxpoll(s);
 +        }
 +
 +        if (FTGMAC100_APTC_TXPOLL_CNT(s->aptcr)) {
 +            qemu_log_mask(LOG_UNIMP, "%s: no transmit polling\n", __func__);
 +        }
 +        break;
 +
 +    case FTGMAC100_MACCR: /* MAC Device control */
 +        s->maccr = value;
 +        if (value & FTGMAC100_MACCR_SW_RST) {
 +            ftgmac100_reset(DEVICE(s));
 +        }
 +
 +        if (ftgmac100_can_receive(qemu_get_queue(s->nic))) {
 +            qemu_flush_queued_packets(qemu_get_queue(s->nic));
 +        }
 +        break;
 +
 +    case FTGMAC100_PHYCR:  /* PHY Device control */
 +        reg = FTGMAC100_PHYCR_REG(value);
 +        s->phycr = value;
 +        if (value & FTGMAC100_PHYCR_MIIWR) {
 +            do_phy_write(s, reg, s->phydata & 0xffff);
 +            s->phycr &= ~FTGMAC100_PHYCR_MIIWR;
 +        } else {
 +            s->phydata = do_phy_read(s, reg) << 16;
 +            s->phycr &= ~FTGMAC100_PHYCR_MIIRD;
 +        }
 +        break;
 +    case FTGMAC100_PHYDATA:
 +        s->phydata = value & 0xffff;
 +        break;
 +    case FTGMAC100_DBLAC: /* DMA Burst Length and Arbitration Control */
 +        s->dblac = value;
 +        break;
 +    case FTGMAC100_REVR:  /* Feature Register */
 +        /* TODO: Only Old MDIO interface is supported */
 +        s->revr = value & ~FTGMAC100_REVR_NEW_MDIO_INTERFACE;
 +        break;
 +    case FTGMAC100_FEAR1: /* Feature Register 1 */
 +        s->fear1 = value;
 +        break;
 +    case FTGMAC100_TPAFCR: /* Transmit Priority Arbitration and FIFO Control */
 +        s->tpafcr = value;
 +        break;
 +    case FTGMAC100_FCR: /* Flow Control  */
 +        s->fcr  = value;
 +        break;
 +
 +    case FTGMAC100_HPTXPD: /* High Priority Transmit Poll Demand */
 +    case FTGMAC100_HPTXR_BADR: /* High Priority Transmit Ring Base Address */
 +    case FTGMAC100_MACSR: /* MAC Status Register (MACSR) */
 +        qemu_log_mask(LOG_UNIMP, "%s: write to unimplemented register 0x%"
 +                      HWADDR_PRIx "\n", __func__, addr);
 +        break;
 +    default:
 +        qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%"
 +                      HWADDR_PRIx "\n", __func__, addr);
 +        break;
 +    }
 +
 +    ftgmac100_update_irq(s);
 +}
 +
 +static int ftgmac100_filter(FTGMAC100State *s, const uint8_t *buf, size_t len)
 +{
 +    unsigned mcast_idx;
 +
 +    if (s->maccr & FTGMAC100_MACCR_RX_ALL) {
 +        return 1;
 +    }
 +
 +    switch (get_eth_packet_type(PKT_GET_ETH_HDR(buf))) {
 +    case ETH_PKT_BCAST:
 +        if (!(s->maccr & FTGMAC100_MACCR_RX_BROADPKT)) {
 +            return 0;
 +        }
 +        break;
 +    case ETH_PKT_MCAST:
 +        if (!(s->maccr & FTGMAC100_MACCR_RX_MULTIPKT)) {
 +            if (!(s->maccr & FTGMAC100_MACCR_HT_MULTI_EN)) {
 +                return 0;
 +            }
 +
 +            /* TODO: this does not seem to work for ftgmac100 */
 +            mcast_idx = compute_mcast_idx(buf);
 +            if (!(s->math[mcast_idx / 32] & (1 << (mcast_idx % 32)))) {
 +                return 0;
 +            }
 +        }
 +        break;
 +    case ETH_PKT_UCAST:
 +        if (memcmp(s->conf.macaddr.a, buf, 6)) {
 +            return 0;
 +        }
 +        break;
 +    }
 +
 +    return 1;
 +}
 +
 +static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf,
 +                                 size_t len)
 +{
 +    FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc));
 +    FTGMAC100Desc bd;
 +    uint32_t flags = 0;
 +    uint32_t addr;
 +    uint32_t crc;
 +    uint32_t buf_addr;
 +    uint8_t *crc_ptr;
 +    uint32_t buf_len;
 +    size_t size = len;
 +    uint32_t first = FTGMAC100_RXDES0_FRS;
 +    int max_frame_size = ftgmac100_max_frame_size(s);
 +
 +    if ((s->maccr & (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN))
 +         != (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN)) {
 +        return -1;
 +    }
 +
 +    /* TODO : Pad to minimum Ethernet frame length */
 +    /* handle small packets.  */
 +    if (size < 10) {
 +        qemu_log_mask(LOG_GUEST_ERROR, "%s: dropped frame of %zd bytes\n",
 +                      __func__, size);
 +        return size;
 +    }
 +
 +    if (size < 64 && !(s->maccr & FTGMAC100_MACCR_RX_RUNT)) {
 +        qemu_log_mask(LOG_GUEST_ERROR, "%s: dropped runt frame of %zd bytes\n",
 +                      __func__, size);
 +        return size;
 +    }
 +
 +    if (!ftgmac100_filter(s, buf, size)) {
 +        return size;
 +    }
 +
 +    /* 4 bytes for the CRC.  */
 +    size += 4;
 +    crc = cpu_to_be32(crc32(~0, buf, size));
 +    crc_ptr = (uint8_t *) &crc;
 +
 +    /* Huge frames are truncated.  */
 +    if (size > max_frame_size) {
 +        size = max_frame_size;
 +        qemu_log_mask(LOG_GUEST_ERROR, "%s: frame too big : %zd bytes\n",
 +                      __func__, size);
 +        flags |= FTGMAC100_RXDES0_FTL;
 +    }
 +
 +    switch (get_eth_packet_type(PKT_GET_ETH_HDR(buf))) {
 +    case ETH_PKT_BCAST:
 +        flags |= FTGMAC100_RXDES0_BROADCAST;
 +        break;
 +    case ETH_PKT_MCAST:
 +        flags |= FTGMAC100_RXDES0_MULTICAST;
 +        break;
 +    case ETH_PKT_UCAST:
 +        break;
 +    }
 +
 +    addr = s->rx_descriptor;
 +    while (size > 0) {
 +        if (!ftgmac100_can_receive(nc)) {
 +            qemu_log_mask(LOG_GUEST_ERROR, "%s: Unexpected packet\n", __func__);
 +            return -1;
 +        }
 +
 +        if (ftgmac100_read_bd(&bd, addr) ||
 +            (bd.des0 & FTGMAC100_RXDES0_RXPKT_RDY)) {
 +            /* No descriptors available.  Bail out.  */
 +            qemu_log_mask(LOG_GUEST_ERROR, "%s: Lost end of frame\n",
 +                          __func__);
 +            s->isr |= FTGMAC100_INT_NO_RXBUF;
 +            break;
 +        }
 +        buf_len = (size <= s->rbsr) ? size : s->rbsr;
 +        bd.des0 |= buf_len & 0x3fff;
 +        size -= buf_len;
 +
 +        /* The last 4 bytes are the CRC.  */
 +        if (size < 4) {
 +            buf_len += size - 4;
 +        }
 +        buf_addr = bd.des3;
 +        dma_memory_write(&address_space_memory, buf_addr, buf, buf_len);
 +        buf += buf_len;
 +        if (size < 4) {
 +            dma_memory_write(&address_space_memory, buf_addr + buf_len,
 +                             crc_ptr, 4 - size);
 +            crc_ptr += 4 - size;
 +        }
 +
 +        bd.des0 |= first | FTGMAC100_RXDES0_RXPKT_RDY;
 +        first = 0;
 +        if (size == 0) {
 +            /* Last buffer in frame.  */
 +            bd.des0 |= flags | FTGMAC100_RXDES0_LRS;
 +            s->isr |= FTGMAC100_INT_RPKT_BUF;
 +        } else {
 +            s->isr |= FTGMAC100_INT_RPKT_FIFO;
 +        }
 +        ftgmac100_write_bd(&bd, addr);
 +        if (bd.des0 & FTGMAC100_RXDES0_EDORR) {
 +            addr = s->rx_ring;
 +        } else {
 +            addr += sizeof(FTGMAC100Desc);
 +        }
 +    }
 +    s->rx_descriptor = addr;
 +
 +    ftgmac100_update_irq(s);
 +    return len;
 +}
 +
 +static const MemoryRegionOps ftgmac100_ops = {
 +    .read = ftgmac100_read,
 +    .write = ftgmac100_write,
 +    .valid.min_access_size = 4,
 +    .valid.max_access_size = 4,
 +    .endianness = DEVICE_LITTLE_ENDIAN,
 +};
 +
 +static void ftgmac100_cleanup(NetClientState *nc)
 +{
 +    FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc));
 +
 +    s->nic = NULL;
 +}
 +
 +static NetClientInfo net_ftgmac100_info = {
 +    .type = NET_CLIENT_DRIVER_NIC,
 +    .size = sizeof(NICState),
 +    .can_receive = ftgmac100_can_receive,
 +    .receive = ftgmac100_receive,
 +    .cleanup = ftgmac100_cleanup,
 +    .link_status_changed = ftgmac100_set_link,
 +};
 +
 +static void ftgmac100_realize(DeviceState *dev, Error **errp)
 +{
 +    FTGMAC100State *s = FTGMAC100(dev);
 +    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 +
 +    memory_region_init_io(&s->iomem, OBJECT(dev), &ftgmac100_ops, s,
 +                          TYPE_FTGMAC100, 0x2000);
 +    sysbus_init_mmio(sbd, &s->iomem);
 +    sysbus_init_irq(sbd, &s->irq);
 +    qemu_macaddr_default_if_unset(&s->conf.macaddr);
 +
 +    s->conf.peers.ncs[0] = nd_table[0].netdev;
 +
 +    s->nic = qemu_new_nic(&net_ftgmac100_info, &s->conf,
 +                          object_get_typename(OBJECT(dev)), DEVICE(dev)->id,
 +                          s);
 +    qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
 +
 +    s->frame = g_malloc(FTGMAC100_MAX_FRAME_SIZE);
 +}
 +
 +static const VMStateDescription vmstate_ftgmac100 = {
 +    .name = TYPE_FTGMAC100,
 +    .version_id = 1,
 +    .minimum_version_id = 1,
 +    .fields = (VMStateField[]) {
 +        VMSTATE_UINT32(irq_state, FTGMAC100State),
 +        VMSTATE_UINT32(isr, FTGMAC100State),
 +        VMSTATE_UINT32(ier, FTGMAC100State),
 +        VMSTATE_UINT32(rx_enabled, FTGMAC100State),
 +        VMSTATE_UINT32(rx_ring, FTGMAC100State),
 +        VMSTATE_UINT32(rbsr, FTGMAC100State),
 +        VMSTATE_UINT32(tx_ring, FTGMAC100State),
 +        VMSTATE_UINT32(rx_descriptor, FTGMAC100State),
 +        VMSTATE_UINT32(tx_descriptor, FTGMAC100State),
 +        VMSTATE_UINT32_ARRAY(math, FTGMAC100State, 2),
 +        VMSTATE_UINT32(itc, FTGMAC100State),
 +        VMSTATE_UINT32(aptcr, FTGMAC100State),
 +        VMSTATE_UINT32(dblac, FTGMAC100State),
 +        VMSTATE_UINT32(revr, FTGMAC100State),
 +        VMSTATE_UINT32(fear1, FTGMAC100State),
 +        VMSTATE_UINT32(tpafcr, FTGMAC100State),
 +        VMSTATE_UINT32(maccr, FTGMAC100State),
 +        VMSTATE_UINT32(phycr, FTGMAC100State),
 +        VMSTATE_UINT32(phydata, FTGMAC100State),
 +        VMSTATE_UINT32(fcr, FTGMAC100State),
 +        VMSTATE_UINT32(phy_status, FTGMAC100State),
 +        VMSTATE_UINT32(phy_control, FTGMAC100State),
 +        VMSTATE_UINT32(phy_advertise, FTGMAC100State),
 +        VMSTATE_UINT32(phy_int, FTGMAC100State),
 +        VMSTATE_UINT32(phy_int_mask, FTGMAC100State),
 +        VMSTATE_END_OF_LIST()
 +    }
 +};
 +
 +static Property ftgmac100_properties[] = {
 +    DEFINE_NIC_PROPERTIES(FTGMAC100State, conf),
 +    DEFINE_PROP_END_OF_LIST(),
 +};
 +
 +static void ftgmac100_class_init(ObjectClass *klass, void *data)
 +{
 +    DeviceClass *dc = DEVICE_CLASS(klass);
 +
 +    dc->vmsd = &vmstate_ftgmac100;
 +    dc->reset = ftgmac100_reset;
 +    dc->props = ftgmac100_properties;
 +    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
 +    dc->realize = ftgmac100_realize;
 +    dc->desc = "Faraday FTGMAC100 Gigabit Ethernet emulation";
 +}
 +
 +static const TypeInfo ftgmac100_info = {
 +    .name = TYPE_FTGMAC100,
 +    .parent = TYPE_SYS_BUS_DEVICE,
 +    .instance_size = sizeof(FTGMAC100State),
 +    .class_init = ftgmac100_class_init,
 +};
 +
 +static void ftgmac100_register_types(void)
 +{
 +    type_register_static(&ftgmac100_info);
 +}
 +
 +type_init(ftgmac100_register_types)
 diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/include/hw/net/ftgmac100.h
@@ -XXX,XX +XXX,XX @@
 +/*
 + * Faraday FTGMAC100 Gigabit Ethernet
 + *
 + * Copyright (C) 2016-2017, IBM Corporation.
 + *
 + * This code is licensed under the GPL version 2 or later. See the
 + * COPYING file in the top-level directory.
 + */
 +
 +#ifndef FTGMAC100_H
 +#define FTGMAC100_H
 +
 +#define TYPE_FTGMAC100 "ftgmac100"
 +#define FTGMAC100(obj) OBJECT_CHECK(FTGMAC100State, (obj), TYPE_FTGMAC100)
 +
 +#include "hw/sysbus.h"
 +#include "net/net.h"
 +
 +typedef struct FTGMAC100State {
 +    /*< private >*/
 +    SysBusDevice parent_obj;
 +
 +    /*< public >*/
 +    NICState *nic;
 +    NICConf conf;
 +    qemu_irq irq;
 +    MemoryRegion iomem;
 +
 +    uint8_t *frame;
 +
 +    uint32_t irq_state;
 +    uint32_t isr;
 +    uint32_t ier;
 +    uint32_t rx_enabled;
 +    uint32_t rx_ring;
 +    uint32_t rx_descriptor;
 +    uint32_t tx_ring;
 +    uint32_t tx_descriptor;
 +    uint32_t math[2];
 +    uint32_t rbsr;
 +    uint32_t itc;
 +    uint32_t aptcr;
 +    uint32_t dblac;
 +    uint32_t revr;
 +    uint32_t fear1;
 +    uint32_t tpafcr;
 +    uint32_t maccr;
 +    uint32_t phycr;
 +    uint32_t phydata;
 +    uint32_t fcr;
 +
 +
 +    uint32_t phy_status;
 +    uint32_t phy_control;
 +    uint32_t phy_advertise;
 +    uint32_t phy_int;
 +    uint32_t phy_int_mask;
 +} FTGMAC100State;
 +
 +#endif
 --
 .7.4

-[Qemu-devel] [PULL 05/18] net/rocker: Fix the unusual macro name
+[Qemu-devel] [PULL V2 4/8] net/ftgmac100: add a 'aspeed' property
-From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
+From: Cédric Le Goater <clg@kaod.org>
-Cc: jasowang@redhat.com
+The Aspeed SoCs have a different definition of the end of the ring
-Cc: jiri@resnulli.us
+buffer bit. Add a property to specify which set of bits should be used
-Cc: armbru@redhat.com
+by the NIC.
-Cc: f4bug@amsat.org
-Suggested-by: Markus Armbruster <armbru@redhat.com>
+Signed-off-by: Cédric Le Goater <clg@kaod.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>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- hw/net/rocker/rocker.c | 18 +++++++++---------
+ hw/net/ftgmac100.c         | 17 +++++++++++++++--
-file changed, 9 insertions(+), 9 deletions(-)
+ include/hw/net/ftgmac100.h |  4 ++++
 files changed, 19 insertions(+), 2 deletions(-)
-diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
+diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
 index XXXXXXX..XXXXXXX 100644
---- a/hw/net/rocker/rocker.c
+--- a/hw/net/ftgmac100.c
-+++ b/hw/net/rocker/rocker.c
++++ b/hw/net/ftgmac100.c
-@@ -XXX,XX +XXX,XX @@ struct rocker {
+@@ -XXX,XX +XXX,XX @@
-     QLIST_ENTRY(rocker) next;
+ #define FTGMAC100_TXDES0_CRC_ERR         (1 << 19)
  #define FTGMAC100_TXDES0_LTS             (1 << 28)
  #define FTGMAC100_TXDES0_FTS             (1 << 29)
 +#define FTGMAC100_TXDES0_EDOTR_ASPEED    (1 << 30)
  #define FTGMAC100_TXDES0_TXDMA_OWN       (1 << 31)
  #define FTGMAC100_TXDES1_VLANTAG_CI(x)   ((x) & 0xffff)
@@ -XXX,XX +XXX,XX @@
  #define FTGMAC100_RXDES0_PAUSE_FRAME     (1 << 25)
  #define FTGMAC100_RXDES0_LRS             (1 << 28)
  #define FTGMAC100_RXDES0_FRS             (1 << 29)
 +#define FTGMAC100_RXDES0_EDORR_ASPEED    (1 << 30)
  #define FTGMAC100_RXDES0_RXPKT_RDY       (1 << 31)
  #define FTGMAC100_RXDES1_VLANTAG_CI      0xffff
@@ -XXX,XX +XXX,XX @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring,
          /* Write back the modified descriptor.  */
          ftgmac100_write_bd(&bd, addr);
          /* Advance to the next descriptor.  */
 -        if (bd.des0 & FTGMAC100_TXDES0_EDOTR) {
 +        if (bd.des0 & s->txdes0_edotr) {
              addr = tx_ring;
          } else {
              addr += sizeof(FTGMAC100Desc);
@@ -XXX,XX +XXX,XX @@ static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf,
              s->isr |= FTGMAC100_INT_RPKT_FIFO;
          }
          ftgmac100_write_bd(&bd, addr);
 -        if (bd.des0 & FTGMAC100_RXDES0_EDORR) {
 +        if (bd.des0 & s->rxdes0_edorr) {
              addr = s->rx_ring;
          } else {
              addr += sizeof(FTGMAC100Desc);
@@ -XXX,XX +XXX,XX @@ static void ftgmac100_realize(DeviceState *dev, Error **errp)
      FTGMAC100State *s = FTGMAC100(dev);
      SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 +    if (s->aspeed) {
 +        s->txdes0_edotr = FTGMAC100_TXDES0_EDOTR_ASPEED;
 +        s->rxdes0_edorr = FTGMAC100_RXDES0_EDORR_ASPEED;
 +    } else {
 +        s->txdes0_edotr = FTGMAC100_TXDES0_EDOTR;
 +        s->rxdes0_edorr = FTGMAC100_RXDES0_EDORR;
 +    }
 +
      memory_region_init_io(&s->iomem, OBJECT(dev), &ftgmac100_ops, s,
                            TYPE_FTGMAC100, 0x2000);
      sysbus_init_mmio(sbd, &s->iomem);
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_ftgmac100 = {
          VMSTATE_UINT32(phy_advertise, FTGMAC100State),
          VMSTATE_UINT32(phy_int, FTGMAC100State),
          VMSTATE_UINT32(phy_int_mask, FTGMAC100State),
 +        VMSTATE_UINT32(txdes0_edotr, FTGMAC100State),
 +        VMSTATE_UINT32(rxdes0_edorr, FTGMAC100State),
          VMSTATE_END_OF_LIST()
      }
  };
--#define ROCKER "rocker"
+ static Property ftgmac100_properties[] = {
-+#define TYPE_ROCKER "rocker"
++    DEFINE_PROP_BOOL("aspeed", FTGMAC100State, aspeed, false),
+     DEFINE_NIC_PROPERTIES(FTGMAC100State, conf),
--#define to_rocker(obj) \
+     DEFINE_PROP_END_OF_LIST(),
 -    OBJECT_CHECK(Rocker, (obj), ROCKER)
 +#define ROCKER(obj) \
 +    OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER)
  static QLIST_HEAD(, rocker) rockers;
@@ -XXX,XX +XXX,XX @@ static World *rocker_world_type_by_name(Rocker *r, const char *name)
  static void pci_rocker_realize(PCIDevice *dev, Error **errp)
  {
 -    Rocker *r = to_rocker(dev);
 +    Rocker *r = ROCKER(dev);
      const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };
      const MACAddr dflt = { .a = { 0x52, 0x54, 0x00, 0x12, 0x35, 0x01 } };
      static int sw_index;
@@ -XXX,XX +XXX,XX @@ static void pci_rocker_realize(PCIDevice *dev, Error **errp)
      /* validate switch properties */
      if (!r->name) {
 -        r->name = g_strdup(ROCKER);
 +        r->name = g_strdup(TYPE_ROCKER);
      }
      if (rocker_find(r->name)) {
@@ -XXX,XX +XXX,XX @@ err_world_type_by_name:
  static void pci_rocker_uninit(PCIDevice *dev)
  {
 -    Rocker *r = to_rocker(dev);
 +    Rocker *r = ROCKER(dev);
      int i;
      QLIST_REMOVE(r, next);
@@ -XXX,XX +XXX,XX @@ static void pci_rocker_uninit(PCIDevice *dev)
  static void rocker_reset(DeviceState *dev)
  {
 -    Rocker *r = to_rocker(dev);
 +    Rocker *r = ROCKER(dev);
      int i;
      for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
@@ -XXX,XX +XXX,XX @@ static Property rocker_properties[] = {
  };
+diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h
- static const VMStateDescription rocker_vmsd = {
+index XXXXXXX..XXXXXXX 100644
--    .name = ROCKER,
+--- a/include/hw/net/ftgmac100.h
-+    .name = TYPE_ROCKER,
++++ b/include/hw/net/ftgmac100.h
-     .unmigratable = 1,
+@@ -XXX,XX +XXX,XX @@ typedef struct FTGMAC100State {
- };
+     uint32_t phy_advertise;
+     uint32_t phy_int;
-@@ -XXX,XX +XXX,XX @@ static void rocker_class_init(ObjectClass *klass, void *data)
+     uint32_t phy_int_mask;
- }
++
++    bool aspeed;
- static const TypeInfo rocker_info = {
++    uint32_t txdes0_edotr;
--    .name          = ROCKER,
++    uint32_t rxdes0_edorr;
-+    .name          = TYPE_ROCKER,
+ } FTGMAC100State;
-     .parent        = TYPE_PCI_DEVICE,
-     .instance_size = sizeof(Rocker),
+ #endif
      .class_init    = rocker_class_init,
 --
 .7.4

-[Qemu-devel] [PULL 04/18] net/rocker: Convert to realize()
+[Qemu-devel] [PULL V2 5/8] aspeed: add a FTGMAC100 nic
-From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
+From: Cédric Le Goater <clg@kaod.org>
-The rocker device still implements the old PCIDeviceClass .init()
+There is a second NIC but we do not use it for the moment. We use the
-instead of the new .realize(). All devices need to be converted to
+'aspeed' property to tune the definition of the end of ring buffer bit
-.realize().
+for the Aspeed SoCs.
-.init() reports errors with fprintf() and return 0 on success, negative
+Signed-off-by: Cédric Le Goater <clg@kaod.org>
 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>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- hw/net/rocker/rocker.c | 27 +++++++++++----------------
+ hw/arm/aspeed_soc.c         | 21 +++++++++++++++++++++
-file changed, 11 insertions(+), 16 deletions(-)
+ include/hw/arm/aspeed_soc.h |  2 ++
 files changed, 23 insertions(+)
-diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
+diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
 index XXXXXXX..XXXXXXX 100644
---- a/hw/net/rocker/rocker.c
+--- a/hw/arm/aspeed_soc.c
-+++ b/hw/net/rocker/rocker.c
++++ b/hw/arm/aspeed_soc.c
-@@ -XXX,XX +XXX,XX @@ rollback:
+@@ -XXX,XX +XXX,XX @@
-     return err;
+ #include "hw/char/serial.h"
  #include "qemu/log.h"
  #include "hw/i2c/aspeed_i2c.h"
 +#include "net/net.h"
  #define ASPEED_SOC_UART_5_BASE      0x00184000
  #define ASPEED_SOC_IOMEM_SIZE       0x00200000
@@ -XXX,XX +XXX,XX @@
  #define ASPEED_SOC_TIMER_BASE       0x1E782000
  #define ASPEED_SOC_WDT_BASE         0x1E785000
  #define ASPEED_SOC_I2C_BASE         0x1E78A000
 +#define ASPEED_SOC_ETH1_BASE        0x1E660000
 +#define ASPEED_SOC_ETH2_BASE        0x1E680000
  static const int uart_irqs[] = { 9, 32, 33, 34, 10 };
  static const int timer_irqs[] = { 16, 17, 18, 35, 36, 37, 38, 39, };
@@ -XXX,XX +XXX,XX @@ static void aspeed_soc_init(Object *obj)
      object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ASPEED_WDT);
      object_property_add_child(obj, "wdt", OBJECT(&s->wdt), NULL);
      qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());
 +
 +    object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);
 +    object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), NULL);
 +    qdev_set_parent_bus(DEVICE(&s->ftgmac100), sysbus_get_default());
  }
--static int rocker_msix_init(Rocker *r)
+ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
-+static int rocker_msix_init(Rocker *r, Error **errp)
+@@ -XXX,XX +XXX,XX @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
- {
+         return;
      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;
      }
+     sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt), 0, ASPEED_SOC_WDT_BASE);
-@@ -XXX,XX +XXX,XX @@ static World *rocker_world_type_by_name(Rocker *r, const char *name)
++
-     return NULL;
++    /* Net */
 +    qdev_set_nic_properties(DEVICE(&s->ftgmac100), &nd_table[0]);
 +    object_property_set_bool(OBJECT(&s->ftgmac100), true, "aspeed", &err);
 +    object_property_set_bool(OBJECT(&s->ftgmac100), true, "realized",
 +                             &local_err);
 +    error_propagate(&err, local_err);
 +    if (err) {
 +        error_propagate(errp, err);
 +        return;
 +    }
 +    sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100), 0, ASPEED_SOC_ETH1_BASE);
 +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100), 0,
 +                       qdev_get_gpio_in(DEVICE(&s->vic), 2));
  }
--static int pci_rocker_init(PCIDevice *dev)
+ static void aspeed_soc_class_init(ObjectClass *oc, void *data)
-+static void pci_rocker_realize(PCIDevice *dev, Error **errp)
+diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
- {
+index XXXXXXX..XXXXXXX 100644
-     Rocker *r = to_rocker(dev);
+--- a/include/hw/arm/aspeed_soc.h
-     const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };
++++ b/include/hw/arm/aspeed_soc.h
-@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
+@@ -XXX,XX +XXX,XX @@
+ #include "hw/i2c/aspeed_i2c.h"
-     r->world_dflt = rocker_world_type_by_name(r, r->world_name);
+ #include "hw/ssi/aspeed_smc.h"
-     if (!r->world_dflt) {
+ #include "hw/watchdog/wdt_aspeed.h"
--        fprintf(stderr,
++#include "hw/net/ftgmac100.h"
--                "rocker: requested world \"%s\" does not exist\n",
-+        error_setg(errp,
+ #define ASPEED_SPIS_NUM  2
-+                "invalid argument requested world %s does not exist",
-                 r->world_name);
+@@ -XXX,XX +XXX,XX @@ typedef struct AspeedSoCState {
--        err = -EINVAL;
+     AspeedSMCState spi[ASPEED_SPIS_NUM];
-         goto err_world_type_by_name;
+     AspeedSDMCState sdmc;
-     }
+     AspeedWDTState wdt;
++    FTGMAC100State ftgmac100;
-@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
+ } AspeedSoCState;
-     /* MSI-X init */
+ #define TYPE_ASPEED_SOC "aspeed-soc"
 -    err = rocker_msix_init(r);
 +    err = rocker_msix_init(r, errp);
      if (err) {
          goto err_msix_init;
      }
@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
      }
      if (rocker_find(r->name)) {
 -        err = -EEXIST;
 +        error_setg(errp, "%s already exists", r->name);
          goto err_duplicate;
      }
@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
  #define ROCKER_IFNAMSIZ 16
  #define MAX_ROCKER_NAME_LEN  (ROCKER_IFNAMSIZ - 1 - 3 - 3)
      if (strlen(r->name) > MAX_ROCKER_NAME_LEN) {
 -        fprintf(stderr,
 -                "rocker: name too long; please shorten to at most %d chars\n",
 +        error_setg(errp,
 +                "name too long; please shorten to at most %d chars",
                  MAX_ROCKER_NAME_LEN);
 -        err = -EINVAL;
          goto err_name_too_long;
      }
@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
      QLIST_INSERT_HEAD(&rockers, r, next);
 -    return 0;
 +    return;
  err_name_too_long:
  err_duplicate:
@@ -XXX,XX +XXX,XX @@ err_world_type_by_name:
              world_free(r->worlds[i]);
          }
      }
 -    return err;
  }
  static void pci_rocker_uninit(PCIDevice *dev)
@@ -XXX,XX +XXX,XX @@ static void rocker_class_init(ObjectClass *klass, void *data)
      DeviceClass *dc = DEVICE_CLASS(klass);
      PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 -    k->init = pci_rocker_init;
 +    k->realize = pci_rocker_realize;
      k->exit = pci_rocker_uninit;
      k->vendor_id = PCI_VENDOR_ID_REDHAT;
      k->device_id = PCI_DEVICE_ID_REDHAT_ROCKER;
 --
 .7.4

-[Qemu-devel] [PULL 06/18] net: rtl8139: do not use old_mmio accesses
+Deleted patch
-From: Matt Parker <mtparkr@gmail.com>
-Both io and memory use the same mmio functions in the rtl8139 device.
-This patch removes the separate MemoryRegionOps and old_mmio accessors
-for memory, and replaces it with an alias to the io memory region.
-Signed-off-by: Matt Parker <mtparkr@gmail.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- hw/net/rtl8139.c | 53 +++--------------------------------------------------
-file changed, 3 insertions(+), 50 deletions(-)
-diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/net/rtl8139.c
-+++ b/hw/net/rtl8139.c
-@@ -XXX,XX +XXX,XX @@ static uint32_t rtl8139_io_readl(void *opaque, uint8_t addr)
- /* */
--static void rtl8139_mmio_writeb(void *opaque, hwaddr addr, uint32_t val)
--{
--    rtl8139_io_writeb(opaque, addr & 0xFF, val);
--}
--
--static void rtl8139_mmio_writew(void *opaque, hwaddr addr, uint32_t val)
--{
--    rtl8139_io_writew(opaque, addr & 0xFF, val);
--}
--
--static void rtl8139_mmio_writel(void *opaque, hwaddr addr, uint32_t val)
--{
--    rtl8139_io_writel(opaque, addr & 0xFF, val);
--}
--
--static uint32_t rtl8139_mmio_readb(void *opaque, hwaddr addr)
--{
--    return rtl8139_io_readb(opaque, addr & 0xFF);
--}
--
--static uint32_t rtl8139_mmio_readw(void *opaque, hwaddr addr)
--{
--    uint32_t val = rtl8139_io_readw(opaque, addr & 0xFF);
--    return val;
--}
--
--static uint32_t rtl8139_mmio_readl(void *opaque, hwaddr addr)
--{
--    uint32_t val = rtl8139_io_readl(opaque, addr & 0xFF);
--    return val;
--}
--
- static int rtl8139_post_load(void *opaque, int version_id)
- {
-     RTL8139State* s = opaque;
-@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps rtl8139_io_ops = {
-     .endianness = DEVICE_LITTLE_ENDIAN,
- };
--static const MemoryRegionOps rtl8139_mmio_ops = {
--    .old_mmio = {
--        .read = {
--            rtl8139_mmio_readb,
--            rtl8139_mmio_readw,
--            rtl8139_mmio_readl,
--        },
--        .write = {
--            rtl8139_mmio_writeb,
--            rtl8139_mmio_writew,
--            rtl8139_mmio_writel,
--        },
--    },
--    .endianness = DEVICE_LITTLE_ENDIAN,
--};
--
- static void rtl8139_timer(void *opaque)
- {
-     RTL8139State *s = opaque;
-@@ -XXX,XX +XXX,XX @@ static void pci_rtl8139_realize(PCIDevice *dev, Error **errp)
-     memory_region_init_io(&s->bar_io, OBJECT(s), &rtl8139_io_ops, s,
-                           "rtl8139", 0x100);
--    memory_region_init_io(&s->bar_mem, OBJECT(s), &rtl8139_mmio_ops, s,
--                          "rtl8139", 0x100);
-+    memory_region_init_alias(&s->bar_mem, OBJECT(s), "rtl8139-mem", &s->bar_io,
-+                             0, 0x100);
-+
-     pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->bar_io);
-     pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar_mem);
---
-.7.4

-[Qemu-devel] [PULL 07/18] MAINTAINERS: Update mail address for COLO Proxy
+Deleted patch
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-My Fujitsu mail account will be disabled soon, update the mail info
-to my private mail.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- MAINTAINERS | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/MAINTAINERS b/MAINTAINERS
-index XXXXXXX..XXXXXXX 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ F: include/migration/failover.h
- F: docs/COLO-FT.txt
- COLO Proxy
--M: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-+M: Zhang Chen <zhangckid@gmail.com>
- M: Li Zhijian <lizhijian@cn.fujitsu.com>
- S: Supported
- F: docs/colo-proxy.txt
---
-.7.4

-[Qemu-devel] [PULL 08/18] net/socket: Don't treat odd socket type as SOCK_STREAM
+Deleted patch
-From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
-In net_socket_fd_init(), the 'default' case is odd: it warns,
-then continues as if the socket type was SOCK_STREAM. The
-comment explains "this could be a eg. a pty", but that makes
-no sense. If @fd really was a pty, getsockopt() would fail
-with ENOTSOCK. If @fd was a socket, but neither SOCK_DGRAM nor
-SOCK_STREAM. It should not be treated as if it was SOCK_STREAM.
-Turn this case into an Error. If there is a genuine reason to
-support something like SOCK_RAW, it should be explicitly
-handled.
-Cc: jasowang@redhat.com
-Cc: armbru@redhat.com
-Cc: berrange@redhat.com
-Cc: armbru@redhat.com
-Cc: eblake@redhat.com
-Suggested-by: Markus Armbruster <armbru@redhat.com>
-Suggested-by: Daniel P. Berrange <berrange@redhat.com>
-Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- net/socket.c | 6 +++---
-file changed, 3 insertions(+), 3 deletions(-)
-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(NetClientState *peer,
-     case SOCK_STREAM:
-         return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
-     default:
--        /* who knows ... this could be a eg. a pty, do warn and continue as stream */
--        fprintf(stderr, "qemu: warning: socket type=%d for fd=%d is not SOCK_DGRAM or SOCK_STREAM\n", so_type, fd);
--        return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
-+        error_report("socket type=%d for fd=%d must be either"
-+                     " SOCK_DGRAM or SOCK_STREAM", so_type, fd);
-+        closesocket(fd);
-     }
-     return NULL;
- }
---
-.7.4

-[Qemu-devel] [PULL 09/18] net/socket: Convert several helper functions to Error
+Deleted patch
-From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
-Currently, net_socket_mcast_create(), net_socket_fd_init_dgram() and
-net_socket_fd_init() use the function such as fprintf(), perror() to
-report an error message.
-Now, convert these functions to Error.
-Cc: jasowang@redhat.com
-Cc: armbru@redhat.com
-Cc: berrange@redhat.com
-Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
-Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- net/socket.c | 82 ++++++++++++++++++++++++++++++++++++------------------------
-file changed, 50 insertions(+), 32 deletions(-)
-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 void net_socket_send_dgram(void *opaque)
-     }
- }
--static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr *localaddr)
-+static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,
-+                                   struct in_addr *localaddr,
-+                                   Error **errp)
- {
-     struct ip_mreq imr;
-     int fd;
-@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
- #endif
-     if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
--        fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) "
--                "does not contain a multicast address\n",
--                inet_ntoa(mcastaddr->sin_addr),
--                (int)ntohl(mcastaddr->sin_addr.s_addr));
-+        error_setg(errp, "specified mcastaddr %s (0x%08x) "
-+                   "does not contain a multicast address",
-+                   inet_ntoa(mcastaddr->sin_addr),
-+                   (int)ntohl(mcastaddr->sin_addr.s_addr));
-         return -1;
--
-     }
-+
-     fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
-     if (fd < 0) {
--        perror("socket(PF_INET, SOCK_DGRAM)");
-+        error_setg_errno(errp, errno, "can't create datagram socket");
-         return -1;
-     }
-@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
-     val = 1;
-     ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
-     if (ret < 0) {
--        perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)");
-+        error_setg_errno(errp, errno,
-+                         "can't set socket option SO_REUSEADDR");
-         goto fail;
-     }
-     ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));
-     if (ret < 0) {
--        perror("bind");
-+        error_setg_errno(errp, errno, "can't bind ip=%s to socket",
-+                         inet_ntoa(mcastaddr->sin_addr));
-         goto fail;
-     }
-@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
-     ret = qemu_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-                           &imr, sizeof(struct ip_mreq));
-     if (ret < 0) {
--        perror("setsockopt(IP_ADD_MEMBERSHIP)");
-+        error_setg_errno(errp, errno,
-+                         "can't add socket to multicast group %s",
-+                         inet_ntoa(imr.imr_multiaddr));
-         goto fail;
-     }
-@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
-     ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
-                           &loop, sizeof(loop));
-     if (ret < 0) {
--        perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)");
-+        error_setg_errno(errp, errno,
-+                         "can't force multicast message to loopback");
-         goto fail;
-     }
-@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
-         ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
-                               localaddr, sizeof(*localaddr));
-         if (ret < 0) {
--            perror("setsockopt(IP_MULTICAST_IF)");
-+            error_setg_errno(errp, errno,
-+                             "can't set the default network send interface");
-             goto fail;
-         }
-     }
-@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
-                                                 const char *model,
-                                                 const char *name,
-                                                 int fd, int is_connected,
--                                                const char *mcast)
-+                                                const char *mcast,
-+                                                Error **errp)
- {
-     struct sockaddr_in saddr;
-     int newfd;
-@@ -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) {
--                fprintf(stderr,
--                        "qemu: error: init_dgram: fd=%d failed parse_host_port()\n",
--                        fd);
-+                error_setg(errp, "fd=%d failed parse_host_port()", fd);
-                 goto err;
-             }
-             /* must be bound */
-             if (saddr.sin_addr.s_addr == 0) {
--                fprintf(stderr, "qemu: error: init_dgram: fd=%d unbound, "
--                        "cannot setup multicast dst addr\n", fd);
-+                error_setg(errp, "can't setup multicast destination address");
-                 goto err;
-             }
-             /* clone dgram socket */
--            newfd = net_socket_mcast_create(&saddr, NULL);
-+            newfd = net_socket_mcast_create(&saddr, NULL, errp);
-             if (newfd < 0) {
--                /* error already reported by net_socket_mcast_create() */
-                 goto err;
-             }
-             /* clone newfd to fd, close newfd */
-@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
- static NetSocketState *net_socket_fd_init(NetClientState *peer,
-                                           const char *model, const char *name,
--                                          int fd, int is_connected, const char *mc)
-+                                          int fd, int is_connected,
-+                                          const char *mc, Error **errp)
- {
-     int so_type = -1, optlen=sizeof(so_type);
-     if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
-         (socklen_t *)&optlen)< 0) {
--        fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n",
--                fd);
-+        error_setg(errp, "can't get socket option SO_TYPE");
-         closesocket(fd);
-         return NULL;
-     }
-     switch(so_type) {
-     case SOCK_DGRAM:
--        return net_socket_fd_init_dgram(peer, model, name, fd, is_connected, mc);
-+        return net_socket_fd_init_dgram(peer, model, name, fd, is_connected,
-+                                        mc, errp);
-     case SOCK_STREAM:
-         return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
-     default:
-@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
-     NetSocketState *s;
-     int fd, connected, ret;
-     struct sockaddr_in saddr;
-+    Error *err = NULL;
-     if (parse_host_port(&saddr, host_str) < 0)
-         return -1;
-@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
-             break;
-         }
-     }
--    s = net_socket_fd_init(peer, model, name, fd, connected, NULL);
--    if (!s)
-+    s = net_socket_fd_init(peer, model, name, fd, connected, NULL, &err);
-+    if (!s) {
-+        error_report_err(err);
-         return -1;
-+    }
-+
-     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
-              "socket: connect to %s:%d",
-              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
-@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
-     int fd;
-     struct sockaddr_in saddr;
-     struct in_addr localaddr, *param_localaddr;
-+    Error *err = NULL;
-     if (parse_host_port(&saddr, host_str) < 0)
-         return -1;
-@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
-         param_localaddr = NULL;
-     }
--    fd = net_socket_mcast_create(&saddr, param_localaddr);
--    if (fd < 0)
-+    fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
-+    if (fd < 0) {
-+        error_report_err(err);
-         return -1;
-+    }
--    s = net_socket_fd_init(peer, model, name, fd, 0, NULL);
--    if (!s)
-+    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);
-+    if (!s) {
-+        error_report_err(err);
-         return -1;
-+    }
-     s->dgram_dst = saddr;
-@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
-     NetSocketState *s;
-     int fd, ret;
-     struct sockaddr_in laddr, raddr;
-+    Error *err = NULL;
-     if (parse_host_port(&laddr, lhost) < 0) {
-         return -1;
-@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
-     }
-     qemu_set_nonblock(fd);
--    s = net_socket_fd_init(peer, model, name, fd, 0, NULL);
-+    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);
-     if (!s) {
-+        error_report_err(err);
-         return -1;
-     }
-@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
-             return -1;
-         }
-         qemu_set_nonblock(fd);
--        if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast)) {
-+        if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast,
-+                                errp)) {
-             return -1;
-         }
-         return 0;
---
-.7.4

-[Qemu-devel] [PULL 10/18] net/net: Convert parse_host_port() to Error
+Deleted patch
-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>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- include/qemu/sockets.h |  3 ++-
- net/net.c              | 22 +++++++++++++++++-----
- net/socket.c           | 22 +++++++++++++++-------
-files changed, 34 insertions(+), 13 deletions(-)
-diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
-index XXXXXXX..XXXXXXX 100644
---- 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;
-     }
---
-.7.4

-[Qemu-devel] [PULL 11/18] net/socket: Improve -net socket error reporting
+Deleted patch
-From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
-When -net socket fails, it first reports a specific error, then
-a generic one, like this:
-    $ ./x86_64-softmmu/qemu-system-x86_64 -net socket,mcast=230.0.0.1:1234,listen
-    qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: exactly one of listen=, connect=, mcast= or udp= is required
-    qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: Device 'socket' could not be initialized
-Convert net_socket_*_init() to Error to get rid of the superfluous second
-error message. After the patch, the effect like this:
-    $ ./x86_64-softmmu/qemu-system-x86_64 -net socket,mcast=230.0.0.1:1234,listen
-    qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: exactly one of listen=, connect=, mcast= or udp= is requireda
-This also fixes a few silent failures to report an error.
-Cc: jasowang@redhat.com
-Cc: armbru@redhat.com
-Cc: berrange@redhat.com
-Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- net/socket.c | 92 +++++++++++++++++++++++++++++-------------------------------
-file changed, 44 insertions(+), 48 deletions(-)
-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 void net_socket_accept(void *opaque)
- static int net_socket_listen_init(NetClientState *peer,
-                                   const char *model,
-                                   const char *name,
--                                  const char *host_str)
-+                                  const char *host_str,
-+                                  Error **errp)
- {
-     NetClientState *nc;
-     NetSocketState *s;
-     struct sockaddr_in saddr;
-     int fd, ret;
--    Error *err = NULL;
--    if (parse_host_port(&saddr, host_str, &err) < 0) {
--        error_report_err(err);
-+    if (parse_host_port(&saddr, host_str, errp) < 0) {
-         return -1;
-     }
-     fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
-     if (fd < 0) {
--        perror("socket");
-+        error_setg_errno(errp, errno, "can't create stream socket");
-         return -1;
-     }
-     qemu_set_nonblock(fd);
-@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
-     ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));
-     if (ret < 0) {
--        perror("bind");
-+        error_setg_errno(errp, errno, "can't bind ip=%s to socket",
-+                         inet_ntoa(saddr.sin_addr));
-         closesocket(fd);
-         return -1;
-     }
-     ret = listen(fd, 0);
-     if (ret < 0) {
--        perror("listen");
-+        error_setg_errno(errp, errno, "can't listen on socket");
-         closesocket(fd);
-         return -1;
-     }
-@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
- static int net_socket_connect_init(NetClientState *peer,
-                                    const char *model,
-                                    const char *name,
--                                   const char *host_str)
-+                                   const char *host_str,
-+                                   Error **errp)
- {
-     NetSocketState *s;
-     int fd, connected, ret;
-     struct sockaddr_in saddr;
--    Error *err = NULL;
--    if (parse_host_port(&saddr, host_str, &err) < 0) {
--        error_report_err(err);
-+    if (parse_host_port(&saddr, host_str, errp) < 0) {
-         return -1;
-     }
-     fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
-     if (fd < 0) {
--        perror("socket");
-+        error_setg_errno(errp, errno, "can't create stream socket");
-         return -1;
-     }
-     qemu_set_nonblock(fd);
-@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
-                        errno == EINVAL) {
-                 break;
-             } else {
--                perror("connect");
-+                error_setg_errno(errp, errno, "can't connect socket");
-                 closesocket(fd);
-                 return -1;
-             }
-@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
-             break;
-         }
-     }
--    s = net_socket_fd_init(peer, model, name, fd, connected, NULL, &err);
-+    s = net_socket_fd_init(peer, model, name, fd, connected, NULL, errp);
-     if (!s) {
--        error_report_err(err);
-         return -1;
-     }
-@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
-                                  const char *model,
-                                  const char *name,
-                                  const char *host_str,
--                                 const char *localaddr_str)
-+                                 const char *localaddr_str,
-+                                 Error **errp)
- {
-     NetSocketState *s;
-     int fd;
-     struct sockaddr_in saddr;
-     struct in_addr localaddr, *param_localaddr;
--    Error *err = NULL;
--    if (parse_host_port(&saddr, host_str, &err) < 0) {
--        error_report_err(err);
-+    if (parse_host_port(&saddr, host_str, errp) < 0) {
-         return -1;
-     }
-     if (localaddr_str != NULL) {
--        if (inet_aton(localaddr_str, &localaddr) == 0)
-+        if (inet_aton(localaddr_str, &localaddr) == 0) {
-+            error_setg(errp, "localaddr '%s' is not a valid IPv4 address",
-+                       localaddr_str);
-             return -1;
-+        }
-         param_localaddr = &localaddr;
-     } else {
-         param_localaddr = NULL;
-     }
--    fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
-+    fd = net_socket_mcast_create(&saddr, param_localaddr, errp);
-     if (fd < 0) {
--        error_report_err(err);
-         return -1;
-     }
--    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);
-+    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
-     if (!s) {
--        error_report_err(err);
-         return -1;
-     }
-@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
-                                  const char *model,
-                                  const char *name,
-                                  const char *rhost,
--                                 const char *lhost)
-+                                 const char *lhost,
-+                                 Error **errp)
- {
-     NetSocketState *s;
-     int fd, ret;
-     struct sockaddr_in laddr, raddr;
--    Error *err = NULL;
--    if (parse_host_port(&laddr, lhost, &err) < 0) {
--        error_report_err(err);
-+    if (parse_host_port(&laddr, lhost, errp) < 0) {
-         return -1;
-     }
--    if (parse_host_port(&raddr, rhost, &err) < 0) {
--        error_report_err(err);
-+    if (parse_host_port(&raddr, rhost, errp) < 0) {
-         return -1;
-     }
-     fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
-     if (fd < 0) {
--        perror("socket(PF_INET, SOCK_DGRAM)");
-+        error_setg_errno(errp, errno, "can't create datagram socket");
-         return -1;
-     }
-     ret = socket_set_fast_reuse(fd);
-     if (ret < 0) {
-+        error_setg_errno(errp, errno,
-+                         "can't set socket option SO_REUSEADDR");
-         closesocket(fd);
-         return -1;
-     }
-     ret = bind(fd, (struct sockaddr *)&laddr, sizeof(laddr));
-     if (ret < 0) {
--        perror("bind");
-+        error_setg_errno(errp, errno, "can't bind ip=%s to socket",
-+                         inet_ntoa(laddr.sin_addr));
-         closesocket(fd);
-         return -1;
-     }
-     qemu_set_nonblock(fd);
--    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);
-+    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
-     if (!s) {
--        error_report_err(err);
-         return -1;
-     }
-@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
- int net_init_socket(const Netdev *netdev, const char *name,
-                     NetClientState *peer, Error **errp)
- {
--    /* FIXME error_setg(errp, ...) on failure */
--    Error *err = NULL;
-     const NetdevSocketOptions *sock;
-     assert(netdev->type == NET_CLIENT_DRIVER_SOCKET);
-@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
-     if (sock->has_listen + sock->has_connect + sock->has_mcast +
-         sock->has_udp > 1) {
--        error_report("exactly one of listen=, connect=, mcast= or udp="
--                     " is required");
-+        error_setg(errp, "exactly one of listen=, connect=, mcast= or udp="
-+                   " is required");
-         return -1;
-     }
-     if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) {
--        error_report("localaddr= is only valid with mcast= or udp=");
-+        error_setg(errp, "localaddr= is only valid with mcast= or udp=");
-         return -1;
-     }
-     if (sock->has_fd) {
-         int fd;
--        fd = monitor_fd_param(cur_mon, sock->fd, &err);
-+        fd = monitor_fd_param(cur_mon, sock->fd, errp);
-         if (fd == -1) {
--            error_report_err(err);
-             return -1;
-         }
-         qemu_set_nonblock(fd);
-@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
-     }
-     if (sock->has_listen) {
--        if (net_socket_listen_init(peer, "socket", name, sock->listen) == -1) {
-+        if (net_socket_listen_init(peer, "socket", name, sock->listen, errp)
-+            < 0) {
-             return -1;
-         }
-         return 0;
-     }
-     if (sock->has_connect) {
--        if (net_socket_connect_init(peer, "socket", name, sock->connect) ==
--            -1) {
-+        if (net_socket_connect_init(peer, "socket", name, sock->connect, errp)
-+            < 0) {
-             return -1;
-         }
-         return 0;
-@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
-         /* if sock->localaddr is missing, it has been initialized to "all bits
-          * zero" */
-         if (net_socket_mcast_init(peer, "socket", name, sock->mcast,
--            sock->localaddr) == -1) {
-+                                  sock->localaddr, errp) < 0) {
-             return -1;
-         }
-         return 0;
-@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
-     assert(sock->has_udp);
-     if (!sock->has_localaddr) {
--        error_report("localaddr= is mandatory with udp=");
-+        error_setg(errp, "localaddr= is mandatory with udp=");
-         return -1;
-     }
--    if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localaddr) ==
--        -1) {
-+    if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localaddr,
-+                            errp) < 0) {
-         return -1;
-     }
-     return 0;
---
-.7.4

-[Qemu-devel] [PULL 12/18] e1000: Rename the SEC symbol to SEQEC
+Deleted patch
-From: Kamil Rytarowski <n54@gmx.com>
-SunOS defines SEC in <sys/time.h> as 1 (commonly used time symbols).
-This fixes build on SmartOS (Joyent).
-Patch cherry-picked from pkgsrc by jperkin (Joyent).
-Signed-off-by: Kamil Rytarowski <n54@gmx.com>
-Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- hw/net/e1000.c         | 4 ++--
- hw/net/e1000_regs.h    | 2 +-
- hw/net/e1000e_core.c   | 2 +-
- hw/net/e1000x_common.h | 2 +-
-files changed, 5 insertions(+), 5 deletions(-)
-diff --git a/hw/net/e1000.c b/hw/net/e1000.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/net/e1000.c
-+++ b/hw/net/e1000.c
-@@ -XXX,XX +XXX,XX @@ static uint32_t (*macreg_readops[])(E1000State *, int) = {
-     getreg(TADV),     getreg(ITR),      getreg(FCRUC),    getreg(IPAV),
-     getreg(WUC),      getreg(WUS),      getreg(SCC),      getreg(ECOL),
-     getreg(MCC),      getreg(LATECOL),  getreg(COLC),     getreg(DC),
--    getreg(TNCRS),    getreg(SEC),      getreg(CEXTERR),  getreg(RLEC),
-+    getreg(TNCRS),    getreg(SEQEC),    getreg(CEXTERR),  getreg(RLEC),
-     getreg(XONRXC),   getreg(XONTXC),   getreg(XOFFRXC),  getreg(XOFFTXC),
-     getreg(RFC),      getreg(RJC),      getreg(RNBC),     getreg(TSCTFC),
-     getreg(MGTPRC),   getreg(MGTPDC),   getreg(MGTPTC),   getreg(GORCL),
-@@ -XXX,XX +XXX,XX @@ static const uint8_t mac_reg_access[0x8000] = {
-     [FFLT]    = markflag(MAC),    [FFMT]    = markflag(MAC),
-     [SCC]     = markflag(MAC),    [FCRUC]   = markflag(MAC),
-     [LATECOL] = markflag(MAC),    [COLC]    = markflag(MAC),
--    [SEC]     = markflag(MAC),    [CEXTERR] = markflag(MAC),
-+    [SEQEC]   = markflag(MAC),    [CEXTERR] = markflag(MAC),
-     [XONTXC]  = markflag(MAC),    [XOFFRXC] = markflag(MAC),
-     [RJC]     = markflag(MAC),    [RNBC]    = markflag(MAC),
-     [MGTPDC]  = markflag(MAC),    [MGTPTC]  = markflag(MAC),
-diff --git a/hw/net/e1000_regs.h b/hw/net/e1000_regs.h
-index XXXXXXX..XXXXXXX 100644
---- a/hw/net/e1000_regs.h
-+++ b/hw/net/e1000_regs.h
-@@ -XXX,XX +XXX,XX @@
- #define E1000_COLC     0x04028  /* Collision Count - R/clr */
- #define E1000_DC       0x04030  /* Defer Count - R/clr */
- #define E1000_TNCRS    0x04034  /* TX-No CRS - R/clr */
--#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */
-+#define E1000_SEQEC    0x04038  /* Sequence Error Count - R/clr */
- #define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */
- #define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */
- #define E1000_XONRXC   0x04048  /* XON RX Count - R/clr */
-diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/net/e1000e_core.c
-+++ b/hw/net/e1000e_core.c
-@@ -XXX,XX +XXX,XX @@ static uint32_t (*e1000e_macreg_readops[])(E1000ECore *, int) = {
-     e1000e_getreg(RDLEN0),
-     e1000e_getreg(RDH1),
-     e1000e_getreg(LATECOL),
--    e1000e_getreg(SEC),
-+    e1000e_getreg(SEQEC),
-     e1000e_getreg(XONTXC),
-     e1000e_getreg(WUS),
-     e1000e_getreg(GORCL),
-diff --git a/hw/net/e1000x_common.h b/hw/net/e1000x_common.h
-index XXXXXXX..XXXXXXX 100644
---- a/hw/net/e1000x_common.h
-+++ b/hw/net/e1000x_common.h
-@@ -XXX,XX +XXX,XX @@ enum {
-     defreg(VFTA),    defreg(VET),     defreg(RDTR),    defreg(RADV),
-     defreg(TADV),    defreg(ITR),     defreg(SCC),     defreg(ECOL),
-     defreg(MCC),     defreg(LATECOL), defreg(COLC),    defreg(DC),
--    defreg(TNCRS),   defreg(SEC),     defreg(CEXTERR), defreg(RLEC),
-+    defreg(TNCRS),   defreg(SEQEC),   defreg(CEXTERR), defreg(RLEC),
-     defreg(XONRXC),  defreg(XONTXC),  defreg(XOFFRXC), defreg(XOFFTXC),
-     defreg(FCRUC),   defreg(AIT),     defreg(TDFH),    defreg(TDFT),
-     defreg(TDFHS),   defreg(TDFTS),   defreg(TDFPC),   defreg(WUC),
---
-.7.4

-[Qemu-devel] [PULL 17/18] colo-compare: Use IOThread to Check old packet regularly and Process pactkets of the primary
+[Qemu-devel] [PULL V2 6/8] slirp: add a fake NC-SI backend
-From: Wang Yong <wang.yong155@zte.com.cn>
+From: Cédric Le Goater <clg@kaod.org>
-Remove the task which check old packet in the comparing thread,
+NC-SI (Network Controller Sideband Interface) enables a BMC to manage
-then use IOthread context timer to handle it.
+a set of NICs on a system. This model takes the simplest approach and
 reverses the NC-SI packets to pretend a NIC is present and exercise
 the Linux driver.
-Process pactkets in the IOThread which arrived over the socket.
+The NCSI header file <ncsi-pkt.h> comes from mainline Linux and was
-we use iothread_get_g_main_context to create a new g_main_loop in
+untabified.
 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.
+Signed-off-by: Cédric Le Goater <clg@kaod.org>
+Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Reviewed-by: Zhang Chen<zhangchen.fnst@cn.fujitsu.com>
+Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
 Signed-off-by: Wang Yong <wang.yong155@zte.com.cn>
 Signed-off-by: Wang Guang <wang.guang55@zte.com.cn>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 83 +++++++++++++++++++++++++++++-------------------------
+ include/net/eth.h   |   1 +
-file changed, 45 insertions(+), 38 deletions(-)
+ slirp/Makefile.objs |   2 +-
  slirp/ncsi-pkt.h    | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  slirp/ncsi.c        | 130 ++++++++++++++++
  slirp/slirp.c       |   4 +
  slirp/slirp.h       |   3 +
 files changed, 558 insertions(+), 1 deletion(-)
  create mode 100644 slirp/ncsi-pkt.h
  create mode 100644 slirp/ncsi.c
-diff --git a/net/colo-compare.c b/net/colo-compare.c
+diff --git a/include/net/eth.h b/include/net/eth.h
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo-compare.c
+--- a/include/net/eth.h
-+++ b/net/colo-compare.c
++++ b/include/net/eth.h
@@ -XXX,XX +XXX,XX @@ struct tcp_hdr {
  #define ETH_P_IPV6                (0x86dd)
  #define ETH_P_VLAN                (0x8100)
  #define ETH_P_DVLAN               (0x88a8)
 +#define ETH_P_NCSI                (0x88f8)
  #define ETH_P_UNKNOWN             (0xffff)
  #define VLAN_VID_MASK             0x0fff
  #define IP_HEADER_VERSION_4       (4)
 diff --git a/slirp/Makefile.objs b/slirp/Makefile.objs
 index XXXXXXX..XXXXXXX 100644
 --- a/slirp/Makefile.objs
 +++ b/slirp/Makefile.objs
@@ -XXX,XX +XXX,XX @@ common-obj-y = cksum.o if.o ip_icmp.o ip6_icmp.o ip6_input.o ip6_output.o \
                 ip_input.o ip_output.o dnssearch.o dhcpv6.o
  common-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
  common-obj-y += tcp_subr.o tcp_timer.o udp.o udp6.o bootp.o tftp.o arp_table.o \
 -                ndp_table.o
 +                ndp_table.o ncsi.o
 diff --git a/slirp/ncsi-pkt.h b/slirp/ncsi-pkt.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/slirp/ncsi-pkt.h
 @@ -XXX,XX +XXX,XX @@
- #include "qemu/sockets.h"
++/*
- #include "qapi-visit.h"
++ * Copyright Gavin Shan, IBM Corporation 2016.
- #include "net/colo.h"
++ *
-+#include "sysemu/iothread.h"
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
- #define TYPE_COLO_COMPARE "colo-compare"
++ * the Free Software Foundation; either version 2 of the License, or
- #define COLO_COMPARE(obj) \
++ * (at your option) any later version.
-@@ -XXX,XX +XXX,XX @@ typedef struct CompareState {
++ */
-     GQueue conn_list;
++
-     /* Record the connection without repetition */
++#ifndef NCSI_PKT_H
-     GHashTable *connection_track_table;
++#define NCSI_PKT_H
--    /* This thread just do packet compare job */
++
--    QemuThread thread;
++/* from linux/net/ncsi/ncsi-pkt.h */
++#define __be32 uint32_t
-+    IOThread *iothread;
++#define __be16 uint16_t
-     GMainContext *worker_context;
++
--    GMainLoop *compare_loop;
++struct ncsi_pkt_hdr {
-+    QEMUTimer *packet_check_timer;
++        unsigned char mc_id;        /* Management controller ID */
- } CompareState;
++        unsigned char revision;     /* NCSI version - 0x01      */
++        unsigned char reserved;     /* Reserved                 */
- typedef struct CompareClass {
++        unsigned char id;           /* Packet sequence number   */
-@@ -XXX,XX +XXX,XX @@ static void compare_sec_chr_in(void *opaque, const uint8_t *buf, int size)
++        unsigned char type;         /* Packet type              */
-  * Check old packet regularly so it can watch for any packets
++        unsigned char channel;      /* Network controller ID    */
-  * that the secondary hasn't produced equivalents of.
++        __be16        length;       /* Payload length           */
-  */
++        __be32        reserved1[2]; /* Reserved                 */
--static gboolean check_old_packet_regular(void *opaque)
++};
-+static void check_old_packet_regular(void *opaque)
++
- {
++struct ncsi_cmd_pkt_hdr {
-     CompareState *s = opaque;
++        struct ncsi_pkt_hdr common; /* Common NCSI packet header */
++};
-     /* if have old packet we will notify checkpoint */
++
-     colo_old_packet_check(s);
++struct ncsi_rsp_pkt_hdr {
-+    timer_mod(s->packet_check_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +
++        struct ncsi_pkt_hdr common; /* Common NCSI packet header */
-+                REGULAR_PACKET_CHECK_MS);
++        __be16              code;   /* Response code             */
 +        __be16              reason; /* Response reason           */
 +};
 +
 +struct ncsi_aen_pkt_hdr {
 +        struct ncsi_pkt_hdr common;       /* Common NCSI packet header */
 +        unsigned char       reserved2[3]; /* Reserved                  */
 +        unsigned char       type;         /* AEN packet type           */
 +};
 +
 +/* NCSI common command packet */
 +struct ncsi_cmd_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;      /* Command header */
 +        __be32                  checksum; /* Checksum       */
 +        unsigned char           pad[26];
 +};
 +
 +struct ncsi_rsp_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;      /* Response header */
 +        __be32                  checksum; /* Checksum        */
 +        unsigned char           pad[22];
 +};
 +
 +/* Select Package */
 +struct ncsi_cmd_sp_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;            /* Command header */
 +        unsigned char           reserved[3];    /* Reserved       */
 +        unsigned char           hw_arbitration; /* HW arbitration */
 +        __be32                  checksum;       /* Checksum       */
 +        unsigned char           pad[22];
 +};
 +
 +/* Disable Channel */
 +struct ncsi_cmd_dc_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;         /* Command header  */
 +        unsigned char           reserved[3]; /* Reserved        */
 +        unsigned char           ald;         /* Allow link down */
 +        __be32                  checksum;    /* Checksum        */
 +        unsigned char           pad[22];
 +};
 +
 +/* Reset Channel */
 +struct ncsi_cmd_rc_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;      /* Command header */
 +        __be32                  reserved; /* Reserved       */
 +        __be32                  checksum; /* Checksum       */
 +        unsigned char           pad[22];
 +};
 +
 +/* AEN Enable */
 +struct ncsi_cmd_ae_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;         /* Command header   */
 +        unsigned char           reserved[3]; /* Reserved         */
 +        unsigned char           mc_id;       /* MC ID            */
 +        __be32                  mode;        /* AEN working mode */
 +        __be32                  checksum;    /* Checksum         */
 +        unsigned char           pad[18];
 +};
 +
 +/* Set Link */
 +struct ncsi_cmd_sl_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;      /* Command header    */
 +        __be32                  mode;     /* Link working mode */
 +        __be32                  oem_mode; /* OEM link mode     */
 +        __be32                  checksum; /* Checksum          */
 +        unsigned char           pad[18];
 +};
 +
 +/* Set VLAN Filter */
 +struct ncsi_cmd_svf_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;       /* Command header    */
 +        __be16                  reserved;  /* Reserved          */
 +        __be16                  vlan;      /* VLAN ID           */
 +        __be16                  reserved1; /* Reserved          */
 +        unsigned char           index;     /* VLAN table index  */
 +        unsigned char           enable;    /* Enable or disable */
 +        __be32                  checksum;  /* Checksum          */
 +        unsigned char           pad[14];
 +};
 +
 +/* Enable VLAN */
 +struct ncsi_cmd_ev_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;         /* Command header   */
 +        unsigned char           reserved[3]; /* Reserved         */
 +        unsigned char           mode;        /* VLAN filter mode */
 +        __be32                  checksum;    /* Checksum         */
 +        unsigned char           pad[22];
 +};
 +
 +/* Set MAC Address */
 +struct ncsi_cmd_sma_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;      /* Command header          */
 +        unsigned char           mac[6];   /* MAC address             */
 +        unsigned char           index;    /* MAC table index         */
 +        unsigned char           at_e;     /* Addr type and operation */
 +        __be32                  checksum; /* Checksum                */
 +        unsigned char           pad[18];
 +};
 +
 +/* Enable Broadcast Filter */
 +struct ncsi_cmd_ebf_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;      /* Command header */
 +        __be32                  mode;     /* Filter mode    */
 +        __be32                  checksum; /* Checksum       */
 +        unsigned char           pad[22];
 +};
 +
 +/* Enable Global Multicast Filter */
 +struct ncsi_cmd_egmf_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;      /* Command header */
 +        __be32                  mode;     /* Global MC mode */
 +        __be32                  checksum; /* Checksum       */
 +        unsigned char           pad[22];
 +};
 +
 +/* Set NCSI Flow Control */
 +struct ncsi_cmd_snfc_pkt {
 +        struct ncsi_cmd_pkt_hdr cmd;         /* Command header    */
 +        unsigned char           reserved[3]; /* Reserved          */
 +        unsigned char           mode;        /* Flow control mode */
 +        __be32                  checksum;    /* Checksum          */
 +        unsigned char           pad[22];
 +};
 +
 +/* Get Link Status */
 +struct ncsi_rsp_gls_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;        /* Response header   */
 +        __be32                  status;     /* Link status       */
 +        __be32                  other;      /* Other indications */
 +        __be32                  oem_status; /* OEM link status   */
 +        __be32                  checksum;
 +        unsigned char           pad[10];
 +};
 +
 +/* Get Version ID */
 +struct ncsi_rsp_gvi_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;          /* Response header */
 +        __be32                  ncsi_version; /* NCSI version    */
 +        unsigned char           reserved[3];  /* Reserved        */
 +        unsigned char           alpha2;       /* NCSI version    */
 +        unsigned char           fw_name[12];  /* f/w name string */
 +        __be32                  fw_version;   /* f/w version     */
 +        __be16                  pci_ids[4];   /* PCI IDs         */
 +        __be32                  mf_id;        /* Manufacture ID  */
 +        __be32                  checksum;
 +};
 +
 +/* Get Capabilities */
 +struct ncsi_rsp_gc_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;         /* Response header   */
 +        __be32                  cap;         /* Capabilities      */
 +        __be32                  bc_cap;      /* Broadcast cap     */
 +        __be32                  mc_cap;      /* Multicast cap     */
 +        __be32                  buf_cap;     /* Buffering cap     */
 +        __be32                  aen_cap;     /* AEN cap           */
 +        unsigned char           vlan_cnt;    /* VLAN filter count */
 +        unsigned char           mixed_cnt;   /* Mix filter count  */
 +        unsigned char           mc_cnt;      /* MC filter count   */
 +        unsigned char           uc_cnt;      /* UC filter count   */
 +        unsigned char           reserved[2]; /* Reserved          */
 +        unsigned char           vlan_mode;   /* VLAN mode         */
 +        unsigned char           channel_cnt; /* Channel count     */
 +        __be32                  checksum;    /* Checksum          */
 +};
 +
 +/* Get Parameters */
 +struct ncsi_rsp_gp_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;          /* Response header       */
 +        unsigned char           mac_cnt;      /* Number of MAC addr    */
 +        unsigned char           reserved[2];  /* Reserved              */
 +        unsigned char           mac_enable;   /* MAC addr enable flags */
 +        unsigned char           vlan_cnt;     /* VLAN tag count        */
 +        unsigned char           reserved1;    /* Reserved              */
 +        __be16                  vlan_enable;  /* VLAN tag enable flags */
 +        __be32                  link_mode;    /* Link setting          */
 +        __be32                  bc_mode;      /* BC filter mode        */
 +        __be32                  valid_modes;  /* Valid mode parameters */
 +        unsigned char           vlan_mode;    /* VLAN mode             */
 +        unsigned char           fc_mode;      /* Flow control mode     */
 +        unsigned char           reserved2[2]; /* Reserved              */
 +        __be32                  aen_mode;     /* AEN mode              */
 +        unsigned char           mac[6];       /* Supported MAC addr    */
 +        __be16                  vlan;         /* Supported VLAN tags   */
 +        __be32                  checksum;     /* Checksum              */
 +};
 +
 +/* Get Controller Packet Statistics */
 +struct ncsi_rsp_gcps_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;            /* Response header            */
 +        __be32                  cnt_hi;         /* Counter cleared            */
 +        __be32                  cnt_lo;         /* Counter cleared            */
 +        __be32                  rx_bytes;       /* Rx bytes                   */
 +        __be32                  tx_bytes;       /* Tx bytes                   */
 +        __be32                  rx_uc_pkts;     /* Rx UC packets              */
 +        __be32                  rx_mc_pkts;     /* Rx MC packets              */
 +        __be32                  rx_bc_pkts;     /* Rx BC packets              */
 +        __be32                  tx_uc_pkts;     /* Tx UC packets              */
 +        __be32                  tx_mc_pkts;     /* Tx MC packets              */
 +        __be32                  tx_bc_pkts;     /* Tx BC packets              */
 +        __be32                  fcs_err;        /* FCS errors                 */
 +        __be32                  align_err;      /* Alignment errors           */
 +        __be32                  false_carrier;  /* False carrier detection    */
 +        __be32                  runt_pkts;      /* Rx runt packets            */
 +        __be32                  jabber_pkts;    /* Rx jabber packets          */
 +        __be32                  rx_pause_xon;   /* Rx pause XON frames        */
 +        __be32                  rx_pause_xoff;  /* Rx XOFF frames             */
 +        __be32                  tx_pause_xon;   /* Tx XON frames              */
 +        __be32                  tx_pause_xoff;  /* Tx XOFF frames             */
 +        __be32                  tx_s_collision; /* Single collision frames    */
 +        __be32                  tx_m_collision; /* Multiple collision frames  */
 +        __be32                  l_collision;    /* Late collision frames      */
 +        __be32                  e_collision;    /* Excessive collision frames */
 +        __be32                  rx_ctl_frames;  /* Rx control frames          */
 +        __be32                  rx_64_frames;   /* Rx 64-bytes frames         */
 +        __be32                  rx_127_frames;  /* Rx 65-127 bytes frames     */
 +        __be32                  rx_255_frames;  /* Rx 128-255 bytes frames    */
 +        __be32                  rx_511_frames;  /* Rx 256-511 bytes frames    */
 +        __be32                  rx_1023_frames; /* Rx 512-1023 bytes frames   */
 +        __be32                  rx_1522_frames; /* Rx 1024-1522 bytes frames  */
 +        __be32                  rx_9022_frames; /* Rx 1523-9022 bytes frames  */
 +        __be32                  tx_64_frames;   /* Tx 64-bytes frames         */
 +        __be32                  tx_127_frames;  /* Tx 65-127 bytes frames     */
 +        __be32                  tx_255_frames;  /* Tx 128-255 bytes frames    */
 +        __be32                  tx_511_frames;  /* Tx 256-511 bytes frames    */
 +        __be32                  tx_1023_frames; /* Tx 512-1023 bytes frames   */
 +        __be32                  tx_1522_frames; /* Tx 1024-1522 bytes frames  */
 +        __be32                  tx_9022_frames; /* Tx 1523-9022 bytes frames  */
 +        __be32                  rx_valid_bytes; /* Rx valid bytes             */
 +        __be32                  rx_runt_pkts;   /* Rx error runt packets      */
 +        __be32                  rx_jabber_pkts; /* Rx error jabber packets    */
 +        __be32                  checksum;       /* Checksum                   */
 +};
 +
 +/* Get NCSI Statistics */
 +struct ncsi_rsp_gns_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;           /* Response header         */
 +        __be32                  rx_cmds;       /* Rx NCSI commands        */
 +        __be32                  dropped_cmds;  /* Dropped commands        */
 +        __be32                  cmd_type_errs; /* Command type errors     */
 +        __be32                  cmd_csum_errs; /* Command checksum errors */
 +        __be32                  rx_pkts;       /* Rx NCSI packets         */
 +        __be32                  tx_pkts;       /* Tx NCSI packets         */
 +        __be32                  tx_aen_pkts;   /* Tx AEN packets          */
 +        __be32                  checksum;      /* Checksum                */
 +};
 +
 +/* Get NCSI Pass-through Statistics */
 +struct ncsi_rsp_gnpts_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;            /* Response header     */
 +        __be32                  tx_pkts;        /* Tx packets          */
 +        __be32                  tx_dropped;     /* Tx dropped packets  */
 +        __be32                  tx_channel_err; /* Tx channel errors   */
 +        __be32                  tx_us_err;      /* Tx undersize errors */
 +        __be32                  rx_pkts;        /* Rx packets          */
 +        __be32                  rx_dropped;     /* Rx dropped packets  */
 +        __be32                  rx_channel_err; /* Rx channel errors   */
 +        __be32                  rx_us_err;      /* Rx undersize errors */
 +        __be32                  rx_os_err;      /* Rx oversize errors  */
 +        __be32                  checksum;       /* Checksum            */
 +};
 +
 +/* Get package status */
 +struct ncsi_rsp_gps_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;      /* Response header             */
 +        __be32                  status;   /* Hardware arbitration status */
 +        __be32                  checksum;
 +};
 +
 +/* Get package UUID */
 +struct ncsi_rsp_gpuuid_pkt {
 +        struct ncsi_rsp_pkt_hdr rsp;      /* Response header */
 +        unsigned char           uuid[16]; /* UUID            */
 +        __be32                  checksum;
 +};
 +
 +/* AEN: Link State Change */
 +struct ncsi_aen_lsc_pkt {
 +        struct ncsi_aen_pkt_hdr aen;        /* AEN header      */
 +        __be32                  status;     /* Link status     */
 +        __be32                  oem_status; /* OEM link status */
 +        __be32                  checksum;   /* Checksum        */
 +        unsigned char           pad[14];
 +};
 +
 +/* AEN: Configuration Required */
 +struct ncsi_aen_cr_pkt {
 +        struct ncsi_aen_pkt_hdr aen;      /* AEN header */
 +        __be32                  checksum; /* Checksum   */
 +        unsigned char           pad[22];
 +};
 +
 +/* AEN: Host Network Controller Driver Status Change */
 +struct ncsi_aen_hncdsc_pkt {
 +        struct ncsi_aen_pkt_hdr aen;      /* AEN header */
 +        __be32                  status;   /* Status     */
 +        __be32                  checksum; /* Checksum   */
 +        unsigned char           pad[18];
 +};
 +
 +/* NCSI packet revision */
 +#define NCSI_PKT_REVISION       0x01
 +
 +/* NCSI packet commands */
 +#define NCSI_PKT_CMD_CIS        0x00 /* Clear Initial State              */
 +#define NCSI_PKT_CMD_SP         0x01 /* Select Package                   */
 +#define NCSI_PKT_CMD_DP         0x02 /* Deselect Package                 */
 +#define NCSI_PKT_CMD_EC         0x03 /* Enable Channel                   */
 +#define NCSI_PKT_CMD_DC         0x04 /* Disable Channel                  */
 +#define NCSI_PKT_CMD_RC         0x05 /* Reset Channel                    */
 +#define NCSI_PKT_CMD_ECNT       0x06 /* Enable Channel Network Tx        */
 +#define NCSI_PKT_CMD_DCNT       0x07 /* Disable Channel Network Tx       */
 +#define NCSI_PKT_CMD_AE         0x08 /* AEN Enable                       */
 +#define NCSI_PKT_CMD_SL         0x09 /* Set Link                         */
 +#define NCSI_PKT_CMD_GLS        0x0a /* Get Link                         */
 +#define NCSI_PKT_CMD_SVF        0x0b /* Set VLAN Filter                  */
 +#define NCSI_PKT_CMD_EV         0x0c /* Enable VLAN                      */
 +#define NCSI_PKT_CMD_DV         0x0d /* Disable VLAN                     */
 +#define NCSI_PKT_CMD_SMA        0x0e /* Set MAC address                  */
 +#define NCSI_PKT_CMD_EBF        0x10 /* Enable Broadcast Filter          */
 +#define NCSI_PKT_CMD_DBF        0x11 /* Disable Broadcast Filter         */
 +#define NCSI_PKT_CMD_EGMF       0x12 /* Enable Global Multicast Filter   */
 +#define NCSI_PKT_CMD_DGMF       0x13 /* Disable Global Multicast Filter  */
 +#define NCSI_PKT_CMD_SNFC       0x14 /* Set NCSI Flow Control            */
 +#define NCSI_PKT_CMD_GVI        0x15 /* Get Version ID                   */
 +#define NCSI_PKT_CMD_GC         0x16 /* Get Capabilities                 */
 +#define NCSI_PKT_CMD_GP         0x17 /* Get Parameters                   */
 +#define NCSI_PKT_CMD_GCPS       0x18 /* Get Controller Packet Statistics */
 +#define NCSI_PKT_CMD_GNS        0x19 /* Get NCSI Statistics              */
 +#define NCSI_PKT_CMD_GNPTS      0x1a /* Get NCSI Pass-throu Statistics   */
 +#define NCSI_PKT_CMD_GPS        0x1b /* Get package status               */
 +#define NCSI_PKT_CMD_OEM        0x50 /* OEM                              */
 +#define NCSI_PKT_CMD_PLDM       0x51 /* PLDM request over NCSI over RBT  */
 +#define NCSI_PKT_CMD_GPUUID     0x52 /* Get package UUID                 */
 +
 +/* NCSI packet responses */
 +#define NCSI_PKT_RSP_CIS        (NCSI_PKT_CMD_CIS    + 0x80)
 +#define NCSI_PKT_RSP_SP         (NCSI_PKT_CMD_SP     + 0x80)
 +#define NCSI_PKT_RSP_DP         (NCSI_PKT_CMD_DP     + 0x80)
 +#define NCSI_PKT_RSP_EC         (NCSI_PKT_CMD_EC     + 0x80)
 +#define NCSI_PKT_RSP_DC         (NCSI_PKT_CMD_DC     + 0x80)
 +#define NCSI_PKT_RSP_RC         (NCSI_PKT_CMD_RC     + 0x80)
 +#define NCSI_PKT_RSP_ECNT       (NCSI_PKT_CMD_ECNT   + 0x80)
 +#define NCSI_PKT_RSP_DCNT       (NCSI_PKT_CMD_DCNT   + 0x80)
 +#define NCSI_PKT_RSP_AE         (NCSI_PKT_CMD_AE     + 0x80)
 +#define NCSI_PKT_RSP_SL         (NCSI_PKT_CMD_SL     + 0x80)
 +#define NCSI_PKT_RSP_GLS        (NCSI_PKT_CMD_GLS    + 0x80)
 +#define NCSI_PKT_RSP_SVF        (NCSI_PKT_CMD_SVF    + 0x80)
 +#define NCSI_PKT_RSP_EV         (NCSI_PKT_CMD_EV     + 0x80)
 +#define NCSI_PKT_RSP_DV         (NCSI_PKT_CMD_DV     + 0x80)
 +#define NCSI_PKT_RSP_SMA        (NCSI_PKT_CMD_SMA    + 0x80)
 +#define NCSI_PKT_RSP_EBF        (NCSI_PKT_CMD_EBF    + 0x80)
 +#define NCSI_PKT_RSP_DBF        (NCSI_PKT_CMD_DBF    + 0x80)
 +#define NCSI_PKT_RSP_EGMF       (NCSI_PKT_CMD_EGMF   + 0x80)
 +#define NCSI_PKT_RSP_DGMF       (NCSI_PKT_CMD_DGMF   + 0x80)
 +#define NCSI_PKT_RSP_SNFC       (NCSI_PKT_CMD_SNFC   + 0x80)
 +#define NCSI_PKT_RSP_GVI        (NCSI_PKT_CMD_GVI    + 0x80)
 +#define NCSI_PKT_RSP_GC         (NCSI_PKT_CMD_GC     + 0x80)
 +#define NCSI_PKT_RSP_GP         (NCSI_PKT_CMD_GP     + 0x80)
 +#define NCSI_PKT_RSP_GCPS       (NCSI_PKT_CMD_GCPS   + 0x80)
 +#define NCSI_PKT_RSP_GNS        (NCSI_PKT_CMD_GNS    + 0x80)
 +#define NCSI_PKT_RSP_GNPTS      (NCSI_PKT_CMD_GNPTS  + 0x80)
 +#define NCSI_PKT_RSP_GPS        (NCSI_PKT_CMD_GPS    + 0x80)
 +#define NCSI_PKT_RSP_OEM        (NCSI_PKT_CMD_OEM    + 0x80)
 +#define NCSI_PKT_RSP_PLDM       (NCSI_PKT_CMD_PLDM   + 0x80)
 +#define NCSI_PKT_RSP_GPUUID     (NCSI_PKT_CMD_GPUUID + 0x80)
 +
 +/* NCSI response code/reason */
 +#define NCSI_PKT_RSP_C_COMPLETED        0x0000 /* Command Completed        */
 +#define NCSI_PKT_RSP_C_FAILED           0x0001 /* Command Failed           */
 +#define NCSI_PKT_RSP_C_UNAVAILABLE      0x0002 /* Command Unavailable      */
 +#define NCSI_PKT_RSP_C_UNSUPPORTED      0x0003 /* Command Unsupported      */
 +#define NCSI_PKT_RSP_R_NO_ERROR         0x0000 /* No Error                 */
 +#define NCSI_PKT_RSP_R_INTERFACE        0x0001 /* Interface not ready      */
 +#define NCSI_PKT_RSP_R_PARAM            0x0002 /* Invalid Parameter        */
 +#define NCSI_PKT_RSP_R_CHANNEL          0x0003 /* Channel not Ready        */
 +#define NCSI_PKT_RSP_R_PACKAGE          0x0004 /* Package not Ready        */
 +#define NCSI_PKT_RSP_R_LENGTH           0x0005 /* Invalid payload length   */
 +#define NCSI_PKT_RSP_R_UNKNOWN          0x7fff /* Command type unsupported */
 +
 +/* NCSI AEN packet type */
 +#define NCSI_PKT_AEN            0xFF /* AEN Packet               */
 +#define NCSI_PKT_AEN_LSC        0x00 /* Link status change       */
 +#define NCSI_PKT_AEN_CR         0x01 /* Configuration required   */
 +#define NCSI_PKT_AEN_HNCDSC     0x02 /* HNC driver status change */
 +
 +#endif /* NCSI_PKT_H */
 diff --git a/slirp/ncsi.c b/slirp/ncsi.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/slirp/ncsi.c
@@ -XXX,XX +XXX,XX @@
 +/*
 + * NC-SI (Network Controller Sideband Interface) "echo" model
 + *
 + * Copyright (C) 2016 IBM Corp.
 + *
 + * This code is licensed under the GPL version 2 or later. See the
 + * COPYING file in the top-level directory.
 + */
 +#include "qemu/osdep.h"
 +#include "slirp.h"
 +
 +#include "ncsi-pkt.h"
 +
 +/* Get Capabilities */
 +static int ncsi_rsp_handler_gc(struct ncsi_rsp_pkt_hdr *rnh)
 +{
 +    struct ncsi_rsp_gc_pkt *rsp = (struct ncsi_rsp_gc_pkt *) rnh;
 +
 +    rsp->cap = htonl(~0);
 +    rsp->bc_cap = htonl(~0);
 +    rsp->mc_cap = htonl(~0);
 +    rsp->buf_cap = htonl(~0);
 +    rsp->aen_cap = htonl(~0);
 +    rsp->vlan_mode = 0xff;
 +    rsp->uc_cnt = 2;
 +    return 0;
 +}
 +
-+static void colo_compare_timer_init(CompareState *s)
++/* Get Link status */
 +static int ncsi_rsp_handler_gls(struct ncsi_rsp_pkt_hdr *rnh)
 +{
-+    AioContext *ctx = iothread_get_aio_context(s->iothread);
++    struct ncsi_rsp_gls_pkt *rsp = (struct ncsi_rsp_gls_pkt *) rnh;
++
--    return TRUE;
++    rsp->status = htonl(0x1);
-+    s->packet_check_timer = aio_timer_new(ctx, QEMU_CLOCK_VIRTUAL,
++    return 0;
-+                                SCALE_MS, check_old_packet_regular,
++}
-+                                s);
++
-+    timer_mod(s->packet_check_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +
++static const struct ncsi_rsp_handler {
-+                    REGULAR_PACKET_CHECK_MS);
++        unsigned char   type;
- }
++        int             payload;
++        int             (*handler)(struct ncsi_rsp_pkt_hdr *rnh);
--static void *colo_compare_thread(void *opaque)
++} ncsi_rsp_handlers[] = {
-+static void colo_compare_timer_del(CompareState *s)
++        { NCSI_PKT_RSP_CIS,     4, NULL },
- {
++        { NCSI_PKT_RSP_SP,      4, NULL },
--    CompareState *s = opaque;
++        { NCSI_PKT_RSP_DP,      4, NULL },
--    GSource *timeout_source;
++        { NCSI_PKT_RSP_EC,      4, NULL },
-+    if (s->packet_check_timer) {
++        { NCSI_PKT_RSP_DC,      4, NULL },
-+        timer_del(s->packet_check_timer);
++        { NCSI_PKT_RSP_RC,      4, NULL },
-+        timer_free(s->packet_check_timer);
++        { NCSI_PKT_RSP_ECNT,    4, NULL },
-+        s->packet_check_timer = NULL;
++        { NCSI_PKT_RSP_DCNT,    4, NULL },
 +        { NCSI_PKT_RSP_AE,      4, NULL },
 +        { NCSI_PKT_RSP_SL,      4, NULL },
 +        { NCSI_PKT_RSP_GLS,    16, ncsi_rsp_handler_gls },
 +        { NCSI_PKT_RSP_SVF,     4, NULL },
 +        { NCSI_PKT_RSP_EV,      4, NULL },
 +        { NCSI_PKT_RSP_DV,      4, NULL },
 +        { NCSI_PKT_RSP_SMA,     4, NULL },
 +        { NCSI_PKT_RSP_EBF,     4, NULL },
 +        { NCSI_PKT_RSP_DBF,     4, NULL },
 +        { NCSI_PKT_RSP_EGMF,    4, NULL },
 +        { NCSI_PKT_RSP_DGMF,    4, NULL },
 +        { NCSI_PKT_RSP_SNFC,    4, NULL },
 +        { NCSI_PKT_RSP_GVI,    36, NULL },
 +        { NCSI_PKT_RSP_GC,     32, ncsi_rsp_handler_gc },
 +        { NCSI_PKT_RSP_GP,     -1, NULL },
 +        { NCSI_PKT_RSP_GCPS,  172, NULL },
 +        { NCSI_PKT_RSP_GNS,   172, NULL },
 +        { NCSI_PKT_RSP_GNPTS, 172, NULL },
 +        { NCSI_PKT_RSP_GPS,     8, NULL },
 +        { NCSI_PKT_RSP_OEM,     0, NULL },
 +        { NCSI_PKT_RSP_PLDM,    0, NULL },
 +        { NCSI_PKT_RSP_GPUUID, 20, NULL }
 +};
 +
 +/*
 + * packet format : ncsi header + payload + checksum
 + */
 +#define NCSI_MAX_PAYLOAD 172
 +#define NCSI_MAX_LEN     (sizeof(struct ncsi_pkt_hdr) + NCSI_MAX_PAYLOAD + 4)
 +
 +void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
 +{
 +    struct ncsi_pkt_hdr *nh = (struct ncsi_pkt_hdr *)(pkt + ETH_HLEN);
 +    uint8_t ncsi_reply[ETH_HLEN + NCSI_MAX_LEN];
 +    struct ethhdr *reh = (struct ethhdr *)ncsi_reply;
 +    struct ncsi_rsp_pkt_hdr *rnh = (struct ncsi_rsp_pkt_hdr *)
 +        (ncsi_reply + ETH_HLEN);
 +    const struct ncsi_rsp_handler *handler = NULL;
 +    int i;
 +
 +    memset(ncsi_reply, 0, sizeof(ncsi_reply));
 +
 +    memset(reh->h_dest, 0xff, ETH_ALEN);
 +    memset(reh->h_source, 0xff, ETH_ALEN);
 +    reh->h_proto = htons(ETH_P_NCSI);
 +
 +    for (i = 0; i < ARRAY_SIZE(ncsi_rsp_handlers); i++) {
 +        if (ncsi_rsp_handlers[i].type == nh->type + 0x80) {
 +            handler = &ncsi_rsp_handlers[i];
 +            break;
 +        }
 +    }
-+ }
++
++    rnh->common.mc_id      = nh->mc_id;
--    s->worker_context = g_main_context_new();
++    rnh->common.revision   = NCSI_PKT_REVISION;
-+static void colo_compare_iothread(CompareState *s)
++    rnh->common.id         = nh->id;
-+{
++    rnh->common.type       = nh->type + 0x80;
-+    object_ref(OBJECT(s->iothread));
++    rnh->common.channel    = nh->channel;
-+    s->worker_context = iothread_get_g_main_context(s->iothread);
++
++    if (handler) {
-     qemu_chr_fe_set_handlers(&s->chr_pri_in, compare_chr_can_read,
++        rnh->common.length = htons(handler->payload);
-                              compare_pri_chr_in, NULL, NULL,
++        rnh->code          = htons(NCSI_PKT_RSP_C_COMPLETED);
-@@ -XXX,XX +XXX,XX @@ static void *colo_compare_thread(void *opaque)
++        rnh->reason        = htons(NCSI_PKT_RSP_R_NO_ERROR);
-                              compare_sec_chr_in, NULL, NULL,
++
-                              s, s->worker_context, true);
++        if (handler->handler) {
++            /* TODO: handle errors */
--    s->compare_loop = g_main_loop_new(s->worker_context, FALSE);
++            handler->handler(rnh);
--
++        }
--    /* To kick any packets that the secondary doesn't match */
++    } else {
--    timeout_source = g_timeout_source_new(REGULAR_PACKET_CHECK_MS);
++        rnh->common.length = 0;
--    g_source_set_callback(timeout_source,
++        rnh->code          = htons(NCSI_PKT_RSP_C_UNAVAILABLE);
--                          (GSourceFunc)check_old_packet_regular, s, NULL);
++        rnh->reason        = htons(NCSI_PKT_RSP_R_UNKNOWN);
 -    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);
++    /* TODO: add a checksum at the end of the frame but the specs
++     * allows it to be zero */
-     g_queue_clear(&s->conn_list);
++
++    slirp_output(slirp->opaque, ncsi_reply, ETH_HLEN + sizeof(*nh) +
--    g_hash_table_destroy(s->connection_track_table);
++                 (handler ? handler->payload : 0) + 4);
-+    if (s->connection_track_table) {
++}
-+        g_hash_table_destroy(s->connection_track_table);
+diff --git a/slirp/slirp.c b/slirp/slirp.c
-+    }
+index XXXXXXX..XXXXXXX 100644
-+
+--- a/slirp/slirp.c
-+    if (s->iothread) {
++++ b/slirp/slirp.c
-+        object_unref(OBJECT(s->iothread));
+@@ -XXX,XX +XXX,XX @@ void slirp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
-+    }
+         }
-     g_free(s->pri_indev);
+         break;
-     g_free(s->sec_indev);
-     g_free(s->outdev);
++    case ETH_P_NCSI:
 +        ncsi_input(slirp, pkt, pkt_len);
 +        break;
 +
      default:
          break;
      }
 diff --git a/slirp/slirp.h b/slirp/slirp.h
 index XXXXXXX..XXXXXXX 100644
 --- a/slirp/slirp.h
 +++ b/slirp/slirp.h
@@ -XXX,XX +XXX,XX @@ extern Slirp *slirp_instance;
  void if_start(Slirp *);
 +/* ncsi.c */
 +void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pkt_len);
 +
  #ifndef _WIN32
  #include <netdb.h>
  #endif
 --
 .7.4

-[Qemu-devel] [PULL 13/18] net/colo-compare.c: Optimize unpredictable tcp options comparison
+[Qemu-devel] [PULL V2 7/8] COLO-compare: Optimize tcp compare for option field
 From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-When network is busy, some tcp options(like sack) will unpredictable
+In this patch we support packet that have tcp options field.
-occur in primary side or secondary side. it will make packet size
+Add tcp options field check, If the packet have options
-not same, but the two packet's payload is identical. colo just
+field we just skip it and compare tcp payload,
-care about packet payload, so we skip the option field.
+Avoid unnecessary checkpoint, optimize performance.
 Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 39 +++++++++++++++++++++++++++------------
+ net/colo-compare.c | 27 ++++++++++++++++++++++++++-
-file changed, 27 insertions(+), 12 deletions(-)
+file changed, 26 insertions(+), 1 deletion(-)
 diff --git a/net/colo-compare.c b/net/colo-compare.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/colo-compare.c
 +++ b/net/colo-compare.c
-@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode)
+@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
-  * return:    0  means packet same
+         spkt->ip->ip_sum = ppkt->ip->ip_sum;
   *            > 0 || < 0 means packet different
   */
 -static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)
 +static int colo_packet_compare_common(Packet *ppkt,
 +                                      Packet *spkt,
 +                                      int poffset,
 +                                      int soffset)
  {
      if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
          char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)
                                     sec_ip_src, sec_ip_dst);
      }
--    offset = ppkt->vnet_hdr_len + offset;
+-    if (ptcp->th_sum == stcp->th_sum) {
-+    poffset = ppkt->vnet_hdr_len + poffset;
++    /*
-+    soffset = ppkt->vnet_hdr_len + soffset;
++     * Check tcp header length for tcp option field.
++     * th_off > 5 means this tcp packet have options field.
--    if (ppkt->size == spkt->size) {
++     * The tcp options maybe always different.
--        return memcmp(ppkt->data + offset,
++     * for example:
--                      spkt->data + offset,
++     * From RFC 7323.
--                      spkt->size - offset);
++     * TCP Timestamps option (TSopt):
-+    if (ppkt->size - poffset == spkt->size - soffset) {
++     * Kind: 8
-+        return memcmp(ppkt->data + poffset,
++     *
-+                      spkt->data + soffset,
++     * Length: 10 bytes
-+                      spkt->size - soffset);
++     *
-     } else {
++     *    +-------+-------+---------------------+---------------------+
-         trace_colo_compare_main("Net packet size are not the same");
++     *    |Kind=8 |  10   |   TS Value (TSval)  |TS Echo Reply (TSecr)|
-         return -1;
++     *    +-------+-------+---------------------+---------------------+
-@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
++     *       1       1              4                     4
-      * so we just need skip this field.
++     *
-      */
++     * In this case the primary guest's timestamp always different with
-     if (ptcp->th_off > 5) {
++     * the secondary guest's timestamp. COLO just focus on payload,
--        ptrdiff_t tcp_offset;
++     * so we just need skip this field.
-+        ptrdiff_t ptcp_offset, stcp_offset;
++     */
++    if (ptcp->th_off > 5) {
--        tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
++        ptrdiff_t tcp_offset;
--                     + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
++        tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
--        res = colo_packet_compare_common(ppkt, spkt, tcp_offset);
++                     + (ptcp->th_off * 4);
-+        ptcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
++        res = colo_packet_compare_common(ppkt, spkt, tcp_offset);
-+                      + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
++    } else if (ptcp->th_sum == stcp->th_sum) {
-+        stcp_offset = spkt->transport_header - (uint8_t *)spkt->data
+         res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);
 +                      + (stcp->th_off * 4) - spkt->vnet_hdr_len;
 +
 +        /*
 +         * When network is busy, some tcp options(like sack) will unpredictable
 +         * occur in primary side or secondary side. it will make packet size
 +         * not same, but the two packet's payload is identical. colo just
 +         * care about packet payload, so we skip the option field.
 +         */
 +        res = colo_packet_compare_common(ppkt, spkt, ptcp_offset, stcp_offset);
      } else if (ptcp->th_sum == stcp->th_sum) {
 -        res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);
 +        res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN, ETH_HLEN);
      } else {
          res = -1;
-     }
-@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
-      * the ip payload here.
-      */
-     ret = colo_packet_compare_common(ppkt, spkt,
-+                                     network_header_length + ETH_HLEN,
-                                      network_header_length + ETH_HLEN);
-     if (ret) {
-@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
-      * the ip payload here.
-      */
-     if (colo_packet_compare_common(ppkt, spkt,
-+                                   network_header_length + ETH_HLEN,
-                                    network_header_length + ETH_HLEN)) {
-         trace_colo_compare_icmp_miscompare("primary pkt size",
-                                            ppkt->size);
-@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_other(Packet *spkt, Packet *ppkt)
-                                    sec_ip_src, sec_ip_dst);
-     }
--    return colo_packet_compare_common(ppkt, spkt, 0);
-+    return colo_packet_compare_common(ppkt, spkt, 0, 0);
- }
- static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time)
 --
 .7.4

-[Qemu-devel] [PULL 14/18] net/colo-compare.c: Adjust net queue pop order for performance
+[Qemu-devel] [PULL V2 8/8] COLO-compare: Optimize tcp compare trace event
 From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-The packet_enqueue() use g_queue_push_tail() to
+Optimize two trace events as one, adjust print format make
-enqueue net packet, so it is more efficent way use
+it easy to read. rename trace_colo_compare_pkt_info_src/dst
-g_queue_pop_head() to get packet for compare.
+to trace_colo_compare_tcp_info.
 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>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 4 ++--
+ net/colo-compare.c | 29 +++++++++++++++++------------
-file changed, 2 insertions(+), 2 deletions(-)
+ net/trace-events   |  3 +--
 files changed, 18 insertions(+), 14 deletions(-)
 diff --git a/net/colo-compare.c b/net/colo-compare.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/colo-compare.c
 +++ b/net/colo-compare.c
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
+@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
+         res = -1;
-     while (!g_queue_is_empty(&conn->primary_list) &&
+     }
-            !g_queue_is_empty(&conn->secondary_list)) {
--        pkt = g_queue_pop_tail(&conn->primary_list);
+-    if (res != 0 && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {
-+        pkt = g_queue_pop_head(&conn->primary_list);
+-        trace_colo_compare_pkt_info_src(inet_ntoa(ppkt->ip->ip_src),
-         switch (conn->ip_proto) {
+-                                        ntohl(stcp->th_seq),
-         case IPPROTO_TCP:
+-                                        ntohl(stcp->th_ack),
-             result = g_queue_find_custom(&conn->secondary_list,
+-                                        res, stcp->th_flags,
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
+-                                        spkt->size);
-              * until next comparison.
+-
-              */
+-        trace_colo_compare_pkt_info_dst(inet_ntoa(ppkt->ip->ip_dst),
-             trace_colo_compare_main("packet different");
+-                                        ntohl(ptcp->th_seq),
--            g_queue_push_tail(&conn->primary_list, pkt);
+-                                        ntohl(ptcp->th_ack),
-+            g_queue_push_head(&conn->primary_list, pkt);
+-                                        res, ptcp->th_flags,
-             /* TODO: colo_notify_checkpoint();*/
+-                                        ppkt->size);
-             break;
++    if (res && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {
-         }
++        char ip_src[20], ip_dst[20];
 +
 +        strcpy(ip_src, inet_ntoa(ppkt->ip->ip_src));
 +        strcpy(ip_dst, inet_ntoa(ppkt->ip->ip_dst));
 +
 +        trace_colo_compare_tcp_info(ip_src,
 +                                    ip_dst,
 +                                    ntohl(ptcp->th_seq),
 +                                    ntohl(stcp->th_seq),
 +                                    ntohl(ptcp->th_ack),
 +                                    ntohl(stcp->th_ack),
 +                                    res,
 +                                    ptcp->th_flags,
 +                                    stcp->th_flags,
 +                                    ppkt->size,
 +                                    spkt->size);
          qemu_hexdump((char *)ppkt->data, stderr,
                       "colo-compare ppkt", ppkt->size);
 diff --git a/net/trace-events b/net/trace-events
 index XXXXXXX..XXXXXXX 100644
 --- a/net/trace-events
 +++ b/net/trace-events
@@ -XXX,XX +XXX,XX @@ colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"
  colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"
  colo_old_packet_check_found(int64_t old_time) "%" PRId64
  colo_compare_miscompare(void) ""
 -colo_compare_pkt_info_src(const char *src, uint32_t sseq, uint32_t sack, int res, uint32_t sflag, int ssize) "src/dst: %s s: seq/ack=%u/%u res=%d flags=%x spkt_size: %d\n"
 -colo_compare_pkt_info_dst(const char *dst, uint32_t dseq, uint32_t dack, int res, uint32_t dflag, int dsize) "src/dst: %s d: seq/ack=%u/%u res=%d flags=%x dpkt_size: %d\n"
 +colo_compare_tcp_info(const char *src, const char *dst, uint32_t pseq, uint32_t sseq, uint32_t pack, uint32_t sack, int res, uint32_t pflag, uint32_t sflag, int psize, int ssize) "src/dst: %s/%s pseq/sseq:%u/%u pack/sack:%u/%u res=%d pflags/sflag:%x/%x psize/ssize:%d/%d \n"
  # net/filter-rewriter.c
  colo_filter_rewriter_debug(void) ""
 --
 .7.4

-[Qemu-devel] [PULL 16/18] qemu-iothread: IOThread supports the GMainContext event loop
+Deleted patch
-From: Wang Yong <wang.yong155@zte.com.cn>
-IOThread uses AioContext event loop and does not run a GMainContext.
-Therefore,chardev cannot work in IOThread,such as the chardev is
-used for colo-compare packets reception.
-This patch makes the IOThread run the GMainContext event loop,
-chardev and IOThread can work together.
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Wang Yong <wang.yong155@zte.com.cn>
-Signed-off-by: Wang Guang <wang.guang55@zte.com.cn>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- include/sysemu/iothread.h |  4 ++++
- iothread.c                | 45 +++++++++++++++++++++++++++++++++++++++++++++
-files changed, 49 insertions(+)
-diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/sysemu/iothread.h
-+++ b/include/sysemu/iothread.h
-@@ -XXX,XX +XXX,XX @@ typedef struct {
-     QemuThread thread;
-     AioContext *ctx;
-+    GMainContext *worker_context;
-+    GMainLoop *main_loop;
-+    GOnce once;
-     QemuMutex init_done_lock;
-     QemuCond init_done_cond;    /* is thread initialization done? */
-     bool stopping;
-@@ -XXX,XX +XXX,XX @@ typedef struct {
- char *iothread_get_id(IOThread *iothread);
- AioContext *iothread_get_aio_context(IOThread *iothread);
- void iothread_stop_all(void);
-+GMainContext *iothread_get_g_main_context(IOThread *iothread);
- #endif /* IOTHREAD_H */
-diff --git a/iothread.c b/iothread.c
-index XXXXXXX..XXXXXXX 100644
---- a/iothread.c
-+++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ static void *iothread_run(void *opaque)
-     while (!atomic_read(&iothread->stopping)) {
-         aio_poll(iothread->ctx, true);
-+
-+        if (atomic_read(&iothread->worker_context)) {
-+            GMainLoop *loop;
-+
-+            g_main_context_push_thread_default(iothread->worker_context);
-+            iothread->main_loop =
-+                g_main_loop_new(iothread->worker_context, TRUE);
-+            loop = iothread->main_loop;
-+
-+            g_main_loop_run(iothread->main_loop);
-+            iothread->main_loop = NULL;
-+            g_main_loop_unref(loop);
-+
-+            g_main_context_pop_thread_default(iothread->worker_context);
-+            g_main_context_unref(iothread->worker_context);
-+            iothread->worker_context = NULL;
-+        }
-     }
-     rcu_unregister_thread();
-@@ -XXX,XX +XXX,XX @@ static int iothread_stop(Object *object, void *opaque)
-     }
-     iothread->stopping = true;
-     aio_notify(iothread->ctx);
-+    if (atomic_read(&iothread->main_loop)) {
-+        g_main_loop_quit(iothread->main_loop);
-+    }
-     qemu_thread_join(&iothread->thread);
-     return 0;
- }
-@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
-     qemu_mutex_init(&iothread->init_done_lock);
-     qemu_cond_init(&iothread->init_done_cond);
-+    iothread->once = (GOnce) G_ONCE_INIT;
-     /* This assumes we are called from a thread with useful CPU affinity for us
-      * to inherit.
-@@ -XXX,XX +XXX,XX @@ void iothread_stop_all(void)
-     object_child_foreach(container, iothread_stop, NULL);
- }
-+
-+static gpointer iothread_g_main_context_init(gpointer opaque)
-+{
-+    AioContext *ctx;
-+    IOThread *iothread = opaque;
-+    GSource *source;
-+
-+    iothread->worker_context = g_main_context_new();
-+
-+    ctx = iothread_get_aio_context(iothread);
-+    source = aio_get_g_source(ctx);
-+    g_source_attach(source, iothread->worker_context);
-+    g_source_unref(source);
-+
-+    aio_notify(iothread->ctx);
-+    return NULL;
-+}
-+
-+GMainContext *iothread_get_g_main_context(IOThread *iothread)
-+{
-+    g_once(&iothread->once, iothread_g_main_context_init, iothread);
-+
-+    return iothread->worker_context;
-+}
---
-.7.4

The following changes since commit cda4a338c4243fa3bff4498b935340ac7121cc76:

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

are available in the git repository at:

https://github.com/jasowang/qemu.git tags/net-pull-request

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

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>
Signed-off-by: Jason Wang <jasowang@redhat.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
index XXXXXXX..XXXXXXX 100644
--- 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 */
             tcp_pkt->th_ack = htonl(ntohl(tcp_pkt->th_ack) + conn->offset);
 
-            net_checksum_calculate((uint8_t *)pkt->data, pkt->size);
+            net_checksum_calculate((uint8_t *)pkt->data + pkt->vnet_hdr_len,
+                                   pkt->size - pkt->vnet_hdr_len);
         }
     }
 
@@ -XXX,XX +XXX,XX @@ static int handle_secondary_tcp_pkt(NetFilterState *nf,
             /* handle packets to the primary from the secondary*/
             tcp_pkt->th_seq = htonl(ntohl(tcp_pkt->th_seq) - conn->offset);
 
-            net_checksum_calculate((uint8_t *)pkt->data, pkt->size);
+            net_checksum_calculate((uint8_t *)pkt->data + pkt->vnet_hdr_len,
+                                   pkt->size - pkt->vnet_hdr_len);
         }
     }
 
-- 
2.7.4

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>
Signed-off-by: Jason Wang <jasowang@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
index XXXXXXX..XXXXXXX 100644
--- 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) {
-        return false;
-    }
 
     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);
     }
 
     return w;
-- 
2.7.4

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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 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
index XXXXXXX..XXXXXXX 100644
--- 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:
-- 
2.7.4

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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 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
index XXXXXXX..XXXXXXX 100644
--- 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;
     }
 
@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
 
     /* MSI-X init */
 
-    err = rocker_msix_init(r);
+    err = rocker_msix_init(r, errp);
     if (err) {
         goto err_msix_init;
     }
@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
     }
 
     if (rocker_find(r->name)) {
-        err = -EEXIST;
+        error_setg(errp, "%s already exists", r->name);
         goto err_duplicate;
     }
 
@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
 #define ROCKER_IFNAMSIZ 16
 #define MAX_ROCKER_NAME_LEN  (ROCKER_IFNAMSIZ - 1 - 3 - 3)
     if (strlen(r->name) > MAX_ROCKER_NAME_LEN) {
-        fprintf(stderr,
-                "rocker: name too long; please shorten to at most %d chars\n",
+        error_setg(errp,
+                "name too long; please shorten to at most %d chars",
                 MAX_ROCKER_NAME_LEN);
-        err = -EINVAL;
         goto err_name_too_long;
     }
 
@@ -XXX,XX +XXX,XX @@ static int pci_rocker_init(PCIDevice *dev)
 
     QLIST_INSERT_HEAD(&rockers, r, next);
 
-    return 0;
+    return;
 
 err_name_too_long:
 err_duplicate:
@@ -XXX,XX +XXX,XX @@ err_world_type_by_name:
             world_free(r->worlds[i]);
         }
     }
-    return err;
 }
 
 static void pci_rocker_uninit(PCIDevice *dev)
@@ -XXX,XX +XXX,XX @@ static void rocker_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 
-    k->init = pci_rocker_init;
+    k->realize = pci_rocker_realize;
     k->exit = pci_rocker_uninit;
     k->vendor_id = PCI_VENDOR_ID_REDHAT;
     k->device_id = PCI_DEVICE_ID_REDHAT_ROCKER;
-- 
2.7.4

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

Cc: jasowang@redhat.com
Cc: jiri@resnulli.us
Cc: armbru@redhat.com
Cc: f4bug@amsat.org
Suggested-by: Markus Armbruster <armbru@redhat.com>
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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/rocker/rocker.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -XXX,XX +XXX,XX @@ struct rocker {
     QLIST_ENTRY(rocker) next;
 };
 
-#define ROCKER "rocker"
+#define TYPE_ROCKER "rocker"
 
-#define to_rocker(obj) \
-    OBJECT_CHECK(Rocker, (obj), ROCKER)
+#define ROCKER(obj) \
+    OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER)
 
 static QLIST_HEAD(, rocker) rockers;
 
@@ -XXX,XX +XXX,XX @@ static World *rocker_world_type_by_name(Rocker *r, const char *name)
 
 static void pci_rocker_realize(PCIDevice *dev, Error **errp)
 {
-    Rocker *r = to_rocker(dev);
+    Rocker *r = ROCKER(dev);
     const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };
     const MACAddr dflt = { .a = { 0x52, 0x54, 0x00, 0x12, 0x35, 0x01 } };
     static int sw_index;
@@ -XXX,XX +XXX,XX @@ static void pci_rocker_realize(PCIDevice *dev, Error **errp)
     /* validate switch properties */
 
     if (!r->name) {
-        r->name = g_strdup(ROCKER);
+        r->name = g_strdup(TYPE_ROCKER);
     }
 
     if (rocker_find(r->name)) {
@@ -XXX,XX +XXX,XX @@ err_world_type_by_name:
 
 static void pci_rocker_uninit(PCIDevice *dev)
 {
-    Rocker *r = to_rocker(dev);
+    Rocker *r = ROCKER(dev);
     int i;
 
     QLIST_REMOVE(r, next);
@@ -XXX,XX +XXX,XX @@ static void pci_rocker_uninit(PCIDevice *dev)
 
 static void rocker_reset(DeviceState *dev)
 {
-    Rocker *r = to_rocker(dev);
+    Rocker *r = ROCKER(dev);
     int i;
 
     for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
@@ -XXX,XX +XXX,XX @@ static Property rocker_properties[] = {
 };
 
 static const VMStateDescription rocker_vmsd = {
-    .name = ROCKER,
+    .name = TYPE_ROCKER,
     .unmigratable = 1,
 };
 
@@ -XXX,XX +XXX,XX @@ static void rocker_class_init(ObjectClass *klass, void *data)
 }
 
 static const TypeInfo rocker_info = {
-    .name          = ROCKER,
+    .name          = TYPE_ROCKER,
     .parent        = TYPE_PCI_DEVICE,
     .instance_size = sizeof(Rocker),
     .class_init    = rocker_class_init,
-- 
2.7.4

From: Matt Parker <mtparkr@gmail.com>

Both io and memory use the same mmio functions in the rtl8139 device.
This patch removes the separate MemoryRegionOps and old_mmio accessors
for memory, and replaces it with an alias to the io memory region.

Signed-off-by: Matt Parker <mtparkr@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/rtl8139.c | 53 +++--------------------------------------------------
 1 file changed, 3 insertions(+), 50 deletions(-)

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -XXX,XX +XXX,XX @@ static uint32_t rtl8139_io_readl(void *opaque, uint8_t addr)
 
 /* */
 
-static void rtl8139_mmio_writeb(void *opaque, hwaddr addr, uint32_t val)
-{
-    rtl8139_io_writeb(opaque, addr & 0xFF, val);
-}
-
-static void rtl8139_mmio_writew(void *opaque, hwaddr addr, uint32_t val)
-{
-    rtl8139_io_writew(opaque, addr & 0xFF, val);
-}
-
-static void rtl8139_mmio_writel(void *opaque, hwaddr addr, uint32_t val)
-{
-    rtl8139_io_writel(opaque, addr & 0xFF, val);
-}
-
-static uint32_t rtl8139_mmio_readb(void *opaque, hwaddr addr)
-{
-    return rtl8139_io_readb(opaque, addr & 0xFF);
-}
-
-static uint32_t rtl8139_mmio_readw(void *opaque, hwaddr addr)
-{
-    uint32_t val = rtl8139_io_readw(opaque, addr & 0xFF);
-    return val;
-}
-
-static uint32_t rtl8139_mmio_readl(void *opaque, hwaddr addr)
-{
-    uint32_t val = rtl8139_io_readl(opaque, addr & 0xFF);
-    return val;
-}
-
 static int rtl8139_post_load(void *opaque, int version_id)
 {
     RTL8139State* s = opaque;
@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps rtl8139_io_ops = {
     .endianness = DEVICE_LITTLE_ENDIAN,
 };
 
-static const MemoryRegionOps rtl8139_mmio_ops = {
-    .old_mmio = {
-        .read = {
-            rtl8139_mmio_readb,
-            rtl8139_mmio_readw,
-            rtl8139_mmio_readl,
-        },
-        .write = {
-            rtl8139_mmio_writeb,
-            rtl8139_mmio_writew,
-            rtl8139_mmio_writel,
-        },
-    },
-    .endianness = DEVICE_LITTLE_ENDIAN,
-};
-
 static void rtl8139_timer(void *opaque)
 {
     RTL8139State *s = opaque;
@@ -XXX,XX +XXX,XX @@ static void pci_rtl8139_realize(PCIDevice *dev, Error **errp)
 
     memory_region_init_io(&s->bar_io, OBJECT(s), &rtl8139_io_ops, s,
                           "rtl8139", 0x100);
-    memory_region_init_io(&s->bar_mem, OBJECT(s), &rtl8139_mmio_ops, s,
-                          "rtl8139", 0x100);
+    memory_region_init_alias(&s->bar_mem, OBJECT(s), "rtl8139-mem", &s->bar_io,
+                             0, 0x100);
+
     pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->bar_io);
     pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar_mem);
 
-- 
2.7.4

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

In net_socket_fd_init(), the 'default' case is odd: it warns,
then continues as if the socket type was SOCK_STREAM. The
comment explains "this could be a eg. a pty", but that makes
no sense. If @fd really was a pty, getsockopt() would fail
with ENOTSOCK. If @fd was a socket, but neither SOCK_DGRAM nor
SOCK_STREAM. It should not be treated as if it was SOCK_STREAM.

Turn this case into an Error. If there is a genuine reason to
support something like SOCK_RAW, it should be explicitly
handled.

Cc: jasowang@redhat.com
Cc: armbru@redhat.com
Cc: berrange@redhat.com
Cc: armbru@redhat.com
Cc: eblake@redhat.com
Suggested-by: Markus Armbruster <armbru@redhat.com>
Suggested-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/socket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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(NetClientState *peer,
     case SOCK_STREAM:
         return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
     default:
-        /* who knows ... this could be a eg. a pty, do warn and continue as stream */
-        fprintf(stderr, "qemu: warning: socket type=%d for fd=%d is not SOCK_DGRAM or SOCK_STREAM\n", so_type, fd);
-        return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
+        error_report("socket type=%d for fd=%d must be either"
+                     " SOCK_DGRAM or SOCK_STREAM", so_type, fd);
+        closesocket(fd);
     }
     return NULL;
 }
-- 
2.7.4

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

Currently, net_socket_mcast_create(), net_socket_fd_init_dgram() and
net_socket_fd_init() use the function such as fprintf(), perror() to
report an error message.

Now, convert these functions to Error.

Cc: jasowang@redhat.com
Cc: armbru@redhat.com
Cc: berrange@redhat.com
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/socket.c | 82 ++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 50 insertions(+), 32 deletions(-)

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 void net_socket_send_dgram(void *opaque)
     }
 }
 
-static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr *localaddr)
+static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,
+                                   struct in_addr *localaddr,
+                                   Error **errp)
 {
     struct ip_mreq imr;
     int fd;
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
 #endif
 
     if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
-        fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) "
-                "does not contain a multicast address\n",
-                inet_ntoa(mcastaddr->sin_addr),
-                (int)ntohl(mcastaddr->sin_addr.s_addr));
+        error_setg(errp, "specified mcastaddr %s (0x%08x) "
+                   "does not contain a multicast address",
+                   inet_ntoa(mcastaddr->sin_addr),
+                   (int)ntohl(mcastaddr->sin_addr.s_addr));
         return -1;
-
     }
+
     fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
     if (fd < 0) {
-        perror("socket(PF_INET, SOCK_DGRAM)");
+        error_setg_errno(errp, errno, "can't create datagram socket");
         return -1;
     }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
     val = 1;
     ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
     if (ret < 0) {
-        perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)");
+        error_setg_errno(errp, errno,
+                         "can't set socket option SO_REUSEADDR");
         goto fail;
     }
 
     ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));
     if (ret < 0) {
-        perror("bind");
+        error_setg_errno(errp, errno, "can't bind ip=%s to socket",
+                         inet_ntoa(mcastaddr->sin_addr));
         goto fail;
     }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
     ret = qemu_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
                           &imr, sizeof(struct ip_mreq));
     if (ret < 0) {
-        perror("setsockopt(IP_ADD_MEMBERSHIP)");
+        error_setg_errno(errp, errno,
+                         "can't add socket to multicast group %s",
+                         inet_ntoa(imr.imr_multiaddr));
         goto fail;
     }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
     ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
                           &loop, sizeof(loop));
     if (ret < 0) {
-        perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)");
+        error_setg_errno(errp, errno,
+                         "can't force multicast message to loopback");
         goto fail;
     }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
         ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
                               localaddr, sizeof(*localaddr));
         if (ret < 0) {
-            perror("setsockopt(IP_MULTICAST_IF)");
+            error_setg_errno(errp, errno,
+                             "can't set the default network send interface");
             goto fail;
         }
     }
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
                                                 const char *model,
                                                 const char *name,
                                                 int fd, int is_connected,
-                                                const char *mcast)
+                                                const char *mcast,
+                                                Error **errp)
 {
     struct sockaddr_in saddr;
     int newfd;
@@ -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) {
-                fprintf(stderr,
-                        "qemu: error: init_dgram: fd=%d failed parse_host_port()\n",
-                        fd);
+                error_setg(errp, "fd=%d failed parse_host_port()", fd);
                 goto err;
             }
             /* must be bound */
             if (saddr.sin_addr.s_addr == 0) {
-                fprintf(stderr, "qemu: error: init_dgram: fd=%d unbound, "
-                        "cannot setup multicast dst addr\n", fd);
+                error_setg(errp, "can't setup multicast destination address");
                 goto err;
             }
             /* clone dgram socket */
-            newfd = net_socket_mcast_create(&saddr, NULL);
+            newfd = net_socket_mcast_create(&saddr, NULL, errp);
             if (newfd < 0) {
-                /* error already reported by net_socket_mcast_create() */
                 goto err;
             }
             /* clone newfd to fd, close newfd */
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
 
 static NetSocketState *net_socket_fd_init(NetClientState *peer,
                                           const char *model, const char *name,
-                                          int fd, int is_connected, const char *mc)
+                                          int fd, int is_connected,
+                                          const char *mc, Error **errp)
 {
     int so_type = -1, optlen=sizeof(so_type);
 
     if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
         (socklen_t *)&optlen)< 0) {
-        fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n",
-                fd);
+        error_setg(errp, "can't get socket option SO_TYPE");
         closesocket(fd);
         return NULL;
     }
     switch(so_type) {
     case SOCK_DGRAM:
-        return net_socket_fd_init_dgram(peer, model, name, fd, is_connected, mc);
+        return net_socket_fd_init_dgram(peer, model, name, fd, is_connected,
+                                        mc, errp);
     case SOCK_STREAM:
         return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
     default:
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
     NetSocketState *s;
     int fd, connected, ret;
     struct sockaddr_in saddr;
+    Error *err = NULL;
 
     if (parse_host_port(&saddr, host_str) < 0)
         return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
             break;
         }
     }
-    s = net_socket_fd_init(peer, model, name, fd, connected, NULL);
-    if (!s)
+    s = net_socket_fd_init(peer, model, name, fd, connected, NULL, &err);
+    if (!s) {
+        error_report_err(err);
         return -1;
+    }
+
     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
              "socket: connect to %s:%d",
              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
     int fd;
     struct sockaddr_in saddr;
     struct in_addr localaddr, *param_localaddr;
+    Error *err = NULL;
 
     if (parse_host_port(&saddr, host_str) < 0)
         return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
         param_localaddr = NULL;
     }
 
-    fd = net_socket_mcast_create(&saddr, param_localaddr);
-    if (fd < 0)
+    fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
+    if (fd < 0) {
+        error_report_err(err);
         return -1;
+    }
 
-    s = net_socket_fd_init(peer, model, name, fd, 0, NULL);
-    if (!s)
+    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);
+    if (!s) {
+        error_report_err(err);
         return -1;
+    }
 
     s->dgram_dst = saddr;
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
     NetSocketState *s;
     int fd, ret;
     struct sockaddr_in laddr, raddr;
+    Error *err = NULL;
 
     if (parse_host_port(&laddr, lhost) < 0) {
         return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
     }
     qemu_set_nonblock(fd);
 
-    s = net_socket_fd_init(peer, model, name, fd, 0, NULL);
+    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);
     if (!s) {
+        error_report_err(err);
         return -1;
     }
 
@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
             return -1;
         }
         qemu_set_nonblock(fd);
-        if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast)) {
+        if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast,
+                                errp)) {
             return -1;
         }
         return 0;
-- 
2.7.4

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>
Signed-off-by: Jason Wang <jasowang@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
index XXXXXXX..XXXXXXX 100644
--- 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;
     }
 
-- 
2.7.4

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

When -net socket fails, it first reports a specific error, then
a generic one, like this:

$ ./x86_64-softmmu/qemu-system-x86_64 -net socket,mcast=230.0.0.1:1234,listen
    qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: exactly one of listen=, connect=, mcast= or udp= is required
    qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: Device 'socket' could not be initialized

Convert net_socket_*_init() to Error to get rid of the superfluous second
error message. After the patch, the effect like this:

This also fixes a few silent failures to report an error.

Cc: jasowang@redhat.com
Cc: armbru@redhat.com
Cc: berrange@redhat.com
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/socket.c | 92 +++++++++++++++++++++++++++++-------------------------------
 1 file changed, 44 insertions(+), 48 deletions(-)

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 void net_socket_accept(void *opaque)
 static int net_socket_listen_init(NetClientState *peer,
                                   const char *model,
                                   const char *name,
-                                  const char *host_str)
+                                  const char *host_str,
+                                  Error **errp)
 {
     NetClientState *nc;
     NetSocketState *s;
     struct sockaddr_in saddr;
     int fd, ret;
-    Error *err = NULL;
 
-    if (parse_host_port(&saddr, host_str, &err) < 0) {
-        error_report_err(err);
+    if (parse_host_port(&saddr, host_str, errp) < 0) {
         return -1;
     }
 
     fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
     if (fd < 0) {
-        perror("socket");
+        error_setg_errno(errp, errno, "can't create stream socket");
         return -1;
     }
     qemu_set_nonblock(fd);
@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
 
     ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));
     if (ret < 0) {
-        perror("bind");
+        error_setg_errno(errp, errno, "can't bind ip=%s to socket",
+                         inet_ntoa(saddr.sin_addr));
         closesocket(fd);
         return -1;
     }
     ret = listen(fd, 0);
     if (ret < 0) {
-        perror("listen");
+        error_setg_errno(errp, errno, "can't listen on socket");
         closesocket(fd);
         return -1;
     }
@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
 static int net_socket_connect_init(NetClientState *peer,
                                    const char *model,
                                    const char *name,
-                                   const char *host_str)
+                                   const char *host_str,
+                                   Error **errp)
 {
     NetSocketState *s;
     int fd, connected, ret;
     struct sockaddr_in saddr;
-    Error *err = NULL;
 
-    if (parse_host_port(&saddr, host_str, &err) < 0) {
-        error_report_err(err);
+    if (parse_host_port(&saddr, host_str, errp) < 0) {
         return -1;
     }
 
     fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
     if (fd < 0) {
-        perror("socket");
+        error_setg_errno(errp, errno, "can't create stream socket");
         return -1;
     }
     qemu_set_nonblock(fd);
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
                        errno == EINVAL) {
                 break;
             } else {
-                perror("connect");
+                error_setg_errno(errp, errno, "can't connect socket");
                 closesocket(fd);
                 return -1;
             }
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
             break;
         }
     }
-    s = net_socket_fd_init(peer, model, name, fd, connected, NULL, &err);
+    s = net_socket_fd_init(peer, model, name, fd, connected, NULL, errp);
     if (!s) {
-        error_report_err(err);
         return -1;
     }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
                                  const char *model,
                                  const char *name,
                                  const char *host_str,
-                                 const char *localaddr_str)
+                                 const char *localaddr_str,
+                                 Error **errp)
 {
     NetSocketState *s;
     int fd;
     struct sockaddr_in saddr;
     struct in_addr localaddr, *param_localaddr;
-    Error *err = NULL;
 
-    if (parse_host_port(&saddr, host_str, &err) < 0) {
-        error_report_err(err);
+    if (parse_host_port(&saddr, host_str, errp) < 0) {
         return -1;
     }
 
     if (localaddr_str != NULL) {
-        if (inet_aton(localaddr_str, &localaddr) == 0)
+        if (inet_aton(localaddr_str, &localaddr) == 0) {
+            error_setg(errp, "localaddr '%s' is not a valid IPv4 address",
+                       localaddr_str);
             return -1;
+        }
         param_localaddr = &localaddr;
     } else {
         param_localaddr = NULL;
     }
 
-    fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
+    fd = net_socket_mcast_create(&saddr, param_localaddr, errp);
     if (fd < 0) {
-        error_report_err(err);
         return -1;
     }
 
-    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);
+    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
     if (!s) {
-        error_report_err(err);
         return -1;
     }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
                                  const char *model,
                                  const char *name,
                                  const char *rhost,
-                                 const char *lhost)
+                                 const char *lhost,
+                                 Error **errp)
 {
     NetSocketState *s;
     int fd, ret;
     struct sockaddr_in laddr, raddr;
-    Error *err = NULL;
 
-    if (parse_host_port(&laddr, lhost, &err) < 0) {
-        error_report_err(err);
+    if (parse_host_port(&laddr, lhost, errp) < 0) {
         return -1;
     }
 
-    if (parse_host_port(&raddr, rhost, &err) < 0) {
-        error_report_err(err);
+    if (parse_host_port(&raddr, rhost, errp) < 0) {
         return -1;
     }
 
     fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
     if (fd < 0) {
-        perror("socket(PF_INET, SOCK_DGRAM)");
+        error_setg_errno(errp, errno, "can't create datagram socket");
         return -1;
     }
 
     ret = socket_set_fast_reuse(fd);
     if (ret < 0) {
+        error_setg_errno(errp, errno,
+                         "can't set socket option SO_REUSEADDR");
         closesocket(fd);
         return -1;
     }
     ret = bind(fd, (struct sockaddr *)&laddr, sizeof(laddr));
     if (ret < 0) {
-        perror("bind");
+        error_setg_errno(errp, errno, "can't bind ip=%s to socket",
+                         inet_ntoa(laddr.sin_addr));
         closesocket(fd);
         return -1;
     }
     qemu_set_nonblock(fd);
 
-    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);
+    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
     if (!s) {
-        error_report_err(err);
         return -1;
     }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
 int net_init_socket(const Netdev *netdev, const char *name,
                     NetClientState *peer, Error **errp)
 {
-    /* FIXME error_setg(errp, ...) on failure */
-    Error *err = NULL;
     const NetdevSocketOptions *sock;
 
     assert(netdev->type == NET_CLIENT_DRIVER_SOCKET);
@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
 
     if (sock->has_listen + sock->has_connect + sock->has_mcast +
         sock->has_udp > 1) {
-        error_report("exactly one of listen=, connect=, mcast= or udp="
-                     " is required");
+        error_setg(errp, "exactly one of listen=, connect=, mcast= or udp="
+                   " is required");
         return -1;
     }
 
     if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) {
-        error_report("localaddr= is only valid with mcast= or udp=");
+        error_setg(errp, "localaddr= is only valid with mcast= or udp=");
         return -1;
     }
 
     if (sock->has_fd) {
         int fd;
 
-        fd = monitor_fd_param(cur_mon, sock->fd, &err);
+        fd = monitor_fd_param(cur_mon, sock->fd, errp);
         if (fd == -1) {
-            error_report_err(err);
             return -1;
         }
         qemu_set_nonblock(fd);
@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
     }
 
     if (sock->has_listen) {
-        if (net_socket_listen_init(peer, "socket", name, sock->listen) == -1) {
+        if (net_socket_listen_init(peer, "socket", name, sock->listen, errp)
+            < 0) {
             return -1;
         }
         return 0;
     }
 
     if (sock->has_connect) {
-        if (net_socket_connect_init(peer, "socket", name, sock->connect) ==
-            -1) {
+        if (net_socket_connect_init(peer, "socket", name, sock->connect, errp)
+            < 0) {
             return -1;
         }
         return 0;
@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
         /* if sock->localaddr is missing, it has been initialized to "all bits
          * zero" */
         if (net_socket_mcast_init(peer, "socket", name, sock->mcast,
-            sock->localaddr) == -1) {
+                                  sock->localaddr, errp) < 0) {
             return -1;
         }
         return 0;
@@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name,
 
     assert(sock->has_udp);
     if (!sock->has_localaddr) {
-        error_report("localaddr= is mandatory with udp=");
+        error_setg(errp, "localaddr= is mandatory with udp=");
         return -1;
     }
-    if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localaddr) ==
-        -1) {
+    if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localaddr,
+                            errp) < 0) {
         return -1;
     }
     return 0;
-- 
2.7.4

From: Kamil Rytarowski <n54@gmx.com>

SunOS defines SEC in <sys/time.h> as 1 (commonly used time symbols).

This fixes build on SmartOS (Joyent).

Patch cherry-picked from pkgsrc by jperkin (Joyent).

Signed-off-by: Kamil Rytarowski <n54@gmx.com>
Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c         | 4 ++--
 hw/net/e1000_regs.h    | 2 +-
 hw/net/e1000e_core.c   | 2 +-
 hw/net/e1000x_common.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -XXX,XX +XXX,XX @@ static uint32_t (*macreg_readops[])(E1000State *, int) = {
     getreg(TADV),     getreg(ITR),      getreg(FCRUC),    getreg(IPAV),
     getreg(WUC),      getreg(WUS),      getreg(SCC),      getreg(ECOL),
     getreg(MCC),      getreg(LATECOL),  getreg(COLC),     getreg(DC),
-    getreg(TNCRS),    getreg(SEC),      getreg(CEXTERR),  getreg(RLEC),
+    getreg(TNCRS),    getreg(SEQEC),    getreg(CEXTERR),  getreg(RLEC),
     getreg(XONRXC),   getreg(XONTXC),   getreg(XOFFRXC),  getreg(XOFFTXC),
     getreg(RFC),      getreg(RJC),      getreg(RNBC),     getreg(TSCTFC),
     getreg(MGTPRC),   getreg(MGTPDC),   getreg(MGTPTC),   getreg(GORCL),
@@ -XXX,XX +XXX,XX @@ static const uint8_t mac_reg_access[0x8000] = {
     [FFLT]    = markflag(MAC),    [FFMT]    = markflag(MAC),
     [SCC]     = markflag(MAC),    [FCRUC]   = markflag(MAC),
     [LATECOL] = markflag(MAC),    [COLC]    = markflag(MAC),
-    [SEC]     = markflag(MAC),    [CEXTERR] = markflag(MAC),
+    [SEQEC]   = markflag(MAC),    [CEXTERR] = markflag(MAC),
     [XONTXC]  = markflag(MAC),    [XOFFRXC] = markflag(MAC),
     [RJC]     = markflag(MAC),    [RNBC]    = markflag(MAC),
     [MGTPDC]  = markflag(MAC),    [MGTPTC]  = markflag(MAC),
diff --git a/hw/net/e1000_regs.h b/hw/net/e1000_regs.h
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000_regs.h
+++ b/hw/net/e1000_regs.h
@@ -XXX,XX +XXX,XX @@
 #define E1000_COLC     0x04028  /* Collision Count - R/clr */
 #define E1000_DC       0x04030  /* Defer Count - R/clr */
 #define E1000_TNCRS    0x04034  /* TX-No CRS - R/clr */
-#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */
+#define E1000_SEQEC    0x04038  /* Sequence Error Count - R/clr */
 #define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */
 #define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */
 #define E1000_XONRXC   0x04048  /* XON RX Count - R/clr */
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -XXX,XX +XXX,XX @@ static uint32_t (*e1000e_macreg_readops[])(E1000ECore *, int) = {
     e1000e_getreg(RDLEN0),
     e1000e_getreg(RDH1),
     e1000e_getreg(LATECOL),
-    e1000e_getreg(SEC),
+    e1000e_getreg(SEQEC),
     e1000e_getreg(XONTXC),
     e1000e_getreg(WUS),
     e1000e_getreg(GORCL),
diff --git a/hw/net/e1000x_common.h b/hw/net/e1000x_common.h
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000x_common.h
+++ b/hw/net/e1000x_common.h
@@ -XXX,XX +XXX,XX @@ enum {
     defreg(VFTA),    defreg(VET),     defreg(RDTR),    defreg(RADV),
     defreg(TADV),    defreg(ITR),     defreg(SCC),     defreg(ECOL),
     defreg(MCC),     defreg(LATECOL), defreg(COLC),    defreg(DC),
-    defreg(TNCRS),   defreg(SEC),     defreg(CEXTERR), defreg(RLEC),
+    defreg(TNCRS),   defreg(SEQEC),   defreg(CEXTERR), defreg(RLEC),
     defreg(XONRXC),  defreg(XONTXC),  defreg(XOFFRXC), defreg(XOFFTXC),
     defreg(FCRUC),   defreg(AIT),     defreg(TDFH),    defreg(TDFT),
     defreg(TDFHS),   defreg(TDFTS),   defreg(TDFPC),   defreg(WUC),
-- 
2.7.4

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

When network is busy, some tcp options(like sack) will unpredictable
occur in primary side or secondary side. it will make packet size
not same, but the two packet's payload is identical. colo just
care about packet payload, so we skip the option field.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode)
  * return:    0  means packet same
  *            > 0 || < 0 means packet different
  */
-static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)
+static int colo_packet_compare_common(Packet *ppkt,
+                                      Packet *spkt,
+                                      int poffset,
+                                      int soffset)
 {
     if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
         char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)
                                    sec_ip_src, sec_ip_dst);
     }
 
-    offset = ppkt->vnet_hdr_len + offset;
+    poffset = ppkt->vnet_hdr_len + poffset;
+    soffset = ppkt->vnet_hdr_len + soffset;
 
-    if (ppkt->size == spkt->size) {
-        return memcmp(ppkt->data + offset,
-                      spkt->data + offset,
-                      spkt->size - offset);
+    if (ppkt->size - poffset == spkt->size - soffset) {
+        return memcmp(ppkt->data + poffset,
+                      spkt->data + soffset,
+                      spkt->size - soffset);
     } else {
         trace_colo_compare_main("Net packet size are not the same");
         return -1;
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
      * so we just need skip this field.
      */
     if (ptcp->th_off > 5) {
-        ptrdiff_t tcp_offset;
+        ptrdiff_t ptcp_offset, stcp_offset;
 
-        tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
-                     + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
-        res = colo_packet_compare_common(ppkt, spkt, tcp_offset);
+        ptcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
+                      + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
+        stcp_offset = spkt->transport_header - (uint8_t *)spkt->data
+                      + (stcp->th_off * 4) - spkt->vnet_hdr_len;
+
+        /*
+         * When network is busy, some tcp options(like sack) will unpredictable
+         * occur in primary side or secondary side. it will make packet size
+         * not same, but the two packet's payload is identical. colo just
+         * care about packet payload, so we skip the option field.
+         */
+        res = colo_packet_compare_common(ppkt, spkt, ptcp_offset, stcp_offset);
     } else if (ptcp->th_sum == stcp->th_sum) {
-        res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);
+        res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN, ETH_HLEN);
     } else {
         res = -1;
     }
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
      * the ip payload here.
      */
     ret = colo_packet_compare_common(ppkt, spkt,
+                                     network_header_length + ETH_HLEN,
                                      network_header_length + ETH_HLEN);
 
     if (ret) {
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
      * the ip payload here.
      */
     if (colo_packet_compare_common(ppkt, spkt,
+                                   network_header_length + ETH_HLEN,
                                    network_header_length + ETH_HLEN)) {
         trace_colo_compare_icmp_miscompare("primary pkt size",
                                            ppkt->size);
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_other(Packet *spkt, Packet *ppkt)
                                    sec_ip_src, sec_ip_dst);
     }
 
-    return colo_packet_compare_common(ppkt, spkt, 0);
+    return colo_packet_compare_common(ppkt, spkt, 0, 0);
 }
 
 static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time)
-- 
2.7.4

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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index XXXXXXX..XXXXXXX 100644
--- 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;
         }
-- 
2.7.4

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

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 59 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -XXX,XX +XXX,XX @@
 #define REGULAR_PACKET_CHECK_MS 3000
 
 /*
-  + CompareState ++
-  |               |
-  +---------------+   +---------------+         +---------------+
-  |conn list      +--->conn           +--------->conn           |
-  +---------------+   +---------------+         +---------------+
-  |               |     |           |             |          |
-  +---------------+ +---v----+  +---v----+    +---v----+ +---v----+
-                    |primary |  |secondary    |primary | |secondary
-                    |packet  |  |packet  +    |packet  | |packet  +
-                    +--------+  +--------+    +--------+ +--------+
-                        |           |             |          |
-                    +---v----+  +---v----+    +---v----+ +---v----+
-                    |primary |  |secondary    |primary | |secondary
-                    |packet  |  |packet  +    |packet  | |packet  +
-                    +--------+  +--------+    +--------+ +--------+
-                        |           |             |          |
-                    +---v----+  +---v----+    +---v----+ +---v----+
-                    |primary |  |secondary    |primary | |secondary
-                    |packet  |  |packet  +    |packet  | |packet  +
-                    +--------+  +--------+    +--------+ +--------+
-*/
+ *  + CompareState ++
+ *  |               |
+ *  +---------------+   +---------------+         +---------------+
+ *  |   conn list   + - >      conn     + ------- >      conn     + -- > ......
+ *  +---------------+   +---------------+         +---------------+
+ *  |               |     |           |             |          |
+ *  +---------------+ +---v----+  +---v----+    +---v----+ +---v----+
+ *                    |primary |  |secondary    |primary | |secondary
+ *                    |packet  |  |packet  +    |packet  | |packet  +
+ *                    +--------+  +--------+    +--------+ +--------+
+ *                        |           |             |          |
+ *                    +---v----+  +---v----+    +---v----+ +---v----+
+ *                    |primary |  |secondary    |primary | |secondary
+ *                    |packet  |  |packet  +    |packet  | |packet  +
+ *                    +--------+  +--------+    +--------+ +--------+
+ *                        |           |             |          |
+ *                    +---v----+  +---v----+    +---v----+ +---v----+
+ *                    |primary |  |secondary    |primary | |secondary
+ *                    |packet  |  |packet  +    |packet  | |packet  +
+ *                    +--------+  +--------+    +--------+ +--------+
+ */
 typedef struct CompareState {
     Object parent;
 
@@ -XXX,XX +XXX,XX @@ typedef struct CompareState {
     SocketReadState sec_rs;
     bool vnet_hdr;
 
-    /* connection list: the connections belonged to this NIC could be found
-     * in this list.
-     * element type: Connection
+    /*
+     * Record the connection that through the NIC
+     * Element type: Connection
      */
     GQueue conn_list;
-    /* hashtable to save connection */
+    /* Record the connection without repetition */
     GHashTable *connection_track_table;
-    /* compare thread, a thread for each NIC */
+    /* This thread just do packet compare job */
     QemuThread thread;
 
     GMainContext *worker_context;
@@ -XXX,XX +XXX,XX @@ static int colo_old_packet_check_one_conn(Connection *conn,
                                  (GCompareFunc)colo_old_packet_check_one);
 
     if (result) {
-        /* do checkpoint will flush old packet */
-        /* TODO: colo_notify_checkpoint();*/
+        /* Do checkpoint will flush old packet */
+        /*
+         * TODO: Notify colo frame to do checkpoint.
+         * colo_compare_inconsistent_notify();
+         */
         return 0;
     }
 
-- 
2.7.4

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

IOThread uses AioContext event loop and does not run a GMainContext.
Therefore,chardev cannot work in IOThread,such as the chardev is
used for colo-compare packets reception.

This patch makes the IOThread run the GMainContext event loop,
chardev and IOThread can work together.

Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Wang Yong <wang.yong155@zte.com.cn>
Signed-off-by: Wang Guang <wang.guang55@zte.com.cn>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 include/sysemu/iothread.h |  4 ++++
 iothread.c                | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h
index XXXXXXX..XXXXXXX 100644
--- a/include/sysemu/iothread.h
+++ b/include/sysemu/iothread.h
@@ -XXX,XX +XXX,XX @@ typedef struct {
 
     QemuThread thread;
     AioContext *ctx;
+    GMainContext *worker_context;
+    GMainLoop *main_loop;
+    GOnce once;
     QemuMutex init_done_lock;
     QemuCond init_done_cond;    /* is thread initialization done? */
     bool stopping;
@@ -XXX,XX +XXX,XX @@ typedef struct {
 char *iothread_get_id(IOThread *iothread);
 AioContext *iothread_get_aio_context(IOThread *iothread);
 void iothread_stop_all(void);
+GMainContext *iothread_get_g_main_context(IOThread *iothread);
 
 #endif /* IOTHREAD_H */
diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ static void *iothread_run(void *opaque)
 
     while (!atomic_read(&iothread->stopping)) {
         aio_poll(iothread->ctx, true);
+
+        if (atomic_read(&iothread->worker_context)) {
+            GMainLoop *loop;
+
+            g_main_context_push_thread_default(iothread->worker_context);
+            iothread->main_loop =
+                g_main_loop_new(iothread->worker_context, TRUE);
+            loop = iothread->main_loop;
+
+            g_main_loop_run(iothread->main_loop);
+            iothread->main_loop = NULL;
+            g_main_loop_unref(loop);
+
+            g_main_context_pop_thread_default(iothread->worker_context);
+            g_main_context_unref(iothread->worker_context);
+            iothread->worker_context = NULL;
+        }
     }
 
     rcu_unregister_thread();
@@ -XXX,XX +XXX,XX @@ static int iothread_stop(Object *object, void *opaque)
     }
     iothread->stopping = true;
     aio_notify(iothread->ctx);
+    if (atomic_read(&iothread->main_loop)) {
+        g_main_loop_quit(iothread->main_loop);
+    }
     qemu_thread_join(&iothread->thread);
     return 0;
 }
@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
 
     qemu_mutex_init(&iothread->init_done_lock);
     qemu_cond_init(&iothread->init_done_cond);
+    iothread->once = (GOnce) G_ONCE_INIT;
 
     /* This assumes we are called from a thread with useful CPU affinity for us
      * to inherit.
@@ -XXX,XX +XXX,XX @@ void iothread_stop_all(void)
 
     object_child_foreach(container, iothread_stop, NULL);
 }
+
+static gpointer iothread_g_main_context_init(gpointer opaque)
+{
+    AioContext *ctx;
+    IOThread *iothread = opaque;
+    GSource *source;
+
+    iothread->worker_context = g_main_context_new();
+
+    ctx = iothread_get_aio_context(iothread);
+    source = aio_get_g_source(ctx);
+    g_source_attach(source, iothread->worker_context);
+    g_source_unref(source);
+
+    aio_notify(iothread->ctx);
+    return NULL;
+}
+
+GMainContext *iothread_get_g_main_context(IOThread *iothread)
+{
+    g_once(&iothread->once, iothread_g_main_context_init, iothread);
+
+    return iothread->worker_context;
+}
-- 
2.7.4

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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 83 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index XXXXXXX..XXXXXXX 100644
--- 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);
-- 
2.7.4

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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 docs/colo-proxy.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt
index XXXXXXX..XXXXXXX 100644
--- 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
-- 
2.7.4

The following changes since commit 32c7e0ab755745e961f1772e95cac381cc68769d:

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170421' into staging (2017-04-21 15:59:27 +0100)

are available in the git repository at:

https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to 0fc8aec7de64f2bf83a274a2a38b938ce03425d2:

COLO-compare: Optimize tcp compare trace event (2017-04-25 19:17:25 +0800)

----------------------------------------------------------------

Changes from V1:
- Fix clang warnings

----------------------------------------------------------------
Cédric Le Goater (5):
      hw/net: add MII definitions
      net: add FTGMAC100 support
      net/ftgmac100: add a 'aspeed' property
      aspeed: add a FTGMAC100 nic
      slirp: add a fake NC-SI backend

Zhang Chen (3):
      colo-compare: Fix old packet check bug.
      COLO-compare: Optimize tcp compare for option field
      COLO-compare: Optimize tcp compare trace event

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

If colo-compare find one old packet,we can notify colo-frame
do checkpoint, no need continue find more old packet here.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -XXX,XX +XXX,XX @@ static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time)
     }
 }
 
-static void colo_old_packet_check_one_conn(void *opaque,
-                                           void *user_data)
+static int colo_old_packet_check_one_conn(Connection *conn,
+                                          void *user_data)
 {
-    Connection *conn = opaque;
     GList *result = NULL;
     int64_t check_time = REGULAR_PACKET_CHECK_MS;
 
@@ -XXX,XX +XXX,XX @@ static void colo_old_packet_check_one_conn(void *opaque,
     if (result) {
         /* do checkpoint will flush old packet */
         /* TODO: colo_notify_checkpoint();*/
+        return 0;
     }
+
+    return 1;
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ static void colo_old_packet_check(void *opaque)
 {
     CompareState *s = opaque;
 
-    g_queue_foreach(&s->conn_list, colo_old_packet_check_one_conn, NULL);
+    /*
+     * If we find one old packet, stop finding job and notify
+     * COLO frame do checkpoint.
+     */
+    g_queue_find_custom(&s->conn_list, NULL,
+                        (GCompareFunc)colo_old_packet_check_one_conn);
 }
 
 /*
-- 
2.7.4

From: Cédric Le Goater <clg@kaod.org>

This adds comments on the Basic mode control and status registers bit
definitions. It also adds a couple of bits for 1000BASE-T and the
RealTek 8211E PHY for the FTGMAC100 model to use.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 include/hw/net/mii.h | 71 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 18 deletions(-)

diff --git a/include/hw/net/mii.h b/include/hw/net/mii.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/net/mii.h
+++ b/include/hw/net/mii.h
@@ -XXX,XX +XXX,XX @@
 #define MII_H
 
 /* PHY registers */
-#define MII_BMCR            0
-#define MII_BMSR            1
-#define MII_PHYID1          2
-#define MII_PHYID2          3
-#define MII_ANAR            4
-#define MII_ANLPAR          5
-#define MII_ANER            6
+#define MII_BMCR            0  /* Basic mode control register */
+#define MII_BMSR            1  /* Basic mode status register */
+#define MII_PHYID1          2  /* ID register 1 */
+#define MII_PHYID2          3  /* ID register 2 */
+#define MII_ANAR            4  /* Autonegotiation advertisement */
+#define MII_ANLPAR          5  /* Autonegotiation lnk partner abilities */
+#define MII_ANER            6  /* Autonegotiation expansion */
+#define MII_ANNP            7  /* Autonegotiation next page */
+#define MII_ANLPRNP         8  /* Autonegotiation link partner rx next page */
+#define MII_CTRL1000        9  /* 1000BASE-T control */
+#define MII_STAT1000        10 /* 1000BASE-T status */
+#define MII_MDDACR          13 /* MMD access control */
+#define MII_MDDAADR         14 /* MMD access address data */
+#define MII_EXTSTAT         15 /* Extended Status */
 #define MII_NSR             16
 #define MII_LBREMR          17
 #define MII_REC             18
@@ -XXX,XX +XXX,XX @@
 /* PHY registers fields */
 #define MII_BMCR_RESET      (1 << 15)
 #define MII_BMCR_LOOPBACK   (1 << 14)
-#define MII_BMCR_SPEED      (1 << 13)
-#define MII_BMCR_AUTOEN     (1 << 12)
-#define MII_BMCR_FD         (1 << 8)
+#define MII_BMCR_SPEED100   (1 << 13)  /* LSB of Speed (100) */
+#define MII_BMCR_SPEED      MII_BMCR_SPEED100
+#define MII_BMCR_AUTOEN     (1 << 12) /* Autonegotiation enable */
+#define MII_BMCR_PDOWN      (1 << 11) /* Enable low power state */
+#define MII_BMCR_ISOLATE    (1 << 10) /* Isolate data paths from MII */
+#define MII_BMCR_ANRESTART  (1 << 9)  /* Auto negotiation restart */
+#define MII_BMCR_FD         (1 << 8)  /* Set duplex mode */
+#define MII_BMCR_CTST       (1 << 7)  /* Collision test */
+#define MII_BMCR_SPEED1000  (1 << 6)  /* MSB of Speed (1000) */
 
-#define MII_BMSR_100TX_FD   (1 << 14)
-#define MII_BMSR_100TX_HD   (1 << 13)
-#define MII_BMSR_10T_FD     (1 << 12)
-#define MII_BMSR_10T_HD     (1 << 11)
-#define MII_BMSR_MFPS       (1 << 6)
-#define MII_BMSR_AN_COMP    (1 << 5)
-#define MII_BMSR_AUTONEG    (1 << 3)
-#define MII_BMSR_LINK_ST    (1 << 2)
+#define MII_BMSR_100TX_FD   (1 << 14) /* Can do 100mbps, full-duplex */
+#define MII_BMSR_100TX_HD   (1 << 13) /* Can do 100mbps, half-duplex */
+#define MII_BMSR_10T_FD     (1 << 12) /* Can do 10mbps, full-duplex */
+#define MII_BMSR_10T_HD     (1 << 11) /* Can do 10mbps, half-duplex */
+#define MII_BMSR_100T2_FD   (1 << 10) /* Can do 100mbps T2, full-duplex */
+#define MII_BMSR_100T2_HD   (1 << 9)  /* Can do 100mbps T2, half-duplex */
+#define MII_BMSR_EXTSTAT    (1 << 8)  /* Extended status in register 15 */
+#define MII_BMSR_MFPS       (1 << 6)  /* MII Frame Preamble Suppression */
+#define MII_BMSR_AN_COMP    (1 << 5)  /* Auto-negotiation complete */
+#define MII_BMSR_RFAULT     (1 << 4)  /* Remote fault */
+#define MII_BMSR_AUTONEG    (1 << 3)  /* Able to do auto-negotiation */
+#define MII_BMSR_LINK_ST    (1 << 2)  /* Link status */
+#define MII_BMSR_JABBER     (1 << 1)  /* Jabber detected */
+#define MII_BMSR_EXTCAP     (1 << 0)  /* Ext-reg capability */
 
+#define MII_ANAR_PAUSE_ASYM (1 << 11) /* Try for asymetric pause */
+#define MII_ANAR_PAUSE      (1 << 10) /* Try for pause */
 #define MII_ANAR_TXFD       (1 << 8)
 #define MII_ANAR_TX         (1 << 7)
 #define MII_ANAR_10FD       (1 << 6)
@@ -XXX,XX +XXX,XX @@
 #define MII_ANAR_CSMACD     (1 << 0)
 
 #define MII_ANLPAR_ACK      (1 << 14)
+#define MII_ANLPAR_PAUSEASY (1 << 11) /* can pause asymmetrically */
+#define MII_ANLPAR_PAUSE    (1 << 10) /* can pause */
 #define MII_ANLPAR_TXFD     (1 << 8)
 #define MII_ANLPAR_TX       (1 << 7)
 #define MII_ANLPAR_10FD     (1 << 6)
 #define MII_ANLPAR_10       (1 << 5)
 #define MII_ANLPAR_CSMACD   (1 << 0)
 
+#define MII_ANER_NWAY       (1 << 0) /* Can do N-way auto-nego */
+
+#define MII_CTRL1000_FULL   (1 << 9)  /* 1000BASE-T full duplex */
+#define MII_CTRL1000_HALF   (1 << 8)  /* 1000BASE-T half duplex */
+
+#define MII_STAT1000_FULL   (1 << 11) /* 1000BASE-T full duplex */
+#define MII_STAT1000_HALF   (1 << 10) /* 1000BASE-T half duplex */
+
 /* List of vendor identifiers */
 /* RealTek 8201 */
 #define RTL8201CP_PHYID1    0x0000
 #define RTL8201CP_PHYID2    0x8201
 
+/* RealTek 8211E */
+#define RTL8211E_PHYID1     0x001c
+#define RTL8211E_PHYID2     0xc915
+
 /* National Semiconductor DP83848 */
 #define DP83848_PHYID1      0x2000
 #define DP83848_PHYID2      0x5c90
-- 
2.7.4

From: Cédric Le Goater <clg@kaod.org>

The FTGMAC100 device is an Ethernet controller with DMA function that
can be found on Aspeed SoCs (which include NCSI).

It is fully compliant with IEEE 802.3 specification for 10/100 Mbps
Ethernet and IEEE 802.3z specification for 1000 Mbps Ethernet and
includes Reduced Media Independent Interface (RMII) and Reduced
Gigabit Media Independent Interface (RGMII) interfaces. It adopts an
AHB bus interface and integrates a link list DMA engine with direct
M-Bus accesses for transmitting and receiving packets. It has
independent TX/RX fifos, supports half and full duplex (1000 Mbps mode
only supports full duplex), flow control for full duplex and
backpressure for half duplex.

The FTGMAC100 also implements IP, TCP, UDP checksum offloads and
supports IEEE 802.1Q VLAN tag insertion and removal. It offers
high-priority transmit queue for QoS and CoS applications

This model is backed with a RealTek 8211E PHY which is the chip found
on the AST2500 EVB. It is complete enough to satisfy two different
Linux drivers and a U-Boot driver. Not supported features are :

- IEEE 802.1Q VLAN
 - High Priority Transmit Queue
 - Wake-On-LAN functions

The code is based on the Coldfire Fast Ethernet Controller model.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 default-configs/arm-softmmu.mak |    1 +
 hw/net/Makefile.objs            |    1 +
 hw/net/ftgmac100.c              | 1003 +++++++++++++++++++++++++++++++++++++++
 include/hw/net/ftgmac100.h      |   60 +++
 4 files changed, 1065 insertions(+)
 create mode 100644 hw/net/ftgmac100.c
 create mode 100644 include/hw/net/ftgmac100.h

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index XXXXXXX..XXXXXXX 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -XXX,XX +XXX,XX @@ CONFIG_LAN9118=y
 CONFIG_SMC91C111=y
 CONFIG_ALLWINNER_EMAC=y
 CONFIG_IMX_FEC=y
+CONFIG_FTGMAC100=y
 CONFIG_DS1338=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/Makefile.objs
+++ b/hw/net/Makefile.objs
@@ -XXX,XX +XXX,XX @@ common-obj-$(CONFIG_IMX_FEC) += imx_fec.o
 common-obj-$(CONFIG_CADENCE) += cadence_gem.o
 common-obj-$(CONFIG_STELLARIS_ENET) += stellaris_enet.o
 common-obj-$(CONFIG_LANCE) += lance.o
+common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o
 
 obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
 obj-$(CONFIG_COLDFIRE) += mcf_fec.o
diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/net/ftgmac100.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Faraday FTGMAC100 Gigabit Ethernet
+ *
+ * Copyright (C) 2016-2017, IBM Corporation.
+ *
+ * Based on Coldfire Fast Ethernet Controller emulation.
+ *
+ * Copyright (c) 2007 CodeSourcery.
+ *
+ * This code is licensed under the GPL version 2 or later. See the
+ * COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/net/ftgmac100.h"
+#include "sysemu/dma.h"
+#include "qemu/log.h"
+#include "net/checksum.h"
+#include "net/eth.h"
+#include "hw/net/mii.h"
+
+/* For crc32 */
+#include <zlib.h>
+
+/*
+ * FTGMAC100 registers
+ */
+#define FTGMAC100_ISR             0x00
+#define FTGMAC100_IER             0x04
+#define FTGMAC100_MAC_MADR        0x08
+#define FTGMAC100_MAC_LADR        0x0c
+#define FTGMAC100_MATH0           0x10
+#define FTGMAC100_MATH1           0x14
+#define FTGMAC100_NPTXPD          0x18
+#define FTGMAC100_RXPD            0x1C
+#define FTGMAC100_NPTXR_BADR      0x20
+#define FTGMAC100_RXR_BADR        0x24
+#define FTGMAC100_HPTXPD          0x28
+#define FTGMAC100_HPTXR_BADR      0x2c
+#define FTGMAC100_ITC             0x30
+#define FTGMAC100_APTC            0x34
+#define FTGMAC100_DBLAC           0x38
+#define FTGMAC100_REVR            0x40
+#define FTGMAC100_FEAR1           0x44
+#define FTGMAC100_RBSR            0x4c
+#define FTGMAC100_TPAFCR          0x48
+
+#define FTGMAC100_MACCR           0x50
+#define FTGMAC100_MACSR           0x54
+#define FTGMAC100_PHYCR           0x60
+#define FTGMAC100_PHYDATA         0x64
+#define FTGMAC100_FCR             0x68
+
+/*
+ * Interrupt status register & interrupt enable register
+ */
+#define FTGMAC100_INT_RPKT_BUF    (1 << 0)
+#define FTGMAC100_INT_RPKT_FIFO   (1 << 1)
+#define FTGMAC100_INT_NO_RXBUF    (1 << 2)
+#define FTGMAC100_INT_RPKT_LOST   (1 << 3)
+#define FTGMAC100_INT_XPKT_ETH    (1 << 4)
+#define FTGMAC100_INT_XPKT_FIFO   (1 << 5)
+#define FTGMAC100_INT_NO_NPTXBUF  (1 << 6)
+#define FTGMAC100_INT_XPKT_LOST   (1 << 7)
+#define FTGMAC100_INT_AHB_ERR     (1 << 8)
+#define FTGMAC100_INT_PHYSTS_CHG  (1 << 9)
+#define FTGMAC100_INT_NO_HPTXBUF  (1 << 10)
+
+/*
+ * Automatic polling timer control register
+ */
+#define FTGMAC100_APTC_RXPOLL_CNT(x)        ((x) & 0xf)
+#define FTGMAC100_APTC_RXPOLL_TIME_SEL      (1 << 4)
+#define FTGMAC100_APTC_TXPOLL_CNT(x)        (((x) >> 8) & 0xf)
+#define FTGMAC100_APTC_TXPOLL_TIME_SEL      (1 << 12)
+
+/*
+ * PHY control register
+ */
+#define FTGMAC100_PHYCR_MIIRD               (1 << 26)
+#define FTGMAC100_PHYCR_MIIWR               (1 << 27)
+
+#define FTGMAC100_PHYCR_DEV(x)              (((x) >> 16) & 0x1f)
+#define FTGMAC100_PHYCR_REG(x)              (((x) >> 21) & 0x1f)
+
+/*
+ * PHY data register
+ */
+#define FTGMAC100_PHYDATA_MIIWDATA(x)       ((x) & 0xffff)
+#define FTGMAC100_PHYDATA_MIIRDATA(x)       (((x) >> 16) & 0xffff)
+
+/*
+ * Feature Register
+ */
+#define FTGMAC100_REVR_NEW_MDIO_INTERFACE   (1 << 31)
+
+/*
+ * MAC control register
+ */
+#define FTGMAC100_MACCR_TXDMA_EN         (1 << 0)
+#define FTGMAC100_MACCR_RXDMA_EN         (1 << 1)
+#define FTGMAC100_MACCR_TXMAC_EN         (1 << 2)
+#define FTGMAC100_MACCR_RXMAC_EN         (1 << 3)
+#define FTGMAC100_MACCR_RM_VLAN          (1 << 4)
+#define FTGMAC100_MACCR_HPTXR_EN         (1 << 5)
+#define FTGMAC100_MACCR_LOOP_EN          (1 << 6)
+#define FTGMAC100_MACCR_ENRX_IN_HALFTX   (1 << 7)
+#define FTGMAC100_MACCR_FULLDUP          (1 << 8)
+#define FTGMAC100_MACCR_GIGA_MODE        (1 << 9)
+#define FTGMAC100_MACCR_CRC_APD          (1 << 10) /* not needed */
+#define FTGMAC100_MACCR_RX_RUNT          (1 << 12)
+#define FTGMAC100_MACCR_JUMBO_LF         (1 << 13)
+#define FTGMAC100_MACCR_RX_ALL           (1 << 14)
+#define FTGMAC100_MACCR_HT_MULTI_EN      (1 << 15)
+#define FTGMAC100_MACCR_RX_MULTIPKT      (1 << 16)
+#define FTGMAC100_MACCR_RX_BROADPKT      (1 << 17)
+#define FTGMAC100_MACCR_DISCARD_CRCERR   (1 << 18)
+#define FTGMAC100_MACCR_FAST_MODE        (1 << 19)
+#define FTGMAC100_MACCR_SW_RST           (1 << 31)
+
+/*
+ * Transmit descriptor
+ */
+#define FTGMAC100_TXDES0_TXBUF_SIZE(x)   ((x) & 0x3fff)
+#define FTGMAC100_TXDES0_EDOTR           (1 << 15)
+#define FTGMAC100_TXDES0_CRC_ERR         (1 << 19)
+#define FTGMAC100_TXDES0_LTS             (1 << 28)
+#define FTGMAC100_TXDES0_FTS             (1 << 29)
+#define FTGMAC100_TXDES0_TXDMA_OWN       (1 << 31)
+
+#define FTGMAC100_TXDES1_VLANTAG_CI(x)   ((x) & 0xffff)
+#define FTGMAC100_TXDES1_INS_VLANTAG     (1 << 16)
+#define FTGMAC100_TXDES1_TCP_CHKSUM      (1 << 17)
+#define FTGMAC100_TXDES1_UDP_CHKSUM      (1 << 18)
+#define FTGMAC100_TXDES1_IP_CHKSUM       (1 << 19)
+#define FTGMAC100_TXDES1_LLC             (1 << 22)
+#define FTGMAC100_TXDES1_TX2FIC          (1 << 30)
+#define FTGMAC100_TXDES1_TXIC            (1 << 31)
+
+/*
+ * Receive descriptor
+ */
+#define FTGMAC100_RXDES0_VDBC            0x3fff
+#define FTGMAC100_RXDES0_EDORR           (1 << 15)
+#define FTGMAC100_RXDES0_MULTICAST       (1 << 16)
+#define FTGMAC100_RXDES0_BROADCAST       (1 << 17)
+#define FTGMAC100_RXDES0_RX_ERR          (1 << 18)
+#define FTGMAC100_RXDES0_CRC_ERR         (1 << 19)
+#define FTGMAC100_RXDES0_FTL             (1 << 20)
+#define FTGMAC100_RXDES0_RUNT            (1 << 21)
+#define FTGMAC100_RXDES0_RX_ODD_NB       (1 << 22)
+#define FTGMAC100_RXDES0_FIFO_FULL       (1 << 23)
+#define FTGMAC100_RXDES0_PAUSE_OPCODE    (1 << 24)
+#define FTGMAC100_RXDES0_PAUSE_FRAME     (1 << 25)
+#define FTGMAC100_RXDES0_LRS             (1 << 28)
+#define FTGMAC100_RXDES0_FRS             (1 << 29)
+#define FTGMAC100_RXDES0_RXPKT_RDY       (1 << 31)
+
+#define FTGMAC100_RXDES1_VLANTAG_CI      0xffff
+#define FTGMAC100_RXDES1_PROT_MASK       (0x3 << 20)
+#define FTGMAC100_RXDES1_PROT_NONIP      (0x0 << 20)
+#define FTGMAC100_RXDES1_PROT_IP         (0x1 << 20)
+#define FTGMAC100_RXDES1_PROT_TCPIP      (0x2 << 20)
+#define FTGMAC100_RXDES1_PROT_UDPIP      (0x3 << 20)
+#define FTGMAC100_RXDES1_LLC             (1 << 22)
+#define FTGMAC100_RXDES1_DF              (1 << 23)
+#define FTGMAC100_RXDES1_VLANTAG_AVAIL   (1 << 24)
+#define FTGMAC100_RXDES1_TCP_CHKSUM_ERR  (1 << 25)
+#define FTGMAC100_RXDES1_UDP_CHKSUM_ERR  (1 << 26)
+#define FTGMAC100_RXDES1_IP_CHKSUM_ERR   (1 << 27)
+
+/*
+ * Receive and transmit Buffer Descriptor
+ */
+typedef struct {
+    uint32_t        des0;
+    uint32_t        des1;
+    uint32_t        des2;        /* not used by HW */
+    uint32_t        des3;
+} FTGMAC100Desc;
+
+/*
+ * Specific RTL8211E MII Registers
+ */
+#define RTL8211E_MII_PHYCR        16 /* PHY Specific Control */
+#define RTL8211E_MII_PHYSR        17 /* PHY Specific Status */
+#define RTL8211E_MII_INER         18 /* Interrupt Enable */
+#define RTL8211E_MII_INSR         19 /* Interrupt Status */
+#define RTL8211E_MII_RXERC        24 /* Receive Error Counter */
+#define RTL8211E_MII_LDPSR        27 /* Link Down Power Saving */
+#define RTL8211E_MII_EPAGSR       30 /* Extension Page Select */
+#define RTL8211E_MII_PAGSEL       31 /* Page Select */
+
+/*
+ * RTL8211E Interrupt Status
+ */
+#define PHY_INT_AUTONEG_ERROR       (1 << 15)
+#define PHY_INT_PAGE_RECV           (1 << 12)
+#define PHY_INT_AUTONEG_COMPLETE    (1 << 11)
+#define PHY_INT_LINK_STATUS         (1 << 10)
+#define PHY_INT_ERROR               (1 << 9)
+#define PHY_INT_DOWN                (1 << 8)
+#define PHY_INT_JABBER              (1 << 0)
+
+/*
+ * Max frame size for the receiving buffer
+ */
+#define FTGMAC100_MAX_FRAME_SIZE    10240
+
+/* Limits depending on the type of the frame
+ *
+ *   9216 for Jumbo frames (+ 4 for VLAN)
+ *   1518 for other frames (+ 4 for VLAN)
+ */
+static int ftgmac100_max_frame_size(FTGMAC100State *s)
+{
+    return (s->maccr & FTGMAC100_MACCR_JUMBO_LF ? 9216 : 1518) + 4;
+}
+
+static void ftgmac100_update_irq(FTGMAC100State *s)
+{
+    qemu_set_irq(s->irq, s->isr & s->ier);
+}
+
+/*
+ * The MII phy could raise a GPIO to the processor which in turn
+ * could be handled as an interrpt by the OS.
+ * For now we don't handle any GPIO/interrupt line, so the OS will
+ * have to poll for the PHY status.
+ */
+static void phy_update_irq(FTGMAC100State *s)
+{
+    ftgmac100_update_irq(s);
+}
+
+static void phy_update_link(FTGMAC100State *s)
+{
+    /* Autonegotiation status mirrors link status.  */
+    if (qemu_get_queue(s->nic)->link_down) {
+        s->phy_status &= ~(MII_BMSR_LINK_ST | MII_BMSR_AN_COMP);
+        s->phy_int |= PHY_INT_DOWN;
+    } else {
+        s->phy_status |= (MII_BMSR_LINK_ST | MII_BMSR_AN_COMP);
+        s->phy_int |= PHY_INT_AUTONEG_COMPLETE;
+    }
+    phy_update_irq(s);
+}
+
+static void ftgmac100_set_link(NetClientState *nc)
+{
+    phy_update_link(FTGMAC100(qemu_get_nic_opaque(nc)));
+}
+
+static void phy_reset(FTGMAC100State *s)
+{
+    s->phy_status = (MII_BMSR_100TX_FD | MII_BMSR_100TX_HD | MII_BMSR_10T_FD |
+                     MII_BMSR_10T_HD | MII_BMSR_EXTSTAT | MII_BMSR_MFPS |
+                     MII_BMSR_AN_COMP | MII_BMSR_AUTONEG | MII_BMSR_LINK_ST |
+                     MII_BMSR_EXTCAP);
+    s->phy_control = (MII_BMCR_AUTOEN | MII_BMCR_FD | MII_BMCR_SPEED1000);
+    s->phy_advertise = (MII_ANAR_PAUSE_ASYM | MII_ANAR_PAUSE | MII_ANAR_TXFD |
+                        MII_ANAR_TX | MII_ANAR_10FD | MII_ANAR_10 |
+                        MII_ANAR_CSMACD);
+    s->phy_int_mask = 0;
+    s->phy_int = 0;
+}
+
+static uint32_t do_phy_read(FTGMAC100State *s, int reg)
+{
+    uint32_t val;
+
+    switch (reg) {
+    case MII_BMCR: /* Basic Control */
+        val = s->phy_control;
+        break;
+    case MII_BMSR: /* Basic Status */
+        val = s->phy_status;
+        break;
+    case MII_PHYID1: /* ID1 */
+        val = RTL8211E_PHYID1;
+        break;
+    case MII_PHYID2: /* ID2 */
+        val = RTL8211E_PHYID2;
+        break;
+    case MII_ANAR: /* Auto-neg advertisement */
+        val = s->phy_advertise;
+        break;
+    case MII_ANLPAR: /* Auto-neg Link Partner Ability */
+        val = (MII_ANLPAR_ACK | MII_ANLPAR_PAUSE | MII_ANLPAR_TXFD |
+               MII_ANLPAR_TX | MII_ANLPAR_10FD | MII_ANLPAR_10 |
+               MII_ANLPAR_CSMACD);
+        break;
+    case MII_ANER: /* Auto-neg Expansion */
+        val = MII_ANER_NWAY;
+        break;
+    case MII_CTRL1000: /* 1000BASE-T control  */
+        val = (MII_CTRL1000_HALF | MII_CTRL1000_FULL);
+        break;
+    case MII_STAT1000: /* 1000BASE-T status  */
+        val = MII_STAT1000_FULL;
+        break;
+    case RTL8211E_MII_INSR:  /* Interrupt status.  */
+        val = s->phy_int;
+        s->phy_int = 0;
+        phy_update_irq(s);
+        break;
+    case RTL8211E_MII_INER:  /* Interrupt enable */
+        val = s->phy_int_mask;
+        break;
+    case RTL8211E_MII_PHYCR:
+    case RTL8211E_MII_PHYSR:
+    case RTL8211E_MII_RXERC:
+    case RTL8211E_MII_LDPSR:
+    case RTL8211E_MII_EPAGSR:
+    case RTL8211E_MII_PAGSEL:
+        qemu_log_mask(LOG_UNIMP, "%s: reg %d not implemented\n",
+                      __func__, reg);
+        val = 0;
+        break;
+    default:
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset %d\n",
+                      __func__, reg);
+        val = 0;
+        break;
+    }
+
+    return val;
+}
+
+#define MII_BMCR_MASK (MII_BMCR_LOOPBACK | MII_BMCR_SPEED100 |          \
+                       MII_BMCR_SPEED | MII_BMCR_AUTOEN | MII_BMCR_PDOWN | \
+                       MII_BMCR_FD | MII_BMCR_CTST)
+#define MII_ANAR_MASK 0x2d7f
+
+static void do_phy_write(FTGMAC100State *s, int reg, uint32_t val)
+{
+    switch (reg) {
+    case MII_BMCR:     /* Basic Control */
+        if (val & MII_BMCR_RESET) {
+            phy_reset(s);
+        } else {
+            s->phy_control = val & MII_BMCR_MASK;
+            /* Complete autonegotiation immediately.  */
+            if (val & MII_BMCR_AUTOEN) {
+                s->phy_status |= MII_BMSR_AN_COMP;
+            }
+        }
+        break;
+    case MII_ANAR:     /* Auto-neg advertisement */
+        s->phy_advertise = (val & MII_ANAR_MASK) | MII_ANAR_TX;
+        break;
+    case RTL8211E_MII_INER: /* Interrupt enable */
+        s->phy_int_mask = val & 0xff;
+        phy_update_irq(s);
+        break;
+    case RTL8211E_MII_PHYCR:
+    case RTL8211E_MII_PHYSR:
+    case RTL8211E_MII_RXERC:
+    case RTL8211E_MII_LDPSR:
+    case RTL8211E_MII_EPAGSR:
+    case RTL8211E_MII_PAGSEL:
+        qemu_log_mask(LOG_UNIMP, "%s: reg %d not implemented\n",
+                      __func__, reg);
+        break;
+    default:
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset %d\n",
+                      __func__, reg);
+        break;
+    }
+}
+
+static int ftgmac100_read_bd(FTGMAC100Desc *bd, dma_addr_t addr)
+{
+    if (dma_memory_read(&address_space_memory, addr, bd, sizeof(*bd))) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to read descriptor @ 0x%"
+                      HWADDR_PRIx "\n", __func__, addr);
+        return -1;
+    }
+    bd->des0 = le32_to_cpu(bd->des0);
+    bd->des1 = le32_to_cpu(bd->des1);
+    bd->des2 = le32_to_cpu(bd->des2);
+    bd->des3 = le32_to_cpu(bd->des3);
+    return 0;
+}
+
+static int ftgmac100_write_bd(FTGMAC100Desc *bd, dma_addr_t addr)
+{
+    FTGMAC100Desc lebd;
+
+    lebd.des0 = cpu_to_le32(bd->des0);
+    lebd.des1 = cpu_to_le32(bd->des1);
+    lebd.des2 = cpu_to_le32(bd->des2);
+    lebd.des3 = cpu_to_le32(bd->des3);
+    if (dma_memory_write(&address_space_memory, addr, &lebd, sizeof(lebd))) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to write descriptor @ 0x%"
+                      HWADDR_PRIx "\n", __func__, addr);
+        return -1;
+    }
+    return 0;
+}
+
+static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring,
+                            uint32_t tx_descriptor)
+{
+    int frame_size = 0;
+    uint8_t *ptr = s->frame;
+    uint32_t addr = tx_descriptor;
+    uint32_t flags = 0;
+    int max_frame_size = ftgmac100_max_frame_size(s);
+
+    while (1) {
+        FTGMAC100Desc bd;
+        int len;
+
+        if (ftgmac100_read_bd(&bd, addr) ||
+            ((bd.des0 & FTGMAC100_TXDES0_TXDMA_OWN) == 0)) {
+            /* Run out of descriptors to transmit.  */
+            s->isr |= FTGMAC100_INT_NO_NPTXBUF;
+            break;
+        }
+
+        /* record transmit flags as they are valid only on the first
+         * segment */
+        if (bd.des0 & FTGMAC100_TXDES0_FTS) {
+            flags = bd.des1;
+        }
+
+        len = bd.des0 & 0x3FFF;
+        if (frame_size + len > max_frame_size) {
+            qemu_log_mask(LOG_GUEST_ERROR, "%s: frame too big : %d bytes\n",
+                          __func__, len);
+            len = max_frame_size - frame_size;
+        }
+
+        if (dma_memory_read(&address_space_memory, bd.des3, ptr, len)) {
+            qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to read packet @ 0x%x\n",
+                          __func__, bd.des3);
+            s->isr |= FTGMAC100_INT_NO_NPTXBUF;
+            break;
+        }
+
+        ptr += len;
+        frame_size += len;
+        if (bd.des0 & FTGMAC100_TXDES0_LTS) {
+            if (flags & FTGMAC100_TXDES1_IP_CHKSUM) {
+                net_checksum_calculate(s->frame, frame_size);
+            }
+            /* Last buffer in frame.  */
+            qemu_send_packet(qemu_get_queue(s->nic), s->frame, frame_size);
+            ptr = s->frame;
+            frame_size = 0;
+            if (flags & FTGMAC100_TXDES1_TXIC) {
+                s->isr |= FTGMAC100_INT_XPKT_ETH;
+            }
+        }
+
+        if (flags & FTGMAC100_TXDES1_TX2FIC) {
+            s->isr |= FTGMAC100_INT_XPKT_FIFO;
+        }
+        bd.des0 &= ~FTGMAC100_TXDES0_TXDMA_OWN;
+
+        /* Write back the modified descriptor.  */
+        ftgmac100_write_bd(&bd, addr);
+        /* Advance to the next descriptor.  */
+        if (bd.des0 & FTGMAC100_TXDES0_EDOTR) {
+            addr = tx_ring;
+        } else {
+            addr += sizeof(FTGMAC100Desc);
+        }
+    }
+
+    s->tx_descriptor = addr;
+
+    ftgmac100_update_irq(s);
+}
+
+static int ftgmac100_can_receive(NetClientState *nc)
+{
+    FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc));
+    FTGMAC100Desc bd;
+
+    if ((s->maccr & (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN))
+         != (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN)) {
+        return 0;
+    }
+
+    if (ftgmac100_read_bd(&bd, s->rx_descriptor)) {
+        return 0;
+    }
+    return !(bd.des0 & FTGMAC100_RXDES0_RXPKT_RDY);
+}
+
+/*
+ * This is purely informative. The HW can poll the RW (and RX) ring
+ * buffers for available descriptors but we don't need to trigger a
+ * timer for that in qemu.
+ */
+static uint32_t ftgmac100_rxpoll(FTGMAC100State *s)
+{
+    /* Polling times :
+     *
+     * Speed      TIME_SEL=0    TIME_SEL=1
+     *
+     *    10         51.2 ms      819.2 ms
+     *   100         5.12 ms      81.92 ms
+     *  1000        1.024 ms     16.384 ms
+     */
+    static const int div[] = { 20, 200, 1000 };
+
+    uint32_t cnt = 1024 * FTGMAC100_APTC_RXPOLL_CNT(s->aptcr);
+    uint32_t speed = (s->maccr & FTGMAC100_MACCR_FAST_MODE) ? 1 : 0;
+    uint32_t period;
+
+    if (s->aptcr & FTGMAC100_APTC_RXPOLL_TIME_SEL) {
+        cnt <<= 4;
+    }
+
+    if (s->maccr & FTGMAC100_MACCR_GIGA_MODE) {
+        speed = 2;
+    }
+
+    period = cnt / div[speed];
+
+    return period;
+}
+
+static void ftgmac100_reset(DeviceState *d)
+{
+    FTGMAC100State *s = FTGMAC100(d);
+
+    /* Reset the FTGMAC100 */
+    s->isr = 0;
+    s->ier = 0;
+    s->rx_enabled = 0;
+    s->rx_ring = 0;
+    s->rbsr = 0x640;
+    s->rx_descriptor = 0;
+    s->tx_ring = 0;
+    s->tx_descriptor = 0;
+    s->math[0] = 0;
+    s->math[1] = 0;
+    s->itc = 0;
+    s->aptcr = 1;
+    s->dblac = 0x00022f00;
+    s->revr = 0;
+    s->fear1 = 0;
+    s->tpafcr = 0xf1;
+
+    s->maccr = 0;
+    s->phycr = 0;
+    s->phydata = 0;
+    s->fcr = 0x400;
+
+    /* and the PHY */
+    phy_reset(s);
+}
+
+static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size)
+{
+    FTGMAC100State *s = FTGMAC100(opaque);
+
+    switch (addr & 0xff) {
+    case FTGMAC100_ISR:
+        return s->isr;
+    case FTGMAC100_IER:
+        return s->ier;
+    case FTGMAC100_MAC_MADR:
+        return (s->conf.macaddr.a[0] << 8)  | s->conf.macaddr.a[1];
+    case FTGMAC100_MAC_LADR:
+        return ((uint32_t) s->conf.macaddr.a[2] << 24) |
+            (s->conf.macaddr.a[3] << 16) | (s->conf.macaddr.a[4] << 8) |
+            s->conf.macaddr.a[5];
+    case FTGMAC100_MATH0:
+        return s->math[0];
+    case FTGMAC100_MATH1:
+        return s->math[1];
+    case FTGMAC100_ITC:
+        return s->itc;
+    case FTGMAC100_DBLAC:
+        return s->dblac;
+    case FTGMAC100_REVR:
+        return s->revr;
+    case FTGMAC100_FEAR1:
+        return s->fear1;
+    case FTGMAC100_TPAFCR:
+        return s->tpafcr;
+    case FTGMAC100_FCR:
+        return s->fcr;
+    case FTGMAC100_MACCR:
+        return s->maccr;
+    case FTGMAC100_PHYCR:
+        return s->phycr;
+    case FTGMAC100_PHYDATA:
+        return s->phydata;
+
+        /* We might want to support these one day */
+    case FTGMAC100_HPTXPD: /* High Priority Transmit Poll Demand */
+    case FTGMAC100_HPTXR_BADR: /* High Priority Transmit Ring Base Address */
+    case FTGMAC100_MACSR: /* MAC Status Register (MACSR) */
+        qemu_log_mask(LOG_UNIMP, "%s: read to unimplemented register 0x%"
+                      HWADDR_PRIx "\n", __func__, addr);
+        return 0;
+    default:
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%"
+                      HWADDR_PRIx "\n", __func__, addr);
+        return 0;
+    }
+}
+
+static void ftgmac100_write(void *opaque, hwaddr addr,
+                          uint64_t value, unsigned size)
+{
+    FTGMAC100State *s = FTGMAC100(opaque);
+    int reg;
+
+    switch (addr & 0xff) {
+    case FTGMAC100_ISR: /* Interrupt status */
+        s->isr &= ~value;
+        break;
+    case FTGMAC100_IER: /* Interrupt control */
+        s->ier = value;
+        break;
+    case FTGMAC100_MAC_MADR: /* MAC */
+        s->conf.macaddr.a[0] = value >> 8;
+        s->conf.macaddr.a[1] = value;
+        break;
+    case FTGMAC100_MAC_LADR:
+        s->conf.macaddr.a[2] = value >> 24;
+        s->conf.macaddr.a[3] = value >> 16;
+        s->conf.macaddr.a[4] = value >> 8;
+        s->conf.macaddr.a[5] = value;
+        break;
+    case FTGMAC100_MATH0: /* Multicast Address Hash Table 0 */
+        s->math[0] = value;
+        break;
+    case FTGMAC100_MATH1: /* Multicast Address Hash Table 1 */
+        s->math[1] = value;
+        break;
+    case FTGMAC100_ITC: /* TODO: Interrupt Timer Control */
+        s->itc = value;
+        break;
+    case FTGMAC100_RXR_BADR: /* Ring buffer address */
+        s->rx_ring = value;
+        s->rx_descriptor = s->rx_ring;
+        break;
+
+    case FTGMAC100_RBSR: /* DMA buffer size */
+        s->rbsr = value;
+        break;
+
+    case FTGMAC100_NPTXR_BADR: /* Transmit buffer address */
+        s->tx_ring = value;
+        s->tx_descriptor = s->tx_ring;
+        break;
+
+    case FTGMAC100_NPTXPD: /* Trigger transmit */
+        if ((s->maccr & (FTGMAC100_MACCR_TXDMA_EN | FTGMAC100_MACCR_TXMAC_EN))
+            == (FTGMAC100_MACCR_TXDMA_EN | FTGMAC100_MACCR_TXMAC_EN)) {
+            /* TODO: high priority tx ring */
+            ftgmac100_do_tx(s, s->tx_ring, s->tx_descriptor);
+        }
+        if (ftgmac100_can_receive(qemu_get_queue(s->nic))) {
+            qemu_flush_queued_packets(qemu_get_queue(s->nic));
+        }
+        break;
+
+    case FTGMAC100_RXPD: /* Receive Poll Demand Register */
+        if (ftgmac100_can_receive(qemu_get_queue(s->nic))) {
+            qemu_flush_queued_packets(qemu_get_queue(s->nic));
+        }
+        break;
+
+    case FTGMAC100_APTC: /* Automatic polling */
+        s->aptcr = value;
+
+        if (FTGMAC100_APTC_RXPOLL_CNT(s->aptcr)) {
+            ftgmac100_rxpoll(s);
+        }
+
+        if (FTGMAC100_APTC_TXPOLL_CNT(s->aptcr)) {
+            qemu_log_mask(LOG_UNIMP, "%s: no transmit polling\n", __func__);
+        }
+        break;
+
+    case FTGMAC100_MACCR: /* MAC Device control */
+        s->maccr = value;
+        if (value & FTGMAC100_MACCR_SW_RST) {
+            ftgmac100_reset(DEVICE(s));
+        }
+
+        if (ftgmac100_can_receive(qemu_get_queue(s->nic))) {
+            qemu_flush_queued_packets(qemu_get_queue(s->nic));
+        }
+        break;
+
+    case FTGMAC100_PHYCR:  /* PHY Device control */
+        reg = FTGMAC100_PHYCR_REG(value);
+        s->phycr = value;
+        if (value & FTGMAC100_PHYCR_MIIWR) {
+            do_phy_write(s, reg, s->phydata & 0xffff);
+            s->phycr &= ~FTGMAC100_PHYCR_MIIWR;
+        } else {
+            s->phydata = do_phy_read(s, reg) << 16;
+            s->phycr &= ~FTGMAC100_PHYCR_MIIRD;
+        }
+        break;
+    case FTGMAC100_PHYDATA:
+        s->phydata = value & 0xffff;
+        break;
+    case FTGMAC100_DBLAC: /* DMA Burst Length and Arbitration Control */
+        s->dblac = value;
+        break;
+    case FTGMAC100_REVR:  /* Feature Register */
+        /* TODO: Only Old MDIO interface is supported */
+        s->revr = value & ~FTGMAC100_REVR_NEW_MDIO_INTERFACE;
+        break;
+    case FTGMAC100_FEAR1: /* Feature Register 1 */
+        s->fear1 = value;
+        break;
+    case FTGMAC100_TPAFCR: /* Transmit Priority Arbitration and FIFO Control */
+        s->tpafcr = value;
+        break;
+    case FTGMAC100_FCR: /* Flow Control  */
+        s->fcr  = value;
+        break;
+
+    case FTGMAC100_HPTXPD: /* High Priority Transmit Poll Demand */
+    case FTGMAC100_HPTXR_BADR: /* High Priority Transmit Ring Base Address */
+    case FTGMAC100_MACSR: /* MAC Status Register (MACSR) */
+        qemu_log_mask(LOG_UNIMP, "%s: write to unimplemented register 0x%"
+                      HWADDR_PRIx "\n", __func__, addr);
+        break;
+    default:
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%"
+                      HWADDR_PRIx "\n", __func__, addr);
+        break;
+    }
+
+    ftgmac100_update_irq(s);
+}
+
+static int ftgmac100_filter(FTGMAC100State *s, const uint8_t *buf, size_t len)
+{
+    unsigned mcast_idx;
+
+    if (s->maccr & FTGMAC100_MACCR_RX_ALL) {
+        return 1;
+    }
+
+    switch (get_eth_packet_type(PKT_GET_ETH_HDR(buf))) {
+    case ETH_PKT_BCAST:
+        if (!(s->maccr & FTGMAC100_MACCR_RX_BROADPKT)) {
+            return 0;
+        }
+        break;
+    case ETH_PKT_MCAST:
+        if (!(s->maccr & FTGMAC100_MACCR_RX_MULTIPKT)) {
+            if (!(s->maccr & FTGMAC100_MACCR_HT_MULTI_EN)) {
+                return 0;
+            }
+
+            /* TODO: this does not seem to work for ftgmac100 */
+            mcast_idx = compute_mcast_idx(buf);
+            if (!(s->math[mcast_idx / 32] & (1 << (mcast_idx % 32)))) {
+                return 0;
+            }
+        }
+        break;
+    case ETH_PKT_UCAST:
+        if (memcmp(s->conf.macaddr.a, buf, 6)) {
+            return 0;
+        }
+        break;
+    }
+
+    return 1;
+}
+
+static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf,
+                                 size_t len)
+{
+    FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc));
+    FTGMAC100Desc bd;
+    uint32_t flags = 0;
+    uint32_t addr;
+    uint32_t crc;
+    uint32_t buf_addr;
+    uint8_t *crc_ptr;
+    uint32_t buf_len;
+    size_t size = len;
+    uint32_t first = FTGMAC100_RXDES0_FRS;
+    int max_frame_size = ftgmac100_max_frame_size(s);
+
+    if ((s->maccr & (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN))
+         != (FTGMAC100_MACCR_RXDMA_EN | FTGMAC100_MACCR_RXMAC_EN)) {
+        return -1;
+    }
+
+    /* TODO : Pad to minimum Ethernet frame length */
+    /* handle small packets.  */
+    if (size < 10) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: dropped frame of %zd bytes\n",
+                      __func__, size);
+        return size;
+    }
+
+    if (size < 64 && !(s->maccr & FTGMAC100_MACCR_RX_RUNT)) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: dropped runt frame of %zd bytes\n",
+                      __func__, size);
+        return size;
+    }
+
+    if (!ftgmac100_filter(s, buf, size)) {
+        return size;
+    }
+
+    /* 4 bytes for the CRC.  */
+    size += 4;
+    crc = cpu_to_be32(crc32(~0, buf, size));
+    crc_ptr = (uint8_t *) &crc;
+
+    /* Huge frames are truncated.  */
+    if (size > max_frame_size) {
+        size = max_frame_size;
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: frame too big : %zd bytes\n",
+                      __func__, size);
+        flags |= FTGMAC100_RXDES0_FTL;
+    }
+
+    switch (get_eth_packet_type(PKT_GET_ETH_HDR(buf))) {
+    case ETH_PKT_BCAST:
+        flags |= FTGMAC100_RXDES0_BROADCAST;
+        break;
+    case ETH_PKT_MCAST:
+        flags |= FTGMAC100_RXDES0_MULTICAST;
+        break;
+    case ETH_PKT_UCAST:
+        break;
+    }
+
+    addr = s->rx_descriptor;
+    while (size > 0) {
+        if (!ftgmac100_can_receive(nc)) {
+            qemu_log_mask(LOG_GUEST_ERROR, "%s: Unexpected packet\n", __func__);
+            return -1;
+        }
+
+        if (ftgmac100_read_bd(&bd, addr) ||
+            (bd.des0 & FTGMAC100_RXDES0_RXPKT_RDY)) {
+            /* No descriptors available.  Bail out.  */
+            qemu_log_mask(LOG_GUEST_ERROR, "%s: Lost end of frame\n",
+                          __func__);
+            s->isr |= FTGMAC100_INT_NO_RXBUF;
+            break;
+        }
+        buf_len = (size <= s->rbsr) ? size : s->rbsr;
+        bd.des0 |= buf_len & 0x3fff;
+        size -= buf_len;
+
+        /* The last 4 bytes are the CRC.  */
+        if (size < 4) {
+            buf_len += size - 4;
+        }
+        buf_addr = bd.des3;
+        dma_memory_write(&address_space_memory, buf_addr, buf, buf_len);
+        buf += buf_len;
+        if (size < 4) {
+            dma_memory_write(&address_space_memory, buf_addr + buf_len,
+                             crc_ptr, 4 - size);
+            crc_ptr += 4 - size;
+        }
+
+        bd.des0 |= first | FTGMAC100_RXDES0_RXPKT_RDY;
+        first = 0;
+        if (size == 0) {
+            /* Last buffer in frame.  */
+            bd.des0 |= flags | FTGMAC100_RXDES0_LRS;
+            s->isr |= FTGMAC100_INT_RPKT_BUF;
+        } else {
+            s->isr |= FTGMAC100_INT_RPKT_FIFO;
+        }
+        ftgmac100_write_bd(&bd, addr);
+        if (bd.des0 & FTGMAC100_RXDES0_EDORR) {
+            addr = s->rx_ring;
+        } else {
+            addr += sizeof(FTGMAC100Desc);
+        }
+    }
+    s->rx_descriptor = addr;
+
+    ftgmac100_update_irq(s);
+    return len;
+}
+
+static const MemoryRegionOps ftgmac100_ops = {
+    .read = ftgmac100_read,
+    .write = ftgmac100_write,
+    .valid.min_access_size = 4,
+    .valid.max_access_size = 4,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+};
+
+static void ftgmac100_cleanup(NetClientState *nc)
+{
+    FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc));
+
+    s->nic = NULL;
+}
+
+static NetClientInfo net_ftgmac100_info = {
+    .type = NET_CLIENT_DRIVER_NIC,
+    .size = sizeof(NICState),
+    .can_receive = ftgmac100_can_receive,
+    .receive = ftgmac100_receive,
+    .cleanup = ftgmac100_cleanup,
+    .link_status_changed = ftgmac100_set_link,
+};
+
+static void ftgmac100_realize(DeviceState *dev, Error **errp)
+{
+    FTGMAC100State *s = FTGMAC100(dev);
+    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+
+    memory_region_init_io(&s->iomem, OBJECT(dev), &ftgmac100_ops, s,
+                          TYPE_FTGMAC100, 0x2000);
+    sysbus_init_mmio(sbd, &s->iomem);
+    sysbus_init_irq(sbd, &s->irq);
+    qemu_macaddr_default_if_unset(&s->conf.macaddr);
+
+    s->conf.peers.ncs[0] = nd_table[0].netdev;
+
+    s->nic = qemu_new_nic(&net_ftgmac100_info, &s->conf,
+                          object_get_typename(OBJECT(dev)), DEVICE(dev)->id,
+                          s);
+    qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
+
+    s->frame = g_malloc(FTGMAC100_MAX_FRAME_SIZE);
+}
+
+static const VMStateDescription vmstate_ftgmac100 = {
+    .name = TYPE_FTGMAC100,
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .fields = (VMStateField[]) {
+        VMSTATE_UINT32(irq_state, FTGMAC100State),
+        VMSTATE_UINT32(isr, FTGMAC100State),
+        VMSTATE_UINT32(ier, FTGMAC100State),
+        VMSTATE_UINT32(rx_enabled, FTGMAC100State),
+        VMSTATE_UINT32(rx_ring, FTGMAC100State),
+        VMSTATE_UINT32(rbsr, FTGMAC100State),
+        VMSTATE_UINT32(tx_ring, FTGMAC100State),
+        VMSTATE_UINT32(rx_descriptor, FTGMAC100State),
+        VMSTATE_UINT32(tx_descriptor, FTGMAC100State),
+        VMSTATE_UINT32_ARRAY(math, FTGMAC100State, 2),
+        VMSTATE_UINT32(itc, FTGMAC100State),
+        VMSTATE_UINT32(aptcr, FTGMAC100State),
+        VMSTATE_UINT32(dblac, FTGMAC100State),
+        VMSTATE_UINT32(revr, FTGMAC100State),
+        VMSTATE_UINT32(fear1, FTGMAC100State),
+        VMSTATE_UINT32(tpafcr, FTGMAC100State),
+        VMSTATE_UINT32(maccr, FTGMAC100State),
+        VMSTATE_UINT32(phycr, FTGMAC100State),
+        VMSTATE_UINT32(phydata, FTGMAC100State),
+        VMSTATE_UINT32(fcr, FTGMAC100State),
+        VMSTATE_UINT32(phy_status, FTGMAC100State),
+        VMSTATE_UINT32(phy_control, FTGMAC100State),
+        VMSTATE_UINT32(phy_advertise, FTGMAC100State),
+        VMSTATE_UINT32(phy_int, FTGMAC100State),
+        VMSTATE_UINT32(phy_int_mask, FTGMAC100State),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static Property ftgmac100_properties[] = {
+    DEFINE_NIC_PROPERTIES(FTGMAC100State, conf),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void ftgmac100_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    dc->vmsd = &vmstate_ftgmac100;
+    dc->reset = ftgmac100_reset;
+    dc->props = ftgmac100_properties;
+    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
+    dc->realize = ftgmac100_realize;
+    dc->desc = "Faraday FTGMAC100 Gigabit Ethernet emulation";
+}
+
+static const TypeInfo ftgmac100_info = {
+    .name = TYPE_FTGMAC100,
+    .parent = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(FTGMAC100State),
+    .class_init = ftgmac100_class_init,
+};
+
+static void ftgmac100_register_types(void)
+{
+    type_register_static(&ftgmac100_info);
+}
+
+type_init(ftgmac100_register_types)
diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/hw/net/ftgmac100.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * Faraday FTGMAC100 Gigabit Ethernet
+ *
+ * Copyright (C) 2016-2017, IBM Corporation.
+ *
+ * This code is licensed under the GPL version 2 or later. See the
+ * COPYING file in the top-level directory.
+ */
+
+#ifndef FTGMAC100_H
+#define FTGMAC100_H
+
+#define TYPE_FTGMAC100 "ftgmac100"
+#define FTGMAC100(obj) OBJECT_CHECK(FTGMAC100State, (obj), TYPE_FTGMAC100)
+
+#include "hw/sysbus.h"
+#include "net/net.h"
+
+typedef struct FTGMAC100State {
+    /*< private >*/
+    SysBusDevice parent_obj;
+
+    /*< public >*/
+    NICState *nic;
+    NICConf conf;
+    qemu_irq irq;
+    MemoryRegion iomem;
+
+    uint8_t *frame;
+
+    uint32_t irq_state;
+    uint32_t isr;
+    uint32_t ier;
+    uint32_t rx_enabled;
+    uint32_t rx_ring;
+    uint32_t rx_descriptor;
+    uint32_t tx_ring;
+    uint32_t tx_descriptor;
+    uint32_t math[2];
+    uint32_t rbsr;
+    uint32_t itc;
+    uint32_t aptcr;
+    uint32_t dblac;
+    uint32_t revr;
+    uint32_t fear1;
+    uint32_t tpafcr;
+    uint32_t maccr;
+    uint32_t phycr;
+    uint32_t phydata;
+    uint32_t fcr;
+
+
+    uint32_t phy_status;
+    uint32_t phy_control;
+    uint32_t phy_advertise;
+    uint32_t phy_int;
+    uint32_t phy_int_mask;
+} FTGMAC100State;
+
+#endif
-- 
2.7.4

From: Cédric Le Goater <clg@kaod.org>

The Aspeed SoCs have a different definition of the end of the ring
buffer bit. Add a property to specify which set of bits should be used
by the NIC.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/ftgmac100.c         | 17 +++++++++++++++--
 include/hw/net/ftgmac100.h |  4 ++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -XXX,XX +XXX,XX @@
 #define FTGMAC100_TXDES0_CRC_ERR         (1 << 19)
 #define FTGMAC100_TXDES0_LTS             (1 << 28)
 #define FTGMAC100_TXDES0_FTS             (1 << 29)
+#define FTGMAC100_TXDES0_EDOTR_ASPEED    (1 << 30)
 #define FTGMAC100_TXDES0_TXDMA_OWN       (1 << 31)
 
 #define FTGMAC100_TXDES1_VLANTAG_CI(x)   ((x) & 0xffff)
@@ -XXX,XX +XXX,XX @@
 #define FTGMAC100_RXDES0_PAUSE_FRAME     (1 << 25)
 #define FTGMAC100_RXDES0_LRS             (1 << 28)
 #define FTGMAC100_RXDES0_FRS             (1 << 29)
+#define FTGMAC100_RXDES0_EDORR_ASPEED    (1 << 30)
 #define FTGMAC100_RXDES0_RXPKT_RDY       (1 << 31)
 
 #define FTGMAC100_RXDES1_VLANTAG_CI      0xffff
@@ -XXX,XX +XXX,XX @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring,
         /* Write back the modified descriptor.  */
         ftgmac100_write_bd(&bd, addr);
         /* Advance to the next descriptor.  */
-        if (bd.des0 & FTGMAC100_TXDES0_EDOTR) {
+        if (bd.des0 & s->txdes0_edotr) {
             addr = tx_ring;
         } else {
             addr += sizeof(FTGMAC100Desc);
@@ -XXX,XX +XXX,XX @@ static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf,
             s->isr |= FTGMAC100_INT_RPKT_FIFO;
         }
         ftgmac100_write_bd(&bd, addr);
-        if (bd.des0 & FTGMAC100_RXDES0_EDORR) {
+        if (bd.des0 & s->rxdes0_edorr) {
             addr = s->rx_ring;
         } else {
             addr += sizeof(FTGMAC100Desc);
@@ -XXX,XX +XXX,XX @@ static void ftgmac100_realize(DeviceState *dev, Error **errp)
     FTGMAC100State *s = FTGMAC100(dev);
     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 
+    if (s->aspeed) {
+        s->txdes0_edotr = FTGMAC100_TXDES0_EDOTR_ASPEED;
+        s->rxdes0_edorr = FTGMAC100_RXDES0_EDORR_ASPEED;
+    } else {
+        s->txdes0_edotr = FTGMAC100_TXDES0_EDOTR;
+        s->rxdes0_edorr = FTGMAC100_RXDES0_EDORR;
+    }
+
     memory_region_init_io(&s->iomem, OBJECT(dev), &ftgmac100_ops, s,
                           TYPE_FTGMAC100, 0x2000);
     sysbus_init_mmio(sbd, &s->iomem);
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_ftgmac100 = {
         VMSTATE_UINT32(phy_advertise, FTGMAC100State),
         VMSTATE_UINT32(phy_int, FTGMAC100State),
         VMSTATE_UINT32(phy_int_mask, FTGMAC100State),
+        VMSTATE_UINT32(txdes0_edotr, FTGMAC100State),
+        VMSTATE_UINT32(rxdes0_edorr, FTGMAC100State),
         VMSTATE_END_OF_LIST()
     }
 };
 
 static Property ftgmac100_properties[] = {
+    DEFINE_PROP_BOOL("aspeed", FTGMAC100State, aspeed, false),
     DEFINE_NIC_PROPERTIES(FTGMAC100State, conf),
     DEFINE_PROP_END_OF_LIST(),
 };
diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/net/ftgmac100.h
+++ b/include/hw/net/ftgmac100.h
@@ -XXX,XX +XXX,XX @@ typedef struct FTGMAC100State {
     uint32_t phy_advertise;
     uint32_t phy_int;
     uint32_t phy_int_mask;
+
+    bool aspeed;
+    uint32_t txdes0_edotr;
+    uint32_t rxdes0_edorr;
 } FTGMAC100State;
 
 #endif
-- 
2.7.4

From: Cédric Le Goater <clg@kaod.org>

There is a second NIC but we do not use it for the moment. We use the
'aspeed' property to tune the definition of the end of ring buffer bit
for the Aspeed SoCs.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/arm/aspeed_soc.c         | 21 +++++++++++++++++++++
 include/hw/arm/aspeed_soc.h |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/char/serial.h"
 #include "qemu/log.h"
 #include "hw/i2c/aspeed_i2c.h"
+#include "net/net.h"
 
 #define ASPEED_SOC_UART_5_BASE      0x00184000
 #define ASPEED_SOC_IOMEM_SIZE       0x00200000
@@ -XXX,XX +XXX,XX @@
 #define ASPEED_SOC_TIMER_BASE       0x1E782000
 #define ASPEED_SOC_WDT_BASE         0x1E785000
 #define ASPEED_SOC_I2C_BASE         0x1E78A000
+#define ASPEED_SOC_ETH1_BASE        0x1E660000
+#define ASPEED_SOC_ETH2_BASE        0x1E680000
 
 static const int uart_irqs[] = { 9, 32, 33, 34, 10 };
 static const int timer_irqs[] = { 16, 17, 18, 35, 36, 37, 38, 39, };
@@ -XXX,XX +XXX,XX @@ static void aspeed_soc_init(Object *obj)
     object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ASPEED_WDT);
     object_property_add_child(obj, "wdt", OBJECT(&s->wdt), NULL);
     qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());
+
+    object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);
+    object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), NULL);
+    qdev_set_parent_bus(DEVICE(&s->ftgmac100), sysbus_get_default());
 }
 
 static void aspeed_soc_realize(DeviceState *dev, Error **errp)
@@ -XXX,XX +XXX,XX @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
         return;
     }
     sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt), 0, ASPEED_SOC_WDT_BASE);
+
+    /* Net */
+    qdev_set_nic_properties(DEVICE(&s->ftgmac100), &nd_table[0]);
+    object_property_set_bool(OBJECT(&s->ftgmac100), true, "aspeed", &err);
+    object_property_set_bool(OBJECT(&s->ftgmac100), true, "realized",
+                             &local_err);
+    error_propagate(&err, local_err);
+    if (err) {
+        error_propagate(errp, err);
+        return;
+    }
+    sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100), 0, ASPEED_SOC_ETH1_BASE);
+    sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100), 0,
+                       qdev_get_gpio_in(DEVICE(&s->vic), 2));
 }
 
 static void aspeed_soc_class_init(ObjectClass *oc, void *data)
diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/arm/aspeed_soc.h
+++ b/include/hw/arm/aspeed_soc.h
@@ -XXX,XX +XXX,XX @@
 #include "hw/i2c/aspeed_i2c.h"
 #include "hw/ssi/aspeed_smc.h"
 #include "hw/watchdog/wdt_aspeed.h"
+#include "hw/net/ftgmac100.h"
 
 #define ASPEED_SPIS_NUM  2
 
@@ -XXX,XX +XXX,XX @@ typedef struct AspeedSoCState {
     AspeedSMCState spi[ASPEED_SPIS_NUM];
     AspeedSDMCState sdmc;
     AspeedWDTState wdt;
+    FTGMAC100State ftgmac100;
 } AspeedSoCState;
 
 #define TYPE_ASPEED_SOC "aspeed-soc"
-- 
2.7.4

From: Cédric Le Goater <clg@kaod.org>

NC-SI (Network Controller Sideband Interface) enables a BMC to manage
a set of NICs on a system. This model takes the simplest approach and
reverses the NC-SI packets to pretend a NIC is present and exercise
the Linux driver.

The NCSI header file <ncsi-pkt.h> comes from mainline Linux and was
untabified.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 include/net/eth.h   |   1 +
 slirp/Makefile.objs |   2 +-
 slirp/ncsi-pkt.h    | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 slirp/ncsi.c        | 130 ++++++++++++++++
 slirp/slirp.c       |   4 +
 slirp/slirp.h       |   3 +
 6 files changed, 558 insertions(+), 1 deletion(-)
 create mode 100644 slirp/ncsi-pkt.h
 create mode 100644 slirp/ncsi.c

diff --git a/include/net/eth.h b/include/net/eth.h
index XXXXXXX..XXXXXXX 100644
--- a/include/net/eth.h
+++ b/include/net/eth.h
@@ -XXX,XX +XXX,XX @@ struct tcp_hdr {
 #define ETH_P_IPV6                (0x86dd)
 #define ETH_P_VLAN                (0x8100)
 #define ETH_P_DVLAN               (0x88a8)
+#define ETH_P_NCSI                (0x88f8)
 #define ETH_P_UNKNOWN             (0xffff)
 #define VLAN_VID_MASK             0x0fff
 #define IP_HEADER_VERSION_4       (4)
diff --git a/slirp/Makefile.objs b/slirp/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/slirp/Makefile.objs
+++ b/slirp/Makefile.objs
@@ -XXX,XX +XXX,XX @@ common-obj-y = cksum.o if.o ip_icmp.o ip6_icmp.o ip6_input.o ip6_output.o \
                ip_input.o ip_output.o dnssearch.o dhcpv6.o
 common-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
 common-obj-y += tcp_subr.o tcp_timer.o udp.o udp6.o bootp.o tftp.o arp_table.o \
-                ndp_table.o
+                ndp_table.o ncsi.o
diff --git a/slirp/ncsi-pkt.h b/slirp/ncsi-pkt.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/slirp/ncsi-pkt.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * Copyright Gavin Shan, IBM Corporation 2016.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef NCSI_PKT_H
+#define NCSI_PKT_H
+
+/* from linux/net/ncsi/ncsi-pkt.h */
+#define __be32 uint32_t
+#define __be16 uint16_t
+
+struct ncsi_pkt_hdr {
+        unsigned char mc_id;        /* Management controller ID */
+        unsigned char revision;     /* NCSI version - 0x01      */
+        unsigned char reserved;     /* Reserved                 */
+        unsigned char id;           /* Packet sequence number   */
+        unsigned char type;         /* Packet type              */
+        unsigned char channel;      /* Network controller ID    */
+        __be16        length;       /* Payload length           */
+        __be32        reserved1[2]; /* Reserved                 */
+};
+
+struct ncsi_cmd_pkt_hdr {
+        struct ncsi_pkt_hdr common; /* Common NCSI packet header */
+};
+
+struct ncsi_rsp_pkt_hdr {
+        struct ncsi_pkt_hdr common; /* Common NCSI packet header */
+        __be16              code;   /* Response code             */
+        __be16              reason; /* Response reason           */
+};
+
+struct ncsi_aen_pkt_hdr {
+        struct ncsi_pkt_hdr common;       /* Common NCSI packet header */
+        unsigned char       reserved2[3]; /* Reserved                  */
+        unsigned char       type;         /* AEN packet type           */
+};
+
+/* NCSI common command packet */
+struct ncsi_cmd_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;      /* Command header */
+        __be32                  checksum; /* Checksum       */
+        unsigned char           pad[26];
+};
+
+struct ncsi_rsp_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;      /* Response header */
+        __be32                  checksum; /* Checksum        */
+        unsigned char           pad[22];
+};
+
+/* Select Package */
+struct ncsi_cmd_sp_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;            /* Command header */
+        unsigned char           reserved[3];    /* Reserved       */
+        unsigned char           hw_arbitration; /* HW arbitration */
+        __be32                  checksum;       /* Checksum       */
+        unsigned char           pad[22];
+};
+
+/* Disable Channel */
+struct ncsi_cmd_dc_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;         /* Command header  */
+        unsigned char           reserved[3]; /* Reserved        */
+        unsigned char           ald;         /* Allow link down */
+        __be32                  checksum;    /* Checksum        */
+        unsigned char           pad[22];
+};
+
+/* Reset Channel */
+struct ncsi_cmd_rc_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;      /* Command header */
+        __be32                  reserved; /* Reserved       */
+        __be32                  checksum; /* Checksum       */
+        unsigned char           pad[22];
+};
+
+/* AEN Enable */
+struct ncsi_cmd_ae_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;         /* Command header   */
+        unsigned char           reserved[3]; /* Reserved         */
+        unsigned char           mc_id;       /* MC ID            */
+        __be32                  mode;        /* AEN working mode */
+        __be32                  checksum;    /* Checksum         */
+        unsigned char           pad[18];
+};
+
+/* Set Link */
+struct ncsi_cmd_sl_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;      /* Command header    */
+        __be32                  mode;     /* Link working mode */
+        __be32                  oem_mode; /* OEM link mode     */
+        __be32                  checksum; /* Checksum          */
+        unsigned char           pad[18];
+};
+
+/* Set VLAN Filter */
+struct ncsi_cmd_svf_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;       /* Command header    */
+        __be16                  reserved;  /* Reserved          */
+        __be16                  vlan;      /* VLAN ID           */
+        __be16                  reserved1; /* Reserved          */
+        unsigned char           index;     /* VLAN table index  */
+        unsigned char           enable;    /* Enable or disable */
+        __be32                  checksum;  /* Checksum          */
+        unsigned char           pad[14];
+};
+
+/* Enable VLAN */
+struct ncsi_cmd_ev_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;         /* Command header   */
+        unsigned char           reserved[3]; /* Reserved         */
+        unsigned char           mode;        /* VLAN filter mode */
+        __be32                  checksum;    /* Checksum         */
+        unsigned char           pad[22];
+};
+
+/* Set MAC Address */
+struct ncsi_cmd_sma_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;      /* Command header          */
+        unsigned char           mac[6];   /* MAC address             */
+        unsigned char           index;    /* MAC table index         */
+        unsigned char           at_e;     /* Addr type and operation */
+        __be32                  checksum; /* Checksum                */
+        unsigned char           pad[18];
+};
+
+/* Enable Broadcast Filter */
+struct ncsi_cmd_ebf_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;      /* Command header */
+        __be32                  mode;     /* Filter mode    */
+        __be32                  checksum; /* Checksum       */
+        unsigned char           pad[22];
+};
+
+/* Enable Global Multicast Filter */
+struct ncsi_cmd_egmf_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;      /* Command header */
+        __be32                  mode;     /* Global MC mode */
+        __be32                  checksum; /* Checksum       */
+        unsigned char           pad[22];
+};
+
+/* Set NCSI Flow Control */
+struct ncsi_cmd_snfc_pkt {
+        struct ncsi_cmd_pkt_hdr cmd;         /* Command header    */
+        unsigned char           reserved[3]; /* Reserved          */
+        unsigned char           mode;        /* Flow control mode */
+        __be32                  checksum;    /* Checksum          */
+        unsigned char           pad[22];
+};
+
+/* Get Link Status */
+struct ncsi_rsp_gls_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;        /* Response header   */
+        __be32                  status;     /* Link status       */
+        __be32                  other;      /* Other indications */
+        __be32                  oem_status; /* OEM link status   */
+        __be32                  checksum;
+        unsigned char           pad[10];
+};
+
+/* Get Version ID */
+struct ncsi_rsp_gvi_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;          /* Response header */
+        __be32                  ncsi_version; /* NCSI version    */
+        unsigned char           reserved[3];  /* Reserved        */
+        unsigned char           alpha2;       /* NCSI version    */
+        unsigned char           fw_name[12];  /* f/w name string */
+        __be32                  fw_version;   /* f/w version     */
+        __be16                  pci_ids[4];   /* PCI IDs         */
+        __be32                  mf_id;        /* Manufacture ID  */
+        __be32                  checksum;
+};
+
+/* Get Capabilities */
+struct ncsi_rsp_gc_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;         /* Response header   */
+        __be32                  cap;         /* Capabilities      */
+        __be32                  bc_cap;      /* Broadcast cap     */
+        __be32                  mc_cap;      /* Multicast cap     */
+        __be32                  buf_cap;     /* Buffering cap     */
+        __be32                  aen_cap;     /* AEN cap           */
+        unsigned char           vlan_cnt;    /* VLAN filter count */
+        unsigned char           mixed_cnt;   /* Mix filter count  */
+        unsigned char           mc_cnt;      /* MC filter count   */
+        unsigned char           uc_cnt;      /* UC filter count   */
+        unsigned char           reserved[2]; /* Reserved          */
+        unsigned char           vlan_mode;   /* VLAN mode         */
+        unsigned char           channel_cnt; /* Channel count     */
+        __be32                  checksum;    /* Checksum          */
+};
+
+/* Get Parameters */
+struct ncsi_rsp_gp_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;          /* Response header       */
+        unsigned char           mac_cnt;      /* Number of MAC addr    */
+        unsigned char           reserved[2];  /* Reserved              */
+        unsigned char           mac_enable;   /* MAC addr enable flags */
+        unsigned char           vlan_cnt;     /* VLAN tag count        */
+        unsigned char           reserved1;    /* Reserved              */
+        __be16                  vlan_enable;  /* VLAN tag enable flags */
+        __be32                  link_mode;    /* Link setting          */
+        __be32                  bc_mode;      /* BC filter mode        */
+        __be32                  valid_modes;  /* Valid mode parameters */
+        unsigned char           vlan_mode;    /* VLAN mode             */
+        unsigned char           fc_mode;      /* Flow control mode     */
+        unsigned char           reserved2[2]; /* Reserved              */
+        __be32                  aen_mode;     /* AEN mode              */
+        unsigned char           mac[6];       /* Supported MAC addr    */
+        __be16                  vlan;         /* Supported VLAN tags   */
+        __be32                  checksum;     /* Checksum              */
+};
+
+/* Get Controller Packet Statistics */
+struct ncsi_rsp_gcps_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;            /* Response header            */
+        __be32                  cnt_hi;         /* Counter cleared            */
+        __be32                  cnt_lo;         /* Counter cleared            */
+        __be32                  rx_bytes;       /* Rx bytes                   */
+        __be32                  tx_bytes;       /* Tx bytes                   */
+        __be32                  rx_uc_pkts;     /* Rx UC packets              */
+        __be32                  rx_mc_pkts;     /* Rx MC packets              */
+        __be32                  rx_bc_pkts;     /* Rx BC packets              */
+        __be32                  tx_uc_pkts;     /* Tx UC packets              */
+        __be32                  tx_mc_pkts;     /* Tx MC packets              */
+        __be32                  tx_bc_pkts;     /* Tx BC packets              */
+        __be32                  fcs_err;        /* FCS errors                 */
+        __be32                  align_err;      /* Alignment errors           */
+        __be32                  false_carrier;  /* False carrier detection    */
+        __be32                  runt_pkts;      /* Rx runt packets            */
+        __be32                  jabber_pkts;    /* Rx jabber packets          */
+        __be32                  rx_pause_xon;   /* Rx pause XON frames        */
+        __be32                  rx_pause_xoff;  /* Rx XOFF frames             */
+        __be32                  tx_pause_xon;   /* Tx XON frames              */
+        __be32                  tx_pause_xoff;  /* Tx XOFF frames             */
+        __be32                  tx_s_collision; /* Single collision frames    */
+        __be32                  tx_m_collision; /* Multiple collision frames  */
+        __be32                  l_collision;    /* Late collision frames      */
+        __be32                  e_collision;    /* Excessive collision frames */
+        __be32                  rx_ctl_frames;  /* Rx control frames          */
+        __be32                  rx_64_frames;   /* Rx 64-bytes frames         */
+        __be32                  rx_127_frames;  /* Rx 65-127 bytes frames     */
+        __be32                  rx_255_frames;  /* Rx 128-255 bytes frames    */
+        __be32                  rx_511_frames;  /* Rx 256-511 bytes frames    */
+        __be32                  rx_1023_frames; /* Rx 512-1023 bytes frames   */
+        __be32                  rx_1522_frames; /* Rx 1024-1522 bytes frames  */
+        __be32                  rx_9022_frames; /* Rx 1523-9022 bytes frames  */
+        __be32                  tx_64_frames;   /* Tx 64-bytes frames         */
+        __be32                  tx_127_frames;  /* Tx 65-127 bytes frames     */
+        __be32                  tx_255_frames;  /* Tx 128-255 bytes frames    */
+        __be32                  tx_511_frames;  /* Tx 256-511 bytes frames    */
+        __be32                  tx_1023_frames; /* Tx 512-1023 bytes frames   */
+        __be32                  tx_1522_frames; /* Tx 1024-1522 bytes frames  */
+        __be32                  tx_9022_frames; /* Tx 1523-9022 bytes frames  */
+        __be32                  rx_valid_bytes; /* Rx valid bytes             */
+        __be32                  rx_runt_pkts;   /* Rx error runt packets      */
+        __be32                  rx_jabber_pkts; /* Rx error jabber packets    */
+        __be32                  checksum;       /* Checksum                   */
+};
+
+/* Get NCSI Statistics */
+struct ncsi_rsp_gns_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;           /* Response header         */
+        __be32                  rx_cmds;       /* Rx NCSI commands        */
+        __be32                  dropped_cmds;  /* Dropped commands        */
+        __be32                  cmd_type_errs; /* Command type errors     */
+        __be32                  cmd_csum_errs; /* Command checksum errors */
+        __be32                  rx_pkts;       /* Rx NCSI packets         */
+        __be32                  tx_pkts;       /* Tx NCSI packets         */
+        __be32                  tx_aen_pkts;   /* Tx AEN packets          */
+        __be32                  checksum;      /* Checksum                */
+};
+
+/* Get NCSI Pass-through Statistics */
+struct ncsi_rsp_gnpts_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;            /* Response header     */
+        __be32                  tx_pkts;        /* Tx packets          */
+        __be32                  tx_dropped;     /* Tx dropped packets  */
+        __be32                  tx_channel_err; /* Tx channel errors   */
+        __be32                  tx_us_err;      /* Tx undersize errors */
+        __be32                  rx_pkts;        /* Rx packets          */
+        __be32                  rx_dropped;     /* Rx dropped packets  */
+        __be32                  rx_channel_err; /* Rx channel errors   */
+        __be32                  rx_us_err;      /* Rx undersize errors */
+        __be32                  rx_os_err;      /* Rx oversize errors  */
+        __be32                  checksum;       /* Checksum            */
+};
+
+/* Get package status */
+struct ncsi_rsp_gps_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;      /* Response header             */
+        __be32                  status;   /* Hardware arbitration status */
+        __be32                  checksum;
+};
+
+/* Get package UUID */
+struct ncsi_rsp_gpuuid_pkt {
+        struct ncsi_rsp_pkt_hdr rsp;      /* Response header */
+        unsigned char           uuid[16]; /* UUID            */
+        __be32                  checksum;
+};
+
+/* AEN: Link State Change */
+struct ncsi_aen_lsc_pkt {
+        struct ncsi_aen_pkt_hdr aen;        /* AEN header      */
+        __be32                  status;     /* Link status     */
+        __be32                  oem_status; /* OEM link status */
+        __be32                  checksum;   /* Checksum        */
+        unsigned char           pad[14];
+};
+
+/* AEN: Configuration Required */
+struct ncsi_aen_cr_pkt {
+        struct ncsi_aen_pkt_hdr aen;      /* AEN header */
+        __be32                  checksum; /* Checksum   */
+        unsigned char           pad[22];
+};
+
+/* AEN: Host Network Controller Driver Status Change */
+struct ncsi_aen_hncdsc_pkt {
+        struct ncsi_aen_pkt_hdr aen;      /* AEN header */
+        __be32                  status;   /* Status     */
+        __be32                  checksum; /* Checksum   */
+        unsigned char           pad[18];
+};
+
+/* NCSI packet revision */
+#define NCSI_PKT_REVISION       0x01
+
+/* NCSI packet commands */
+#define NCSI_PKT_CMD_CIS        0x00 /* Clear Initial State              */
+#define NCSI_PKT_CMD_SP         0x01 /* Select Package                   */
+#define NCSI_PKT_CMD_DP         0x02 /* Deselect Package                 */
+#define NCSI_PKT_CMD_EC         0x03 /* Enable Channel                   */
+#define NCSI_PKT_CMD_DC         0x04 /* Disable Channel                  */
+#define NCSI_PKT_CMD_RC         0x05 /* Reset Channel                    */
+#define NCSI_PKT_CMD_ECNT       0x06 /* Enable Channel Network Tx        */
+#define NCSI_PKT_CMD_DCNT       0x07 /* Disable Channel Network Tx       */
+#define NCSI_PKT_CMD_AE         0x08 /* AEN Enable                       */
+#define NCSI_PKT_CMD_SL         0x09 /* Set Link                         */
+#define NCSI_PKT_CMD_GLS        0x0a /* Get Link                         */
+#define NCSI_PKT_CMD_SVF        0x0b /* Set VLAN Filter                  */
+#define NCSI_PKT_CMD_EV         0x0c /* Enable VLAN                      */
+#define NCSI_PKT_CMD_DV         0x0d /* Disable VLAN                     */
+#define NCSI_PKT_CMD_SMA        0x0e /* Set MAC address                  */
+#define NCSI_PKT_CMD_EBF        0x10 /* Enable Broadcast Filter          */
+#define NCSI_PKT_CMD_DBF        0x11 /* Disable Broadcast Filter         */
+#define NCSI_PKT_CMD_EGMF       0x12 /* Enable Global Multicast Filter   */
+#define NCSI_PKT_CMD_DGMF       0x13 /* Disable Global Multicast Filter  */
+#define NCSI_PKT_CMD_SNFC       0x14 /* Set NCSI Flow Control            */
+#define NCSI_PKT_CMD_GVI        0x15 /* Get Version ID                   */
+#define NCSI_PKT_CMD_GC         0x16 /* Get Capabilities                 */
+#define NCSI_PKT_CMD_GP         0x17 /* Get Parameters                   */
+#define NCSI_PKT_CMD_GCPS       0x18 /* Get Controller Packet Statistics */
+#define NCSI_PKT_CMD_GNS        0x19 /* Get NCSI Statistics              */
+#define NCSI_PKT_CMD_GNPTS      0x1a /* Get NCSI Pass-throu Statistics   */
+#define NCSI_PKT_CMD_GPS        0x1b /* Get package status               */
+#define NCSI_PKT_CMD_OEM        0x50 /* OEM                              */
+#define NCSI_PKT_CMD_PLDM       0x51 /* PLDM request over NCSI over RBT  */
+#define NCSI_PKT_CMD_GPUUID     0x52 /* Get package UUID                 */
+
+/* NCSI packet responses */
+#define NCSI_PKT_RSP_CIS        (NCSI_PKT_CMD_CIS    + 0x80)
+#define NCSI_PKT_RSP_SP         (NCSI_PKT_CMD_SP     + 0x80)
+#define NCSI_PKT_RSP_DP         (NCSI_PKT_CMD_DP     + 0x80)
+#define NCSI_PKT_RSP_EC         (NCSI_PKT_CMD_EC     + 0x80)
+#define NCSI_PKT_RSP_DC         (NCSI_PKT_CMD_DC     + 0x80)
+#define NCSI_PKT_RSP_RC         (NCSI_PKT_CMD_RC     + 0x80)
+#define NCSI_PKT_RSP_ECNT       (NCSI_PKT_CMD_ECNT   + 0x80)
+#define NCSI_PKT_RSP_DCNT       (NCSI_PKT_CMD_DCNT   + 0x80)
+#define NCSI_PKT_RSP_AE         (NCSI_PKT_CMD_AE     + 0x80)
+#define NCSI_PKT_RSP_SL         (NCSI_PKT_CMD_SL     + 0x80)
+#define NCSI_PKT_RSP_GLS        (NCSI_PKT_CMD_GLS    + 0x80)
+#define NCSI_PKT_RSP_SVF        (NCSI_PKT_CMD_SVF    + 0x80)
+#define NCSI_PKT_RSP_EV         (NCSI_PKT_CMD_EV     + 0x80)
+#define NCSI_PKT_RSP_DV         (NCSI_PKT_CMD_DV     + 0x80)
+#define NCSI_PKT_RSP_SMA        (NCSI_PKT_CMD_SMA    + 0x80)
+#define NCSI_PKT_RSP_EBF        (NCSI_PKT_CMD_EBF    + 0x80)
+#define NCSI_PKT_RSP_DBF        (NCSI_PKT_CMD_DBF    + 0x80)
+#define NCSI_PKT_RSP_EGMF       (NCSI_PKT_CMD_EGMF   + 0x80)
+#define NCSI_PKT_RSP_DGMF       (NCSI_PKT_CMD_DGMF   + 0x80)
+#define NCSI_PKT_RSP_SNFC       (NCSI_PKT_CMD_SNFC   + 0x80)
+#define NCSI_PKT_RSP_GVI        (NCSI_PKT_CMD_GVI    + 0x80)
+#define NCSI_PKT_RSP_GC         (NCSI_PKT_CMD_GC     + 0x80)
+#define NCSI_PKT_RSP_GP         (NCSI_PKT_CMD_GP     + 0x80)
+#define NCSI_PKT_RSP_GCPS       (NCSI_PKT_CMD_GCPS   + 0x80)
+#define NCSI_PKT_RSP_GNS        (NCSI_PKT_CMD_GNS    + 0x80)
+#define NCSI_PKT_RSP_GNPTS      (NCSI_PKT_CMD_GNPTS  + 0x80)
+#define NCSI_PKT_RSP_GPS        (NCSI_PKT_CMD_GPS    + 0x80)
+#define NCSI_PKT_RSP_OEM        (NCSI_PKT_CMD_OEM    + 0x80)
+#define NCSI_PKT_RSP_PLDM       (NCSI_PKT_CMD_PLDM   + 0x80)
+#define NCSI_PKT_RSP_GPUUID     (NCSI_PKT_CMD_GPUUID + 0x80)
+
+/* NCSI response code/reason */
+#define NCSI_PKT_RSP_C_COMPLETED        0x0000 /* Command Completed        */
+#define NCSI_PKT_RSP_C_FAILED           0x0001 /* Command Failed           */
+#define NCSI_PKT_RSP_C_UNAVAILABLE      0x0002 /* Command Unavailable      */
+#define NCSI_PKT_RSP_C_UNSUPPORTED      0x0003 /* Command Unsupported      */
+#define NCSI_PKT_RSP_R_NO_ERROR         0x0000 /* No Error                 */
+#define NCSI_PKT_RSP_R_INTERFACE        0x0001 /* Interface not ready      */
+#define NCSI_PKT_RSP_R_PARAM            0x0002 /* Invalid Parameter        */
+#define NCSI_PKT_RSP_R_CHANNEL          0x0003 /* Channel not Ready        */
+#define NCSI_PKT_RSP_R_PACKAGE          0x0004 /* Package not Ready        */
+#define NCSI_PKT_RSP_R_LENGTH           0x0005 /* Invalid payload length   */
+#define NCSI_PKT_RSP_R_UNKNOWN          0x7fff /* Command type unsupported */
+
+/* NCSI AEN packet type */
+#define NCSI_PKT_AEN            0xFF /* AEN Packet               */
+#define NCSI_PKT_AEN_LSC        0x00 /* Link status change       */
+#define NCSI_PKT_AEN_CR         0x01 /* Configuration required   */
+#define NCSI_PKT_AEN_HNCDSC     0x02 /* HNC driver status change */
+
+#endif /* NCSI_PKT_H */
diff --git a/slirp/ncsi.c b/slirp/ncsi.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/slirp/ncsi.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * NC-SI (Network Controller Sideband Interface) "echo" model
+ *
+ * Copyright (C) 2016 IBM Corp.
+ *
+ * This code is licensed under the GPL version 2 or later. See the
+ * COPYING file in the top-level directory.
+ */
+#include "qemu/osdep.h"
+#include "slirp.h"
+
+#include "ncsi-pkt.h"
+
+/* Get Capabilities */
+static int ncsi_rsp_handler_gc(struct ncsi_rsp_pkt_hdr *rnh)
+{
+    struct ncsi_rsp_gc_pkt *rsp = (struct ncsi_rsp_gc_pkt *) rnh;
+
+    rsp->cap = htonl(~0);
+    rsp->bc_cap = htonl(~0);
+    rsp->mc_cap = htonl(~0);
+    rsp->buf_cap = htonl(~0);
+    rsp->aen_cap = htonl(~0);
+    rsp->vlan_mode = 0xff;
+    rsp->uc_cnt = 2;
+    return 0;
+}
+
+/* Get Link status */
+static int ncsi_rsp_handler_gls(struct ncsi_rsp_pkt_hdr *rnh)
+{
+    struct ncsi_rsp_gls_pkt *rsp = (struct ncsi_rsp_gls_pkt *) rnh;
+
+    rsp->status = htonl(0x1);
+    return 0;
+}
+
+static const struct ncsi_rsp_handler {
+        unsigned char   type;
+        int             payload;
+        int             (*handler)(struct ncsi_rsp_pkt_hdr *rnh);
+} ncsi_rsp_handlers[] = {
+        { NCSI_PKT_RSP_CIS,     4, NULL },
+        { NCSI_PKT_RSP_SP,      4, NULL },
+        { NCSI_PKT_RSP_DP,      4, NULL },
+        { NCSI_PKT_RSP_EC,      4, NULL },
+        { NCSI_PKT_RSP_DC,      4, NULL },
+        { NCSI_PKT_RSP_RC,      4, NULL },
+        { NCSI_PKT_RSP_ECNT,    4, NULL },
+        { NCSI_PKT_RSP_DCNT,    4, NULL },
+        { NCSI_PKT_RSP_AE,      4, NULL },
+        { NCSI_PKT_RSP_SL,      4, NULL },
+        { NCSI_PKT_RSP_GLS,    16, ncsi_rsp_handler_gls },
+        { NCSI_PKT_RSP_SVF,     4, NULL },
+        { NCSI_PKT_RSP_EV,      4, NULL },
+        { NCSI_PKT_RSP_DV,      4, NULL },
+        { NCSI_PKT_RSP_SMA,     4, NULL },
+        { NCSI_PKT_RSP_EBF,     4, NULL },
+        { NCSI_PKT_RSP_DBF,     4, NULL },
+        { NCSI_PKT_RSP_EGMF,    4, NULL },
+        { NCSI_PKT_RSP_DGMF,    4, NULL },
+        { NCSI_PKT_RSP_SNFC,    4, NULL },
+        { NCSI_PKT_RSP_GVI,    36, NULL },
+        { NCSI_PKT_RSP_GC,     32, ncsi_rsp_handler_gc },
+        { NCSI_PKT_RSP_GP,     -1, NULL },
+        { NCSI_PKT_RSP_GCPS,  172, NULL },
+        { NCSI_PKT_RSP_GNS,   172, NULL },
+        { NCSI_PKT_RSP_GNPTS, 172, NULL },
+        { NCSI_PKT_RSP_GPS,     8, NULL },
+        { NCSI_PKT_RSP_OEM,     0, NULL },
+        { NCSI_PKT_RSP_PLDM,    0, NULL },
+        { NCSI_PKT_RSP_GPUUID, 20, NULL }
+};
+
+/*
+ * packet format : ncsi header + payload + checksum
+ */
+#define NCSI_MAX_PAYLOAD 172
+#define NCSI_MAX_LEN     (sizeof(struct ncsi_pkt_hdr) + NCSI_MAX_PAYLOAD + 4)
+
+void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
+{
+    struct ncsi_pkt_hdr *nh = (struct ncsi_pkt_hdr *)(pkt + ETH_HLEN);
+    uint8_t ncsi_reply[ETH_HLEN + NCSI_MAX_LEN];
+    struct ethhdr *reh = (struct ethhdr *)ncsi_reply;
+    struct ncsi_rsp_pkt_hdr *rnh = (struct ncsi_rsp_pkt_hdr *)
+        (ncsi_reply + ETH_HLEN);
+    const struct ncsi_rsp_handler *handler = NULL;
+    int i;
+
+    memset(ncsi_reply, 0, sizeof(ncsi_reply));
+
+    memset(reh->h_dest, 0xff, ETH_ALEN);
+    memset(reh->h_source, 0xff, ETH_ALEN);
+    reh->h_proto = htons(ETH_P_NCSI);
+
+    for (i = 0; i < ARRAY_SIZE(ncsi_rsp_handlers); i++) {
+        if (ncsi_rsp_handlers[i].type == nh->type + 0x80) {
+            handler = &ncsi_rsp_handlers[i];
+            break;
+        }
+    }
+
+    rnh->common.mc_id      = nh->mc_id;
+    rnh->common.revision   = NCSI_PKT_REVISION;
+    rnh->common.id         = nh->id;
+    rnh->common.type       = nh->type + 0x80;
+    rnh->common.channel    = nh->channel;
+
+    if (handler) {
+        rnh->common.length = htons(handler->payload);
+        rnh->code          = htons(NCSI_PKT_RSP_C_COMPLETED);
+        rnh->reason        = htons(NCSI_PKT_RSP_R_NO_ERROR);
+
+        if (handler->handler) {
+            /* TODO: handle errors */
+            handler->handler(rnh);
+        }
+    } else {
+        rnh->common.length = 0;
+        rnh->code          = htons(NCSI_PKT_RSP_C_UNAVAILABLE);
+        rnh->reason        = htons(NCSI_PKT_RSP_R_UNKNOWN);
+    }
+
+    /* TODO: add a checksum at the end of the frame but the specs
+     * allows it to be zero */
+
+    slirp_output(slirp->opaque, ncsi_reply, ETH_HLEN + sizeof(*nh) +
+                 (handler ? handler->payload : 0) + 4);
+}
diff --git a/slirp/slirp.c b/slirp/slirp.c
index XXXXXXX..XXXXXXX 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -XXX,XX +XXX,XX @@ void slirp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
         }
         break;
 
+    case ETH_P_NCSI:
+        ncsi_input(slirp, pkt, pkt_len);
+        break;
+
     default:
         break;
     }
diff --git a/slirp/slirp.h b/slirp/slirp.h
index XXXXXXX..XXXXXXX 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -XXX,XX +XXX,XX @@ extern Slirp *slirp_instance;
 
 void if_start(Slirp *);
 
+/* ncsi.c */
+void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pkt_len);
+
 #ifndef _WIN32
 #include <netdb.h>
 #endif
-- 
2.7.4

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

In this patch we support packet that have tcp options field.
Add tcp options field check, If the packet have options
field we just skip it and compare tcp payload,
Avoid unnecessary checkpoint, optimize performance.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
         spkt->ip->ip_sum = ppkt->ip->ip_sum;
     }
 
-    if (ptcp->th_sum == stcp->th_sum) {
+    /*
+     * Check tcp header length for tcp option field.
+     * th_off > 5 means this tcp packet have options field.
+     * The tcp options maybe always different.
+     * for example:
+     * From RFC 7323.
+     * TCP Timestamps option (TSopt):
+     * Kind: 8
+     *
+     * Length: 10 bytes
+     *
+     *    +-------+-------+---------------------+---------------------+
+     *    |Kind=8 |  10   |   TS Value (TSval)  |TS Echo Reply (TSecr)|
+     *    +-------+-------+---------------------+---------------------+
+     *       1       1              4                     4
+     *
+     * In this case the primary guest's timestamp always different with
+     * the secondary guest's timestamp. COLO just focus on payload,
+     * so we just need skip this field.
+     */
+    if (ptcp->th_off > 5) {
+        ptrdiff_t tcp_offset;
+        tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
+                     + (ptcp->th_off * 4);
+        res = colo_packet_compare_common(ppkt, spkt, tcp_offset);
+    } else if (ptcp->th_sum == stcp->th_sum) {
         res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);
     } else {
         res = -1;
-- 
2.7.4

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

Optimize two trace events as one, adjust print format make
it easy to read. rename trace_colo_compare_pkt_info_src/dst
to trace_colo_compare_tcp_info.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 29 +++++++++++++++++------------
 net/trace-events   |  3 +--
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
         res = -1;
     }
 
-    if (res != 0 && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {
-        trace_colo_compare_pkt_info_src(inet_ntoa(ppkt->ip->ip_src),
-                                        ntohl(stcp->th_seq),
-                                        ntohl(stcp->th_ack),
-                                        res, stcp->th_flags,
-                                        spkt->size);
-
-        trace_colo_compare_pkt_info_dst(inet_ntoa(ppkt->ip->ip_dst),
-                                        ntohl(ptcp->th_seq),
-                                        ntohl(ptcp->th_ack),
-                                        res, ptcp->th_flags,
-                                        ppkt->size);
+    if (res && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {
+        char ip_src[20], ip_dst[20];
+
+        strcpy(ip_src, inet_ntoa(ppkt->ip->ip_src));
+        strcpy(ip_dst, inet_ntoa(ppkt->ip->ip_dst));
+
+        trace_colo_compare_tcp_info(ip_src,
+                                    ip_dst,
+                                    ntohl(ptcp->th_seq),
+                                    ntohl(stcp->th_seq),
+                                    ntohl(ptcp->th_ack),
+                                    ntohl(stcp->th_ack),
+                                    res,
+                                    ptcp->th_flags,
+                                    stcp->th_flags,
+                                    ppkt->size,
+                                    spkt->size);
 
         qemu_hexdump((char *)ppkt->data, stderr,
                      "colo-compare ppkt", ppkt->size);
diff --git a/net/trace-events b/net/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/net/trace-events
+++ b/net/trace-events
@@ -XXX,XX +XXX,XX @@ colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"
 colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"
 colo_old_packet_check_found(int64_t old_time) "%" PRId64
 colo_compare_miscompare(void) ""
-colo_compare_pkt_info_src(const char *src, uint32_t sseq, uint32_t sack, int res, uint32_t sflag, int ssize) "src/dst: %s s: seq/ack=%u/%u res=%d flags=%x spkt_size: %d\n"
-colo_compare_pkt_info_dst(const char *dst, uint32_t dseq, uint32_t dack, int res, uint32_t dflag, int dsize) "src/dst: %s d: seq/ack=%u/%u res=%d flags=%x dpkt_size: %d\n"
+colo_compare_tcp_info(const char *src, const char *dst, uint32_t pseq, uint32_t sseq, uint32_t pack, uint32_t sack, int res, uint32_t pflag, uint32_t sflag, int psize, int ssize) "src/dst: %s/%s pseq/sseq:%u/%u pack/sack:%u/%u res=%d pflags/sflag:%x/%x psize/ssize:%d/%d \n"
 
 # net/filter-rewriter.c
 colo_filter_rewriter_debug(void) ""
-- 
2.7.4