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

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



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

* remotes/jasowang/tags/net-pull-request:
  net: check packet payload length
  filter-buffer: Add status_changed callback processing
  filter: Add 'status' property for filter object
  rocker: allow user to specify rocker world by property
  rocker: add name field into WorldOps ale let world specify its name
  rocker: return -ENOMEM in case of some world alloc fails
  rocker: forbid to change world type
  net: netmap: probe netmap interface for virtio-net header
  net: simplify net_init_tap_one logic
  MAINTAINERS: Add entries for include/net/ files
  net: filter: correctly remove filter from the list during finalization
  net: ne2000: check ring buffer control registers

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 97556fe8 362786f1

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1123,6 +1123,7 @@ Network device backends 
M: Jason Wang <jasowang@redhat.com>

S: Maintained

F: net/

F: include/net/

T: git git://github.com/jasowang/qemu.git net



Netmap network backend
@@ -1222,6 +1223,7 @@ M: Jan Kiszka <jan.kiszka@siemens.com> 
S: Maintained

F: slirp/

F: net/slirp.c

F: include/net/slirp.h

T: git git://git.kiszka.org/qemu.git queues/slirp



Tracing

hw/net/ne2000.c

+4 −0
Original line number Diff line number Diff line
@@ -155,6 +155,10 @@ static int ne2000_buffer_full(NE2000State *s) 
{

    int avail, index, boundary;



    if (s->stop <= s->start) {

        return 1;

    }



    index = s->curpag << 8;

    boundary = s->boundary << 8;

    if (index < boundary)

hw/net/rocker/rocker.c

+36 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct rocker { 


    /* switch configuration */

    char *name;                  /* switch name */

    char *world_name;            /* world name */

    uint32_t fp_ports;           /* front-panel port count */

    NICPeers *fp_ports_peers;

    MACAddr fp_start_macaddr;    /* front-panel port 0 mac addr */
@@ -400,7 +401,13 @@ static int cmd_set_port_settings(Rocker *r, 


    if (tlvs[ROCKER_TLV_CMD_PORT_SETTINGS_MODE]) {

        mode = rocker_tlv_get_u8(tlvs[ROCKER_TLV_CMD_PORT_SETTINGS_MODE]);

        fp_port_set_world(fp_port, r->worlds[mode]);

        if (mode >= ROCKER_WORLD_TYPE_MAX) {

            return -ROCKER_EINVAL;

        }

        /* We don't support world change. */

        if (!fp_port_check_world(fp_port, r->worlds[mode])) {

            return -ROCKER_EINVAL;

        }

    }



    if (tlvs[ROCKER_TLV_CMD_PORT_SETTINGS_LEARNING]) {
@@ -1280,6 +1287,18 @@ static void rocker_msix_uninit(Rocker *r) 
    rocker_msix_vectors_unuse(r, ROCKER_MSIX_VEC_COUNT(r->fp_ports));

}



static World *rocker_world_type_by_name(Rocker *r, const char *name)

{

    int i;



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

        if (strcmp(name, world_name(r->worlds[i])) == 0) {

            return r->worlds[i];

	}

    }

    return NULL;

}



static int pci_rocker_init(PCIDevice *dev)

{

    Rocker *r = to_rocker(dev);
@@ -1291,14 +1310,27 @@ static int pci_rocker_init(PCIDevice *dev) 
    /* allocate worlds */



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

    r->world_dflt = r->worlds[ROCKER_WORLD_TYPE_OF_DPA];



    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]));

    }



    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",

                r->world_name);

        err = -EINVAL;

        goto err_world_type_by_name;

    }



    /* set up memory-mapped region at BAR0 */



    memory_region_init_io(&r->mmio, OBJECT(r), &rocker_mmio_ops, r,
@@ -1432,6 +1464,7 @@ err_duplicate: 
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]) {
@@ -1503,6 +1536,7 @@ static void rocker_reset(DeviceState *dev) 


static Property rocker_properties[] = {

    DEFINE_PROP_STRING("name", Rocker, name),

    DEFINE_PROP_STRING("world", Rocker, world_name),

    DEFINE_PROP_MACADDR("fp_start_macaddr", Rocker,

                        fp_start_macaddr),

    DEFINE_PROP_UINT64("switch_id", Rocker,

hw/net/rocker/rocker_fp.c

+5 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ void fp_port_set_world(FpPort *port, World *world) 
    port->world = world;

}



bool fp_port_check_world(FpPort *port, World *world)

{

    return port->world == world;

}



bool fp_port_enabled(FpPort *port)

{

    return port->enabled;

hw/net/rocker/rocker_fp.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ int fp_port_set_settings(FpPort *port, uint32_t speed, 
bool fp_port_from_pport(uint32_t pport, uint32_t *port);

World *fp_port_get_world(FpPort *port);

void fp_port_set_world(FpPort *port, World *world);

bool fp_port_check_world(FpPort *port, World *world);

bool fp_port_enabled(FpPort *port);

void fp_port_enable(FpPort *port);

void fp_port_disable(FpPort *port);