The following changes since commit 43ab9a5376c95c61ae898a222c4d04bdf60e239b:

hw/i386/vmport: fix missing definitions with non-log trace backends (2017-12-21 22:52:28 +0000)

for you to fetch changes up to 0065e915192cdf83c2700bb377e5323c2649476e:

qemu-doc: Update the deprecation information of -tftp, -bootp, -redir and -smb (2017-12-22 10:06:05 +0800)

Ed Swierk via Qemu-devel (2):

e1000, e1000e: Move per-packet TX offload flags out of context state

e1000: Separate TSO and non-TSO contexts, fixing UDP TX corruption

Mark Cave-Ayland (13):

net: move CRC32 calculation from compute_mcast_idx() into its own net_crc32() function

net: introduce net_crc32_le() function

pcnet: switch pcnet over to use net_crc32_le()

eepro100: switch eepro100 e100_compute_mcast_idx() over to use net_crc32()

sunhme: switch sunhme over to use net_crc32_le()

sungem: fix multicast filter CRC calculation

eepro100: use inline net_crc32() and bitshift instead of compute_mcast_idx()

opencores_eth: use inline net_crc32() and bitshift instead of compute_mcast_idx()

lan9118: use inline net_crc32() and bitshift instead of compute_mcast_idx()

ftgmac100: use inline net_crc32() and bitshift instead of compute_mcast_idx()

ne2000: use inline net_crc32() and bitshift instead of compute_mcast_idx()

rtl8139: use inline net_crc32() and bitshift instead of compute_mcast_idx()

net: remove unused compute_mcast_idx() function

Thomas Huth (3):

net: Remove the legacy "-net channel" parameter

qemu-doc: The "-net nic" option can be used with "netdev=...", too

qemu-doc: Update the deprecation information of -tftp, -bootp, -redir and -smb

hw/net/e1000.c | 92 ++++++++++++++++++++++++++++----------------------

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

hw/net/e1000e_core.c | 16 ++++-----

hw/net/e1000e_core.h | 2 ++

hw/net/e1000x_common.h | 2 --

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

hw/net/ftgmac100.c | 2 +-

hw/net/lan9118.c | 3 +-

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

hw/net/opencores_eth.c | 3 +-

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

hw/net/rtl8139.c | 2 +-

hw/net/sungem.c | 5 ++-

hw/net/sunhme.c | 25 +-------------

include/net/net.h | 5 ++-

include/net/slirp.h | 2 --

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

net/slirp.c | 34 -------------------

qemu-doc.texi | 38 +++++++++++----------

qemu-options.hx | 14 ++++----

20 files changed, 144 insertions(+), 203 deletions(-)

From: Thomas Huth <thuth@redhat.com>

Looks like we missed to document that it is also possible to specify

a netdev with "-net nic" - which is very useful if you want to

configure your on-board NIC to use a backend that has been specified

with "-netdev".

Signed-off-by: Thomas Huth <thuth@redhat.com>

qemu-options.hx | 14 ++++++++------

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

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

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -XXX,XX +XXX,XX @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,

"-netdev hubport,id=str,hubid=n\n"

" configure a hub port on QEMU VLAN 'n'\n", QEMU_ARCH_ALL)

DEF("net", HAS_ARG, QEMU_OPTION_net,

- "-net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"

- " old way to create a new NIC and connect it to VLAN 'n'\n"

- " (use the '-device devtype,netdev=str' option if possible instead)\n"

+ "-net nic[,vlan=n][,netdev=nd][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"

+ " configure or create an on-board (or machine default) NIC and\n"

+ " connect it either to VLAN 'n' or the netdev 'nd' (for pluggable\n"

+ " NICs please use '-device devtype,netdev=nd' instead)\n"

"-net dump[,vlan=n][,file=f][,len=n]\n"

" dump traffic on vlan 'n' to file 'f' (max n bytes per packet)\n"

"-net none use it alone to have zero network devices. If no -net option\n"

@@ -XXX,XX +XXX,XX @@ DEF("net", HAS_ARG, QEMU_OPTION_net,

" old way to initialize a host network interface\n"

" (use the -netdev option if possible instead)\n", QEMU_ARCH_ALL)

STEXI

-@item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]

+@item -net nic[,vlan=@var{n}][,netdev=@var{nd}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]

@findex -net

-Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}

-= 0 is the default). The NIC is an e1000 by default on the PC

+Configure or create an on-board (or machine default) Network Interface Card

+(NIC) and connect it either to VLAN @var{n} (@var{n} = 0 is the default), or

+to the netdev @var{nd}. The NIC is an e1000 by default on the PC

target. Optionally, the MAC address can be changed to @var{mac}, the

device address set to @var{addr} (PCI cards only),

and a @var{name} can be assigned for use in monitor commands.

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

This makes it much easier to compare the multicast CRC calculation endian and

bitshift against the Linux driver implementation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

hw/net/rtl8139.c | 2 +-

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

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

--- a/hw/net/rtl8139.c

+++ b/hw/net/rtl8139.c

@@ -XXX,XX +XXX,XX @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t

return size;

}

- int mcast_idx = compute_mcast_idx(buf);

+ int mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;

if (!(s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))))

{

From: Thomas Huth <thuth@redhat.com>

It has never been documented, so hardly anybody knows about this

parameter, and it is marked as deprecated since QEMU v2.6.

Time to let it go now.

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Signed-off-by: Thomas Huth <thuth@redhat.com>

include/net/slirp.h | 2 --

net/net.c | 7 -------

net/slirp.c | 34 ----------------------------------

qemu-doc.texi | 5 -----

4 files changed, 48 deletions(-)

diff --git a/include/net/slirp.h b/include/net/slirp.h

--- a/include/net/slirp.h

+++ b/include/net/slirp.h

@@ -XXX,XX +XXX,XX @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict);

int net_slirp_redir(const char *redir_str);

-int net_slirp_parse_legacy(QemuOptsList *opts_list, const char *optarg, int *ret);

-

int net_slirp_smb(const char *exported_dir);

void hmp_info_usernet(Monitor *mon, const QDict *qdict);

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

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ int net_init_clients(void)

int net_client_parse(QemuOptsList *opts_list, const char *optarg)

{

-#if defined(CONFIG_SLIRP)

- int ret;

- if (net_slirp_parse_legacy(opts_list, optarg, &ret)) {

- return ret;

- }

-#endif

-

if (!qemu_opts_parse_noisily(opts_list, optarg, true)) {

return -1;

}

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

--- a/net/slirp.c

+++ b/net/slirp.c

@@ -XXX,XX +XXX,XX @@ int net_init_slirp(const Netdev *netdev, const char *name,

-

-int net_slirp_parse_legacy(QemuOptsList *opts_list, const char *optarg, int *ret)

-{

- if (strcmp(opts_list->name, "net") != 0 ||

- strncmp(optarg, "channel,", strlen("channel,")) != 0) {

- return 0;

- }

-

- error_report("The '-net channel' option is deprecated. "

- "Please use '-netdev user,guestfwd=...' instead.");

-

- /* handle legacy -net channel,port:chr */

- optarg += strlen("channel,");

-

- if (QTAILQ_EMPTY(&slirp_stacks)) {

- struct slirp_config_str *config;

-

- config = g_malloc(sizeof(*config));

- pstrcpy(config->str, sizeof(config->str), optarg);

- config->flags = SLIRP_CFG_LEGACY;

- config->next = slirp_configs;

- slirp_configs = config;

- *ret = 0;

- } else {

- Error *err = NULL;

- *ret = slirp_guestfwd(QTAILQ_FIRST(&slirp_stacks), optarg, 1, &err);

- if (*ret < 0) {

- error_report_err(err);

- }

- }

-

- return 1;

-}

-

diff --git a/qemu-doc.texi b/qemu-doc.texi

--- a/qemu-doc.texi

+++ b/qemu-doc.texi

@@ -XXX,XX +XXX,XX @@ The ``-smb /some/dir'' argument is now a synonym for setting

the ``-netdev user,smb=/some/dir'' argument instead. The new

syntax allows different settings to be provided per NIC.

-@subsection -net channel (since 2.6.0)

-

-The ``--net channel,ARGS'' argument is now a synonym for setting

-the ``-netdev user,guestfwd=ARGS'' argument instead.

-

@subsection -net vlan (since 2.9.0)

The ``-net vlan=NN'' argument is partially replaced with the

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Now that all of the callers have been converted to compute the multicast index

inline using new net CRC functions, this function can now be dropped.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

net/net.c | 5 -----

1 file changed, 5 deletions(-)

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

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ uint32_t net_crc32_le(const uint8_t *p, int len)

return crc;

-unsigned compute_mcast_idx(const uint8_t *ep)

-{

- return net_crc32(ep, ETH_ALEN) >> 26;

-}

-

QemuOptsList qemu_netdev_opts = {

.name = "netdev",

.implied_opt_name = "type",

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

This provides a standard ethernet CRC32 little-endian implementation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Reviewed-by: Eric Blake <eblake@redhat.com>

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

include/net/net.h | 2 ++

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

2 files changed, 24 insertions(+)

diff --git a/include/net/net.h b/include/net/net.h

--- a/include/net/net.h

+++ b/include/net/net.h

@@ -XXX,XX +XXX,XX @@ NetClientState *net_hub_port_find(int hub_id);

void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);

#define POLYNOMIAL_BE 0x04c11db6

+#define POLYNOMIAL_LE 0xedb88320

uint32_t net_crc32(const uint8_t *p, int len);

+uint32_t net_crc32_le(const uint8_t *p, int len);

unsigned compute_mcast_idx(const uint8_t *ep);

#define vmstate_offset_macaddr(_state, _field) \

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 @@ uint32_t net_crc32(const uint8_t *p, int len)

return crc;

}

+uint32_t net_crc32_le(const uint8_t *p, int len)

+ uint32_t crc;

+ int carry, i, j;

+ uint8_t b;

+ crc = 0xffffffff;

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

+ b = *p++;

+ for (j = 0; j < 8; j++) {

+ carry = (crc & 0x1) ^ (b & 0x01);

+ crc >>= 1;

+ b >>= 1;

+ if (carry) {

+ crc ^= POLYNOMIAL_LE;

+ return crc;

unsigned compute_mcast_idx(const uint8_t *ep)

return net_crc32(ep, ETH_ALEN) >> 26;

From: Thomas Huth <thuth@redhat.com>

The information how to update the deprecated parameters was too scarce,

so that some people did not update to the new syntax yet. Provide some

more information to make sure that it is clear how to update from the

old syntax to the new one.

Signed-off-by: Thomas Huth <thuth@redhat.com>

qemu-doc.texi | 33 +++++++++++++++++++++------------

1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi

--- a/qemu-doc.texi

+++ b/qemu-doc.texi

@@ -XXX,XX +XXX,XX @@ combined with ``-vnc tls-creds=tls0'

@subsection -tftp (since 2.6.0)

-The ``-tftp /some/dir'' argument is now a synonym for setting

-the ``-netdev user,tftp=/some/dir' argument. The new syntax

-allows different settings to be provided per NIC.

+The ``-tftp /some/dir'' argument is replaced by

+``-netdev user,id=x,tftp=/some/dir'', either accompanied with

+``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x''

+(for embedded NICs). The new syntax allows different settings to be

+provided per NIC.

@subsection -bootp (since 2.6.0)

-The ``-bootp /some/file'' argument is now a synonym for setting

-the ``-netdev user,bootp=/some/file' argument. The new syntax

-allows different settings to be provided per NIC.

+The ``-bootp /some/file'' argument is replaced by

+``-netdev user,id=x,bootp=/some/file'', either accompanied with

+``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x''

+(for embedded NICs). The new syntax allows different settings to be

+provided per NIC.

@subsection -redir (since 2.6.0)

-The ``-redir ARGS'' argument is now a synonym for setting

-the ``-netdev user,hostfwd=ARGS'' argument instead. The new

-syntax allows different settings to be provided per NIC.

+The ``-redir [tcp|udp]:hostport:[guestaddr]:guestport'' argument is

+replaced by ``-netdev

+user,id=x,hostfwd=[tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport'',

+either accompanied with ``-device ...,netdev=x'' (for pluggable NICs) or

+``-net nic,netdev=x'' (for embedded NICs). The new syntax allows different

+settings to be provided per NIC.

@subsection -smb (since 2.6.0)

-The ``-smb /some/dir'' argument is now a synonym for setting

-the ``-netdev user,smb=/some/dir'' argument instead. The new

-syntax allows different settings to be provided per NIC.

+The ``-smb /some/dir'' argument is replaced by

+``-netdev user,id=x,smb=/some/dir'', either accompanied with

+``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x''

+(for embedded NICs). The new syntax allows different settings to be

+provided per NIC.

@subsection -net vlan (since 2.9.0)

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

This makes it much easier to compare the multicast CRC calculation endian and

bitshift against the Linux driver implementation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

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

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

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

--- a/hw/net/ne2000.c

+++ b/hw/net/ne2000.c

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

*/

#include "qemu/osdep.h"

#include "hw/pci/pci.h"

+#include "net/net.h"

+#include "net/eth.h"

#include "ne2000.h"

#include "hw/loader.h"

#include "sysemu/sysemu.h"

@@ -XXX,XX +XXX,XX @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)

/* multicast */

if (!(s->rxcr & 0x08))

return size;

- mcast_idx = compute_mcast_idx(buf);

+ mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;

if (!(s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))))

return size;

} else if (s->mem[0] == buf[0] &&

From: Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>

sum_needed and cptse flags are received from the guest within each

transmit data descriptor. They are not part of the offload context;

instead, they determine how to apply a previously received context to

the packet being transmitted:

- If cptse is set, perform both segmentation and checksum offload

using the parameters in the TSO context; otherwise just do checksum

offload. (Currently the e1000 device incorrectly stores only one

context, which will be fixed in a subsequent patch.)

- Depending on the bits set in sum_needed, possibly perform L4

checksum offload and/or IP checksum offload, using the parameters in

the appropriate context.

Move these flags out of struct e1000x_txd_props, which is otherwise

dedicated to storing values from a context descriptor, and into the

per-packet TX struct.

Signed-off-by: Ed Swierk <eswierk@skyportsystems.com>

hw/net/e1000.c | 30 ++++++++++++++++--------------

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

hw/net/e1000e_core.c | 16 ++++++++--------

hw/net/e1000e_core.h | 2 ++

hw/net/e1000x_common.h | 2 --

5 files changed, 28 insertions(+), 26 deletions(-)

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

--- a/hw/net/e1000.c

+++ b/hw/net/e1000.c

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

unsigned char data[0x10000];

uint16_t size;

unsigned char vlan_needed;

+ unsigned char sum_needed;

+ bool cptse;

e1000x_txd_props props;

uint16_t tso_frames;

} tx;

@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)

unsigned int frames = s->tx.tso_frames, css, sofar;

struct e1000_tx *tp = &s->tx;

- if (tp->props.tse && tp->props.cptse) {

+ if (tp->props.tse && tp->cptse) {

css = tp->props.ipcss;

DBGOUT(TXSUM, "frames %d size %d ipcss %d\n",

frames, tp->size, css);

@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)

}

} else /* UDP */

stw_be_p(tp->data+css+4, len);

- if (tp->props.sum_needed & E1000_TXD_POPTS_TXSM) {

+ if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {

unsigned int phsum;

// add pseudo-header length before checksum calculation

void *sp = tp->data + tp->props.tucso;

@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)

tp->tso_frames++;

}

- if (tp->props.sum_needed & E1000_TXD_POPTS_TXSM) {

+ if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {

putsum(tp->data, tp->size, tp->props.tucso,

tp->props.tucss, tp->props.tucse);

}

- if (tp->props.sum_needed & E1000_TXD_POPTS_IXSM) {

+ if (tp->sum_needed & E1000_TXD_POPTS_IXSM) {

putsum(tp->data, tp->size, tp->props.ipcso,

tp->props.ipcss, tp->props.ipcse);

}

@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)

} else if (dtype == (E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D)) {