The following changes since commit 4ffa88c99c54d2a30f79e3dbecec50b023eff1c8:

Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-11-08-1' into staging (2017-11-10 16:01:35 +0000)

for you to fetch changes up to bb160b571fe469b03228d4502c75a18045978a74:

net/socket: fix coverity issue (2017-11-13 18:05:12 +0800)

Jens Freimann (2):

net: fix check for number of parameters to -netdev socket

net/socket: fix coverity issue

Mao Zhongyi (4):

colo-compare: Insert packet into the suitable position of packet queue directly

colo-compare: compare the packet in a specified Connection

colo-compare: Fix comments

colo: Consolidate the duplicate code chunk into a routine

Mike Nawrocki (2):

Fix eepro100 simple transmission mode

Add new PCI ID for i82559a

hw/net/eepro100.c | 31 +++++++++++++-------------

include/hw/compat.h | 4 ++++

include/hw/pci/pci.h | 1 +

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

net/colo.c | 18 +++++++++-------

net/colo.h | 1 +

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

qemu-options.hx | 2 +-

8 files changed, 71 insertions(+), 53 deletions(-)

From: Jens Freimann <jfreimann@redhat.com>

This fixes coverity issue CID1005339.

Make sure that saddr is not used uninitialized if the

mcast parameter is NULL.

Cc: qemu-stable@nongnu.org

Reported-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Jens Freimann <jfreimann@redhat.com>

net/socket.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

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

--- a/net/socket.c

+++ b/net/socket.c

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

net_socket_read_poll(s, true);

/* mcast: save bound address as dst */

- if (is_connected) {

+ if (is_connected && mcast != NULL) {

s->dgram_dst = saddr;

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

"socket: fd=%d (cloned mcast=%s:%d)",

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

A package from pri_indev or sec_indev only belongs to a particular

Connection, so we only need to compare the package in the specified

Connection's primary_list and secondary_list, rather than for each

the whole Connection list to compare. This is time-consuming and

unnecessary.

Less checkpoint more efficiency.

Cc: Zhang Chen <zhangckid@gmail.com>

Cc: Li Zhijian <lizhijian@cn.fujitsu.com>

Cc: Jason Wang <jasowang@redhat.com>

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

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

1 file changed, 8 insertions(+), 5 deletions(-)

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

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

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

@@ -XXX,XX +XXX,XX @@ static int colo_insert_packet(GQueue *queue, Packet *pkt)

* Return 0 on success, if return -1 means the pkt

* is unsupported(arp and ipv6) and will be sent later

*/

-static int packet_enqueue(CompareState *s, int mode)

+static int packet_enqueue(CompareState *s, int mode, Connection **con)

ConnectionKey key;

Packet *pkt = NULL;

@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode)

"drop packet");

}

}

+ con = &conn;

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

static void compare_pri_rs_finalize(SocketReadState *pri_rs)

CompareState *s = container_of(pri_rs, CompareState, pri_rs);

+ Connection *conn = NULL;

- if (packet_enqueue(s, PRIMARY_IN)) {

+ if (packet_enqueue(s, PRIMARY_IN, &conn)) {

trace_colo_compare_main("primary: unsupported packet in");

compare_chr_send(s,

pri_rs->buf,

@@ -XXX,XX +XXX,XX @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs)

pri_rs->vnet_hdr_len);

} else {

/* compare connection */

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

+ colo_compare_connection(conn, s);

static void compare_sec_rs_finalize(SocketReadState *sec_rs)

CompareState *s = container_of(sec_rs, CompareState, sec_rs);

+ Connection *conn = NULL;

- if (packet_enqueue(s, SECONDARY_IN)) {

+ if (packet_enqueue(s, SECONDARY_IN, &conn)) {

trace_colo_compare_main("secondary: unsupported packet in");

} else {

/* compare connection */

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

+ colo_compare_connection(conn, s);

}

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

Currently, a packet from pri_dev or sec_dev is fristly pushed at the

tail of the primary or secondary packet queue then sorted by the tcp

sequence number.

Now, this patch use g_queue_insert_sorted to insert the packet directly

into the suitable position to avoid ordering all packets each time when

a new packet is comming, thereby increasing efficiency.

In addition, consolidate the code that add a packet to the list of

Connection (primary or secondary) into a separate routine colo_insert_packet()

since the same chunk of code is called from two place.

Cc: Zhang Chen <zhangckid@gmail.com>

Cc: Li Zhijian <lizhijian@cn.fujitsu.com>

Cc: Jason Wang <jasowang@redhat.com>

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

Signed-off-by: Zhang Chen <zhangckid@gmail.com>

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

1 file changed, 22 insertions(+), 18 deletions(-)

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

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

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

@@ -XXX,XX +XXX,XX @@ static gint seq_sorter(Packet *a, Packet *b, gpointer data)

}

/*

+ * Return 1 on success, if return 0 means the

+ * packet will be dropped

+ */

+static int colo_insert_packet(GQueue *queue, Packet *pkt)

+{

+ if (g_queue_get_length(queue) <= MAX_QUEUE_SIZE) {

+ if (pkt->ip->ip_p == IPPROTO_TCP) {

+ g_queue_insert_sorted(queue,

+ pkt,

+ (GCompareDataFunc)seq_sorter,

+ NULL);

+ } else {

+ g_queue_push_tail(queue, pkt);

+ }

+ return 1;

+ }

+ return 0;

+}

+

+/*

* Return 0 on success, if return -1 means the pkt

* is unsupported(arp and ipv6) and will be sent later

*/

@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode)

From: Mike Nawrocki <michael.nawrocki@gtri.gatech.edu>

Adds a new PCI ID for the i82559a (0x8086 0x1030) interface. The

"x-use-alt-device-id" property controls whether this new ID is to be

used, and is true by default, and set to false in a compat entry.

Signed-off-by: Mike Nawrocki <michael.nawrocki@gtri.gatech.edu>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

hw/net/eepro100.c | 13 +++++++++++++

include/hw/compat.h | 4 ++++

include/hw/pci/pci.h | 1 +

qemu-options.hx | 2 +-

4 files changed, 19 insertions(+), 1 deletion(-)

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

--- a/hw/net/eepro100.c

+++ b/hw/net/eepro100.c

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

const char *name;

const char *desc;

uint16_t device_id;

+ uint16_t alt_device_id;

uint8_t revision;

uint16_t subsystem_vendor_id;

uint16_t subsystem_id;

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

/* Quasi static device properties (no need to save them). */

uint16_t stats_size;

bool has_extended_tcb_support;

+ bool use_alt_device_id;

} EEPRO100State;

/* Word indices in EEPROM. */

@@ -XXX,XX +XXX,XX @@ static void e100_nic_realize(PCIDevice *pci_dev, Error **errp)

TRACE(OTHER, logout("\n"));

+ /* By default, the i82559a adapter uses the legacy PCI ID (for the

+ * i82557). This allows the PCI ID to be changed to the alternate

+ * i82559 ID if needed.

+ */

+ if (s->use_alt_device_id && strcmp(info->name, "i82559a") == 0) {

+ pci_config_set_device_id(s->dev.config, info->alt_device_id);

+ }

+

s->device = info->device;

e100_pci_reset(s, &local_err);

@@ -XXX,XX +XXX,XX @@ static E100PCIDeviceInfo e100_devices[] = {

.desc = "Intel i82559A Ethernet",

.device = i82559A,

.device_id = PCI_DEVICE_ID_INTEL_82557,

+ .alt_device_id = PCI_DEVICE_ID_INTEL_82559,

.revision = 0x06,

.stats_size = 80,

.has_extended_tcb_support = true,

@@ -XXX,XX +XXX,XX @@ static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s)

static Property e100_properties[] = {

DEFINE_NIC_PROPERTIES(EEPRO100State, conf),

+ DEFINE_PROP_BOOL("x-use-alt-device-id", EEPRO100State, use_alt_device_id,

+ true),

DEFINE_PROP_END_OF_LIST(),

};

diff --git a/include/hw/compat.h b/include/hw/compat.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/compat.h

+++ b/include/hw/compat.h

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

.driver = "virtio-tablet-device",\

.property = "wheel-axis",\

.value = "false",\

+ },{\

+ .driver = "i82559a",\

+ .property = "x-use-alt-device-id",\

+ .value = "false",\

},

#define HW_COMPAT_2_9 \

diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/pci/pci.h

+++ b/include/hw/pci/pci.h

@@ -XXX,XX +XXX,XX @@ extern bool pci_available;

/* Intel (0x8086) */

#define PCI_DEVICE_ID_INTEL_82551IT 0x1209

#define PCI_DEVICE_ID_INTEL_82557 0x1229

+#define PCI_DEVICE_ID_INTEL_82559 0x1030

#define PCI_DEVICE_ID_INTEL_82801IR 0x2922

/* Red Hat / Qumranet (for QEMU) -- see pci-ids.txt */

diff --git a/qemu-options.hx b/qemu-options.hx

index XXXXXXX..XXXXXXX 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -XXX,XX +XXX,XX @@ that the card should have; this option currently only affects virtio cards; set

@var{v} = 0 to disable MSI-X. If no @option{-net} option is specified, a single

NIC is created. QEMU can emulate several different models of network card.

Valid values for @var{type} are

-@code{virtio}, @code{i82551}, @code{i82557b}, @code{i82559er},

+@code{virtio}, @code{i82551}, @code{i82557b}, @code{i82559a}, @code{i82559er},

@code{ne2k_pci}, @code{ne2k_isa}, @code{pcnet}, @code{rtl8139},

@code{e1000}, @code{smc91c111}, @code{lance} and @code{mcf_fec}.

Not all devices are supported on all targets. Use @code{-net nic,model=help}

From: Mike Nawrocki <michael.nawrocki@gtri.gatech.edu>

The simple transmission mode was treating the area immediately after the

transmit command block (TCB) as if it were a transmit buffer descriptor,

when in reality it is simply the packet data. This change simply copies

the data following the TCB into the packet buffer.

Signed-off-by: Mike Nawrocki <michael.nawrocki@gtri.gatech.edu>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

hw/net/eepro100.c | 18 +++---------------

1 file changed, 3 insertions(+), 15 deletions(-)

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

--- a/hw/net/eepro100.c

+++ b/hw/net/eepro100.c

@@ -XXX,XX +XXX,XX @@ static void tx_command(EEPRO100State *s)

}

assert(tcb_bytes <= sizeof(buf));

while (size < tcb_bytes) {

- uint32_t tx_buffer_address = ldl_le_pci_dma(&s->dev, tbd_address);

- uint16_t tx_buffer_size = lduw_le_pci_dma(&s->dev, tbd_address + 4);

-#if 0

- uint16_t tx_buffer_el = lduw_le_pci_dma(&s->dev, tbd_address + 6);

-#endif

- if (tx_buffer_size == 0) {

- /* Prevent an endless loop. */

- logout("loop in %s:%u\n", __FILE__, __LINE__);

- break;

- }

- tbd_address += 8;

TRACE(RXTX, logout

("TBD (simplified mode): buffer address 0x%08x, size 0x%04x\n",

- tx_buffer_address, tx_buffer_size));

- tx_buffer_size = MIN(tx_buffer_size, sizeof(buf) - size);

- pci_dma_read(&s->dev, tx_buffer_address, &buf[size], tx_buffer_size);

- size += tx_buffer_size;

+ tbd_address, tcb_bytes));

+ pci_dma_read(&s->dev, tbd_address, &buf[size], tcb_bytes);

+ size += tcb_bytes;

}

if (tbd_array == 0xffffffff) {

/* Simplified mode. Was already handled by code above. */