Commit 76fbbec9 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Net patches

# gpg: Signature made Fri 27 Jun 2014 14:10:57 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  hw/net/eepro100: Implement read-only bits in MDI registers
  net: move queue number into NICPeers
  net: L2TPv3 transport
  qemu-bridge-helper: Fix fd leak in main()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2d80e0ab 5e80dd22

hw/core/qdev-properties-system.c

+1 −2
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ PropertyInfo qdev_prop_chr = { 
static int parse_netdev(DeviceState *dev, const char *str, void **ptr)

{

    NICPeers *peers_ptr = (NICPeers *)ptr;

    NICConf *conf = container_of(peers_ptr, NICConf, peers);

    NetClientState **ncs = peers_ptr->ncs;

    NetClientState *peers[MAX_QUEUE_NUM];

    int queues, i = 0;
@@ -219,7 +218,7 @@ static int parse_netdev(DeviceState *dev, const char *str, void **ptr) 
        ncs[i]->queue_index = i;

    }



    conf->queues = queues;

    peers_ptr->queues = queues;



    return 0;

hw/net/eepro100.c

+2 −2
Original line number Diff line number Diff line
@@ -1217,7 +1217,6 @@ static void eepro100_write_mdi(EEPRO100State *s) 
                break;

            case 1:            /* Status Register */

                missing("not writable");

                data = s->mdimem[reg];

                break;

            case 2:            /* PHY Identification Register (Word 1) */

            case 3:            /* PHY Identification Register (Word 2) */
@@ -1230,7 +1229,8 @@ static void eepro100_write_mdi(EEPRO100State *s) 
            default:

                missing("not implemented");

            }

            s->mdimem[reg] = data;

            s->mdimem[reg] &= eepro100_mdi_mask[reg];

            s->mdimem[reg] |= data & ~eepro100_mdi_mask[reg];

        } else if (opcode == 2) {

            /* MDI read */

            switch (reg) {

hw/net/virtio-net.c

+1 −1
Original line number Diff line number Diff line
@@ -1542,7 +1542,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) 


    virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size);



    n->max_queues = MAX(n->nic_conf.queues, 1);

    n->max_queues = MAX(n->nic_conf.peers.queues, 1);

    n->vqs = g_malloc0(sizeof(VirtIONetQueue) * n->max_queues);

    n->vqs[0].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);

    n->curr_queues = 1;

include/net/net.h

+1 −1
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ struct MACAddr { 


typedef struct NICPeers {

    NetClientState *ncs[MAX_QUEUE_NUM];

    int32_t queues;

} NICPeers;



typedef struct NICConf {

    MACAddr macaddr;

    NICPeers peers;

    int32_t bootindex;

    int32_t queues;

} NICConf;



#define DEFINE_NIC_PROPERTIES(_state, _conf)                            \

net/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ common-obj-y = net.o queue.o checksum.o util.o hub.o 
common-obj-y += socket.o

common-obj-y += dump.o

common-obj-y += eth.o

common-obj-$(CONFIG_LINUX) += l2tpv3.o

common-obj-$(CONFIG_POSIX) += tap.o vhost-user.o

common-obj-$(CONFIG_LINUX) += tap-linux.o

common-obj-$(CONFIG_WIN32) += tap-win32.o