[Qemu-devel] [PULL 0/4] Net patches

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit 64ea8038ffbf703dcd438a108d2d5499c8ff95d9:

  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150109.0' into staging (2015-01-10 22:29:09 +0000)

are available in the git repository at:

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

for you to fetch changes up to a39d97c7becca5fd679d70d17ae5b1d62b9b5da6:

  hw/net/xen_nic.c: Set 'netdev->mac' to NULL after free it (2015-01-12 10:16:23 +0000)

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

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

Chen Gang (3):
  hw/net/xen_nic.c: Free 'netdev->txs' when map 'netdev->rxs' fails
  hw/net/xen_nic.c: Need free 'netdev->nic' in net_free() instead of
    net_disconnect()
  hw/net/xen_nic.c: Set 'netdev->mac' to NULL after free it

Paolo Bonzini (1):
  net: remove all cleanup methods from NIC NetClientInfos

 hw/net/allwinner_emac.c     |  8 --------
 hw/net/cadence_gem.c        |  9 ---------
 hw/net/dp8393x.c            | 11 -----------
 hw/net/e1000.c              |  9 ---------
 hw/net/eepro100.c           |  8 --------
 hw/net/etraxfs_eth.c        | 13 -------------
 hw/net/fsl_etsec/etsec.c    |  6 ------
 hw/net/lan9118.c            |  8 --------
 hw/net/lance.c              |  8 --------
 hw/net/mcf_fec.c            |  8 --------
 hw/net/milkymist-minimac2.c |  8 --------
 hw/net/mipsnet.c            |  8 --------
 hw/net/ne2000-isa.c         |  8 --------
 hw/net/ne2000.c             |  8 --------
 hw/net/opencores_eth.c      |  5 -----
 hw/net/pcnet-pci.c          |  8 --------
 hw/net/pcnet.c              |  5 -----
 hw/net/pcnet.h              |  1 -
 hw/net/rtl8139.c            |  8 --------
 hw/net/smc91c111.c          |  8 --------
 hw/net/spapr_llan.c         |  8 --------
 hw/net/stellaris_enet.c     |  8 --------
 hw/net/virtio-net.c         |  8 --------
 hw/net/vmxnet3.c            |  7 -------
 hw/net/xen_nic.c            | 16 +++++++++++-----
 hw/net/xgmac.c              |  8 --------
 hw/net/xilinx_axienet.c     |  9 ---------
 hw/net/xilinx_ethlite.c     |  8 --------
 28 files changed, 11 insertions(+), 216 deletions(-)

-- 
2.1.0

[Qemu-devel] [PULL 1/4] net: remove all cleanup methods from NIC NetClientInfos

[Stefan Hajnoczi]

From: Paolo Bonzini <pbonzini@redhat.com>

All NICs have a cleanup function that, in most cases, zeroes the pointer
to the NICState.  In some cases, it frees data belonging to the NIC.

However, this function is never called except when exiting from QEMU.
It is not necessary to NULL pointers and free data here; the right place
to do that would be in the device's unrealize function, after calling
qemu_del_nic.  Zeroing the NIC multiple times is also wrong for multiqueue
devices.

This cleanup function gets in the way of making the NetClientStates for
the NIC hold an object_ref reference to the object, so get rid of it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/allwinner_emac.c     |  8 --------
 hw/net/cadence_gem.c        |  9 ---------
 hw/net/dp8393x.c            | 11 -----------
 hw/net/e1000.c              |  9 ---------
 hw/net/eepro100.c           |  8 --------
 hw/net/etraxfs_eth.c        | 13 -------------
 hw/net/fsl_etsec/etsec.c    |  6 ------
 hw/net/lan9118.c            |  8 --------
 hw/net/lance.c              |  8 --------
 hw/net/mcf_fec.c            |  8 --------
 hw/net/milkymist-minimac2.c |  8 --------
 hw/net/mipsnet.c            |  8 --------
 hw/net/ne2000-isa.c         |  8 --------
 hw/net/ne2000.c             |  8 --------
 hw/net/opencores_eth.c      |  5 -----
 hw/net/pcnet-pci.c          |  8 --------
 hw/net/pcnet.c              |  5 -----
 hw/net/pcnet.h              |  1 -
 hw/net/rtl8139.c            |  8 --------
 hw/net/smc91c111.c          |  8 --------
 hw/net/spapr_llan.c         |  8 --------
 hw/net/stellaris_enet.c     |  8 --------
 hw/net/virtio-net.c         |  8 --------
 hw/net/vmxnet3.c            |  7 -------
 hw/net/xgmac.c              |  8 --------
 hw/net/xilinx_axienet.c     |  9 ---------
 hw/net/xilinx_ethlite.c     |  8 --------
 27 files changed, 211 deletions(-)

diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
index d780ba0..0407dee 100644
--- a/hw/net/allwinner_emac.c
+++ b/hw/net/allwinner_emac.c
@@ -218,13 +218,6 @@ static ssize_t aw_emac_receive(NetClientState *nc, const uint8_t *buf,
     return size;
 }
 
-static void aw_emac_cleanup(NetClientState *nc)
-{
-    AwEmacState *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static void aw_emac_reset(DeviceState *dev)
 {
     AwEmacState *s = AW_EMAC(dev);
@@ -433,7 +426,6 @@ static NetClientInfo net_aw_emac_info = {
     .size = sizeof(NICState),
     .can_receive = aw_emac_can_receive,
     .receive = aw_emac_receive,
-    .cleanup = aw_emac_cleanup,
     .link_status_changed = aw_emac_set_link,
 };
 
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index de26609..55b6293 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -1209,14 +1209,6 @@ static const MemoryRegionOps gem_ops = {
     .endianness = DEVICE_LITTLE_ENDIAN,
 };
 
-static void gem_cleanup(NetClientState *nc)
-{
-    GemState *s = qemu_get_nic_opaque(nc);
-
-    DB_PRINT("\n");
-    s->nic = NULL;
-}
-
 static void gem_set_link(NetClientState *nc)
 {
     DB_PRINT("\n");
@@ -1228,7 +1220,6 @@ static NetClientInfo net_gem_info = {
     .size = sizeof(NICState),
     .can_receive = gem_can_receive,
     .receive = gem_receive,
-    .cleanup = gem_cleanup,
     .link_status_changed = gem_set_link,
 };
 
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 7eab7ad..7ce13d2 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -859,22 +859,11 @@ static void nic_reset(void *opaque)
     dp8393x_update_irq(s);
 }
 
-static void nic_cleanup(NetClientState *nc)
-{
-    dp8393xState *s = qemu_get_nic_opaque(nc);
-
-    timer_del(s->watchdog);
-    timer_free(s->watchdog);
-
-    g_free(s);
-}
-
 static NetClientInfo net_dp83932_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = nic_can_receive,
     .receive = nic_receive,
-    .cleanup = nic_cleanup,
 };
 
 void dp83932_init(NICInfo *nd, hwaddr base, int it_shift,
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 89c5788..a207e21 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1503,14 +1503,6 @@ e1000_mmio_setup(E1000State *d)
 }
 
 static void
-e1000_cleanup(NetClientState *nc)
-{
-    E1000State *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
-static void
 pci_e1000_uninit(PCIDevice *dev)
 {
     E1000State *d = E1000(dev);
@@ -1528,7 +1520,6 @@ static NetClientInfo net_e1000_info = {
     .can_receive = e1000_can_receive,
     .receive = e1000_receive,
     .receive_iov = e1000_receive_iov,
-    .cleanup = e1000_cleanup,
     .link_status_changed = e1000_set_link_status,
 };
 
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 4877bfd..7a4f9f8 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -1832,13 +1832,6 @@ static const VMStateDescription vmstate_eepro100 = {
     }
 };
 
-static void nic_cleanup(NetClientState *nc)
-{
-    EEPRO100State *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static void pci_nic_uninit(PCIDevice *pci_dev)
 {
     EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev);
@@ -1853,7 +1846,6 @@ static NetClientInfo net_eepro100_info = {
     .size = sizeof(NICState),
     .can_receive = nic_can_receive,
     .receive = nic_receive,
-    .cleanup = nic_cleanup,
 };
 
 static int e100_nic_init(PCIDevice *pci_dev)
diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c
index 6a3c86d..4773dea 100644
--- a/hw/net/etraxfs_eth.c
+++ b/hw/net/etraxfs_eth.c
@@ -581,24 +581,11 @@ static const MemoryRegionOps eth_ops = {
     }
 };
 
-static void eth_cleanup(NetClientState *nc)
-{
-    ETRAXFSEthState *eth = qemu_get_nic_opaque(nc);
-
-    /* Disconnect the client.  */
-    eth->dma_out->client.push = NULL;
-    eth->dma_out->client.opaque = NULL;
-    eth->dma_in->client.opaque = NULL;
-    eth->dma_in->client.pull = NULL;
-        g_free(eth);
-}
-
 static NetClientInfo net_etraxfs_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = eth_can_receive,
     .receive = eth_receive,
-    .cleanup = eth_cleanup,
     .link_status_changed = eth_set_link,
 };
 
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index d4b4429..2fbbc6c 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -338,11 +338,6 @@ static void etsec_reset(DeviceState *d)
         MII_SR_100X_FD_CAPS     | MII_SR_100T4_CAPS;
 }
 
-static void etsec_cleanup(NetClientState *nc)
-{
-    /* qemu_log("eTSEC cleanup\n"); */
-}
-
 static int etsec_can_receive(NetClientState *nc)
 {
     eTSEC *etsec = qemu_get_nic_opaque(nc);
@@ -377,7 +372,6 @@ static NetClientInfo net_etsec_info = {
     .size = sizeof(NICState),
     .can_receive = etsec_can_receive,
     .receive = etsec_receive,
-    .cleanup = etsec_cleanup,
     .link_status_changed = etsec_set_link_status,
 };
 
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index e528290..f169c38 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -1309,19 +1309,11 @@ static const MemoryRegionOps lan9118_16bit_mem_ops = {
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-static void lan9118_cleanup(NetClientState *nc)
-{
-    lan9118_state *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static NetClientInfo net_lan9118_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = lan9118_can_receive,
     .receive = lan9118_receive,
-    .cleanup = lan9118_cleanup,
     .link_status_changed = lan9118_set_link,
 };
 
diff --git a/hw/net/lance.c b/hw/net/lance.c
index a1c49f1..ff7e789 100644
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -91,20 +91,12 @@ static const MemoryRegionOps lance_mem_ops = {
     },
 };
 
-static void lance_cleanup(NetClientState *nc)
-{
-    PCNetState *d = qemu_get_nic_opaque(nc);
-
-    pcnet_common_cleanup(d);
-}
-
 static NetClientInfo net_lance_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = pcnet_can_receive,
     .receive = pcnet_receive,
     .link_status_changed = pcnet_set_link_status,
-    .cleanup = lance_cleanup,
 };
 
 static const VMStateDescription vmstate_lance = {
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 22cd7cf..0255612 100644
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -439,19 +439,11 @@ static const MemoryRegionOps mcf_fec_ops = {
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-static void mcf_fec_cleanup(NetClientState *nc)
-{
-    mcf_fec_state *s = qemu_get_nic_opaque(nc);
-
-    g_free(s);
-}
-
 static NetClientInfo net_mcf_fec_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = mcf_fec_can_receive,
     .receive = mcf_fec_receive,
-    .cleanup = mcf_fec_cleanup,
 };
 
 void mcf_fec_init(MemoryRegion *sysmem, NICInfo *nd,
diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
index c632672..f06afaa 100644
--- a/hw/net/milkymist-minimac2.c
+++ b/hw/net/milkymist-minimac2.c
@@ -425,13 +425,6 @@ static int minimac2_can_rx(NetClientState *nc)
     return 0;
 }
 
-static void minimac2_cleanup(NetClientState *nc)
-{
-    MilkymistMinimac2State *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static void milkymist_minimac2_reset(DeviceState *d)
 {
     MilkymistMinimac2State *s = MILKYMIST_MINIMAC2(d);
@@ -454,7 +447,6 @@ static NetClientInfo net_milkymist_minimac2_info = {
     .size = sizeof(NICState),
     .can_receive = minimac2_can_rx,
     .receive = minimac2_rx,
-    .cleanup = minimac2_cleanup,
 };
 
 static int milkymist_minimac2_init(SysBusDevice *sbd)
diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c
index b26c369..c813e0c 100644
--- a/hw/net/mipsnet.c
+++ b/hw/net/mipsnet.c
@@ -211,19 +211,11 @@ static const VMStateDescription vmstate_mipsnet = {
     }
 };
 
-static void mipsnet_cleanup(NetClientState *nc)
-{
-    MIPSnetState *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static NetClientInfo net_mipsnet_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = mipsnet_can_receive,
     .receive = mipsnet_receive,
-    .cleanup = mipsnet_cleanup,
 };
 
 static const MemoryRegionOps mipsnet_ioport_ops = {
diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index 82e2ba1..17e7199 100644
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -41,19 +41,11 @@ typedef struct ISANE2000State {
     NE2000State ne2000;
 } ISANE2000State;
 
-static void isa_ne2000_cleanup(NetClientState *nc)
-{
-    NE2000State *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static NetClientInfo net_ne2000_isa_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = ne2000_can_receive,
     .receive = ne2000_receive,
-    .cleanup = isa_ne2000_cleanup,
 };
 
 static const VMStateDescription vmstate_isa_ne2000 = {
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index 3ab2d03..4dea701 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -702,19 +702,11 @@ void ne2000_setup_io(NE2000State *s, DeviceState *dev, unsigned size)
     memory_region_init_io(&s->io, OBJECT(dev), &ne2000_ops, s, "ne2000", size);
 }
 
-static void ne2000_cleanup(NetClientState *nc)
-{
-    NE2000State *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static NetClientInfo net_ne2000_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = ne2000_can_receive,
     .receive = ne2000_receive,
-    .cleanup = ne2000_cleanup,
 };
 
 static int pci_ne2000_init(PCIDevice *pci_dev)
diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index 4a44304..3642046 100644
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -472,16 +472,11 @@ static ssize_t open_eth_receive(NetClientState *nc,
     return size;
 }
 
-static void open_eth_cleanup(NetClientState *nc)
-{
-}
-
 static NetClientInfo net_open_eth_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = open_eth_can_receive,
     .receive = open_eth_receive,
-    .cleanup = open_eth_cleanup,
     .link_status_changed = open_eth_set_link_status,
 };
 
diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index fb5f5d6..b86bc0d 100644
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -271,13 +271,6 @@ static void pci_physical_memory_read(void *dma_opaque, hwaddr addr,
     pci_dma_read(dma_opaque, addr, buf, len);
 }
 
-static void pci_pcnet_cleanup(NetClientState *nc)
-{
-    PCNetState *d = qemu_get_nic_opaque(nc);
-
-    pcnet_common_cleanup(d);
-}
-
 static void pci_pcnet_uninit(PCIDevice *dev)
 {
     PCIPCNetState *d = PCI_PCNET(dev);
@@ -294,7 +287,6 @@ static NetClientInfo net_pci_pcnet_info = {
     .can_receive = pcnet_can_receive,
     .receive = pcnet_receive,
     .link_status_changed = pcnet_set_link_status,
-    .cleanup = pci_pcnet_cleanup,
 };
 
 static int pci_pcnet_init(PCIDevice *pci_dev)
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index f409b92..8a1c8f1 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -1724,11 +1724,6 @@ const VMStateDescription vmstate_pcnet = {
     }
 };
 
-void pcnet_common_cleanup(PCNetState *d)
-{
-    d->nic = NULL;
-}
-
 int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info)
 {
     int i;
diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index f8e8a6f..3f12fe3 100644
--- a/hw/net/pcnet.h
+++ b/hw/net/pcnet.h
@@ -63,7 +63,6 @@ uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap);
 int pcnet_can_receive(NetClientState *nc);
 ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_);
 void pcnet_set_link_status(NetClientState *nc);
-void pcnet_common_cleanup(PCNetState *d);
 int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info);
 extern const VMStateDescription vmstate_pcnet;
 #endif
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 5f0197c..6fa9e0a 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -3455,13 +3455,6 @@ static void rtl8139_timer(void *opaque)
     rtl8139_set_next_tctr_time(s, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL));
 }
 
-static void rtl8139_cleanup(NetClientState *nc)
-{
-    RTL8139State *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static void pci_rtl8139_uninit(PCIDevice *dev)
 {
     RTL8139State *s = RTL8139(dev);
@@ -3494,7 +3487,6 @@ static NetClientInfo net_rtl8139_info = {
     .size = sizeof(NICState),
     .can_receive = rtl8139_can_receive,
     .receive = rtl8139_receive,
-    .cleanup = rtl8139_cleanup,
     .link_status_changed = rtl8139_set_link_status,
 };
 
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index d1dca8f..74e06e6 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -736,19 +736,11 @@ static const MemoryRegionOps smc91c111_mem_ops = {
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-static void smc91c111_cleanup(NetClientState *nc)
-{
-    smc91c111_state *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static NetClientInfo net_smc91c111_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = smc91c111_can_receive,
     .receive = smc91c111_receive,
-    .cleanup = smc91c111_cleanup,
 };
 
 static int smc91c111_init1(SysBusDevice *sbd)
diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index 2c8b038..c255d92 100644
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -187,19 +187,11 @@ static ssize_t spapr_vlan_receive(NetClientState *nc, const uint8_t *buf,
     return size;
 }
 
-static void spapr_vlan_cleanup(NetClientState *nc)
-{
-    VIOsPAPRVLANDevice *dev = qemu_get_nic_opaque(nc);
-
-    dev->nic = NULL;
-}
-
 static NetClientInfo net_spapr_vlan_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = spapr_vlan_can_receive,
     .receive = spapr_vlan_receive,
-    .cleanup = spapr_vlan_cleanup,
 };
 
 static void spapr_vlan_reset(VIOsPAPRDevice *sdev)
diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index c07e513..278a654 100644
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -451,19 +451,11 @@ static void stellaris_enet_reset(stellaris_enet_state *s)
     s->tx_fifo_len = 0;
 }
 
-static void stellaris_enet_cleanup(NetClientState *nc)
-{
-    stellaris_enet_state *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static NetClientInfo net_stellaris_enet_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = stellaris_enet_can_receive,
     .receive = stellaris_enet_receive,
-    .cleanup = stellaris_enet_cleanup,
 };
 
 static int stellaris_enet_init(SysBusDevice *sbd)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index e574bd4..45da34a 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1522,19 +1522,11 @@ static int virtio_net_load_device(VirtIODevice *vdev, QEMUFile *f,
     return 0;
 }
 
-static void virtio_net_cleanup(NetClientState *nc)
-{
-    VirtIONet *n = qemu_get_nic_opaque(nc);
-
-    n->nic = NULL;
-}
-
 static NetClientInfo net_virtio_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = virtio_net_can_receive,
     .receive = virtio_net_receive,
-    .cleanup = virtio_net_cleanup,
     .link_status_changed = virtio_net_set_link_status,
     .query_rx_filter = virtio_net_query_rxfilter,
 };
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 8eea589..a83d2a1 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -1912,12 +1912,6 @@ vmxnet3_receive(NetClientState *nc, const uint8_t *buf, size_t size)
     return bytes_indicated;
 }
 
-static void vmxnet3_cleanup(NetClientState *nc)
-{
-    VMXNET3State *s = qemu_get_nic_opaque(nc);
-    s->nic = NULL;
-}
-
 static void vmxnet3_set_link_status(NetClientState *nc)
 {
     VMXNET3State *s = qemu_get_nic_opaque(nc);
@@ -1937,7 +1931,6 @@ static NetClientInfo net_vmxnet3_info = {
         .size = sizeof(NICState),
         .can_receive = vmxnet3_can_receive,
         .receive = vmxnet3_receive,
-        .cleanup = vmxnet3_cleanup,
         .link_status_changed = vmxnet3_set_link_status,
 };
 
diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index aeffcb5..b068f3a 100644
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -368,19 +368,11 @@ out:
     return ret;
 }
 
-static void eth_cleanup(NetClientState *nc)
-{
-    XgmacState *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static NetClientInfo net_xgmac_enet_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = eth_can_rx,
     .receive = eth_rx,
-    .cleanup = eth_cleanup,
 };
 
 static int xgmac_enet_init(SysBusDevice *sbd)
diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index cd952d2..21efedf 100644
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -857,14 +857,6 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size)
     return size;
 }
 
-static void eth_cleanup(NetClientState *nc)
-{
-    /* FIXME.  */
-    XilinxAXIEnet *s = qemu_get_nic_opaque(nc);
-    g_free(s->rxmem);
-    g_free(s);
-}
-
 static size_t
 xilinx_axienet_control_stream_push(StreamSlave *obj, uint8_t *buf, size_t len)
 {
@@ -936,7 +928,6 @@ static NetClientInfo net_xilinx_enet_info = {
     .size = sizeof(NICState),
     .can_receive = eth_can_rx,
     .receive = eth_rx,
-    .cleanup = eth_cleanup,
 };
 
 static void xilinx_enet_realize(DeviceState *dev, Error **errp)
diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 1b177b3..9536f64 100644
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -212,19 +212,11 @@ static void xilinx_ethlite_reset(DeviceState *dev)
     s->rxbuf = 0;
 }
 
-static void eth_cleanup(NetClientState *nc)
-{
-    struct xlx_ethlite *s = qemu_get_nic_opaque(nc);
-
-    s->nic = NULL;
-}
-
 static NetClientInfo net_xilinx_ethlite_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = eth_can_rx,
     .receive = eth_rx,
-    .cleanup = eth_cleanup,
 };
 
 static void xilinx_ethlite_realize(DeviceState *dev, Error **errp)
-- 
2.1.0

[Qemu-devel] [PULL 2/4] hw/net/xen_nic.c: Free 'netdev->txs' when map 'netdev->rxs' fails

[Stefan Hajnoczi]

From: Chen Gang <gang.chen.5i5j@gmail.com>

When map 'netdev->rxs' fails, need free the original resource, or will
cause resource leak.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/xen_nic.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index 63918ae..7a57feb 100644
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -370,11 +370,16 @@ static int net_connect(struct XenDevice *xendev)
                                           netdev->xendev.dom,
                                           netdev->tx_ring_ref,
                                           PROT_READ | PROT_WRITE);
+    if (!netdev->txs) {
+        return -1;
+    }
     netdev->rxs = xc_gnttab_map_grant_ref(netdev->xendev.gnttabdev,
                                           netdev->xendev.dom,
                                           netdev->rx_ring_ref,
                                           PROT_READ | PROT_WRITE);
-    if (!netdev->txs || !netdev->rxs) {
+    if (!netdev->rxs) {
+        xc_gnttab_munmap(netdev->xendev.gnttabdev, netdev->txs, 1);
+        netdev->txs = NULL;
         return -1;
     }
     BACK_RING_INIT(&netdev->tx_ring, netdev->txs, XC_PAGE_SIZE);
-- 
2.1.0

[Qemu-devel] [PULL 3/4] hw/net/xen_nic.c: Need free 'netdev->nic' in net_free() instead of net_disconnect()

[Stefan Hajnoczi]

From: Chen Gang <gang.chen.5i5j@gmail.com>

net_init() and net_free() are pairs, net_connect() and net_disconnect()
are pairs. net_init() creates 'netdev->nic', so also need free it in
net_free().

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/xen_nic.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index 7a57feb..8eaa77b 100644
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -410,10 +410,6 @@ static void net_disconnect(struct XenDevice *xendev)
         xc_gnttab_munmap(netdev->xendev.gnttabdev, netdev->rxs, 1);
         netdev->rxs = NULL;
     }
-    if (netdev->nic) {
-        qemu_del_nic(netdev->nic);
-        netdev->nic = NULL;
-    }
 }
 
 static void net_event(struct XenDevice *xendev)
@@ -427,6 +423,10 @@ static int net_free(struct XenDevice *xendev)
 {
     struct XenNetDev *netdev = container_of(xendev, struct XenNetDev, xendev);
 
+    if (netdev->nic) {
+        qemu_del_nic(netdev->nic);
+        netdev->nic = NULL;
+    }
     g_free(netdev->mac);
     return 0;
 }
-- 
2.1.0

[Qemu-devel] [PULL 4/4] hw/net/xen_nic.c: Set 'netdev->mac' to NULL after free it

[Stefan Hajnoczi]

From: Chen Gang <gang.chen.5i5j@gmail.com>

Since net_init() checks whether 'netdev->mac' is NULL, before alloc it;
net_release() also need set 'netdev->mac' to NULL after free it.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/xen_nic.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index 8eaa77b..19ecfc4 100644
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -428,6 +428,7 @@ static int net_free(struct XenDevice *xendev)
         netdev->nic = NULL;
     }
     g_free(netdev->mac);
+    netdev->mac = NULL;
     return 0;
 }
 
-- 
2.1.0

Re: [Qemu-devel] [PULL 0/4] Net patches

[Peter Maydell]

On 12 January 2015 at 10:27, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 64ea8038ffbf703dcd438a108d2d5499c8ff95d9:
>
>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150109.0' into staging (2015-01-10 22:29:09 +0000)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to a39d97c7becca5fd679d70d17ae5b1d62b9b5da6:
>
>   hw/net/xen_nic.c: Set 'netdev->mac' to NULL after free it (2015-01-12 10:16:23 +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
>  28 files changed, 11 insertions(+), 216 deletions(-)

If only all pullreqs could have diffstats like this :-)

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/4] Net patches

[Peter Maydell]

On Fri, 17 May 2019 at 10:07, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit d8276573da58e8ce78dab8c46dd660efd664bcb7:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190510' into staging (2019-05-16 13:15:08 +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 78e4f446d2569210a8558946b2321f9ff2ef47f6:
>
>   net/colo-compare.c: Fix a crash in COLO Primary. (2019-05-17 17:00:12 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.

-- PMM

[Qemu-devel] [PULL 0/4] Net patches

[Jason Wang]

The following changes since commit d8276573da58e8ce78dab8c46dd660efd664bcb7:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190510' into staging (2019-05-16 13:15:08 +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 78e4f446d2569210a8558946b2321f9ff2ef47f6:

  net/colo-compare.c: Fix a crash in COLO Primary. (2019-05-17 17:00:12 +0800)

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

----------------------------------------------------------------
Chris Kenna (1):
      e1000: Never increment the RX undersize count register

Jason Wang (1):
      vhost_net: don't set backend for the uninitialized virtqueue

Lukas Straub (1):
      net/colo-compare.c: Fix a crash in COLO Primary.

Stefano Garzarella (1):
      net/slirp: fix the IPv6 prefix length error message

 hw/net/e1000.c             |  1 -
 hw/net/vhost_net.c         | 10 ++++++++++
 hw/virtio/virtio.c         |  5 +++++
 include/hw/virtio/virtio.h |  1 +
 net/colo-compare.c         |  3 +--
 net/slirp.c                |  3 ++-
 6 files changed, 19 insertions(+), 4 deletions(-)

Re: [Qemu-devel] [PULL 0/4] Net patches

[Peter Maydell]

On 15 June 2018 at 04:01, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit 409c241f887a38bb7a2ac12e34d3a8d73922a9a5:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into staging (2018-06-14 14:04:14 +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 c67daf4a24442d1bb404a11a6a54dc45ea10f234:
>
>   vhost-user: delete net client if necessary (2018-06-15 10:39:53 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/4] Net patches

[Jason Wang]

The following changes since commit 409c241f887a38bb7a2ac12e34d3a8d73922a9a5:

  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into staging (2018-06-14 14:04:14 +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 c67daf4a24442d1bb404a11a6a54dc45ea10f234:

  vhost-user: delete net client if necessary (2018-06-15 10:39:53 +0800)

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

----------------------------------------------------------------
Brijesh Singh (1):
      tap: set vhostfd passed from qemu cli to non-blocking

Jan Kiszka (1):
      e1000e: Do not auto-clear ICR bits which aren't set in EIAC

Lin Ma (1):
      net: Fix a potential segfault

linzhecheng (1):
      vhost-user: delete net client if necessary

 hw/net/e1000e_core.c | 4 ----
 net/net.c            | 4 +++-
 net/tap.c            | 2 ++
 net/vhost-user.c     | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

Re: [Qemu-devel] [PULL 0/4] Net patches

[Peter Maydell]

On 14 May 2018 at 08:55, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit c74e62ee3e2dc2955e07d004c71badecb68a84eb:
>
>   Merge remote-tracking branch 'remotes/rth/tags/cota-target-pull-request' into staging (2018-05-11 15:41:29 +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 0e0266c2e475b82b39a757c875fa03e64272fbe7:
>
>   net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files (2018-05-14 15:47:14 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Thomas Huth (4):
>       net: Fix memory leak in net_param_nic()
>       net: Remove the deprecated "vlan" parameter
>       net: Get rid of 'vlan' terminology and use 'hub' instead in the source files
>       net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/4] Net patches

[Jason Wang]

The following changes since commit c74e62ee3e2dc2955e07d004c71badecb68a84eb:

  Merge remote-tracking branch 'remotes/rth/tags/cota-target-pull-request' into staging (2018-05-11 15:41:29 +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 0e0266c2e475b82b39a757c875fa03e64272fbe7:

  net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files (2018-05-14 15:47:14 +0800)

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

----------------------------------------------------------------
Thomas Huth (4):
      net: Fix memory leak in net_param_nic()
      net: Remove the deprecated "vlan" parameter
      net: Get rid of 'vlan' terminology and use 'hub' instead in the source files
      net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files

 docs/qdev-device-use.txt         |  3 --
 hw/core/qdev-properties-system.c | 80 ----------------------------------------
 include/hw/qdev-properties.h     |  3 --
 include/net/net.h                |  1 -
 net/hub.c                        |  7 ++--
 net/net.c                        | 18 ++++-----
 net/slirp.c                      |  8 ++--
 net/tap.c                        |  4 +-
 qapi/net.json                    | 15 ++++----
 qemu-doc.texi                    | 51 ++++++++++++-------------
 qemu-options.hx                  | 29 ++++++---------
 11 files changed, 58 insertions(+), 161 deletions(-)

Re: [Qemu-devel] [PULL 0/4] Net patches

[Peter Maydell]

On 17 September 2015 at 12:43, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 619622424dba749feef752d76d79ef2569f7f250:
>
>   Merge remote-tracking branch 'remotes/berrange/tags/vnc-crypto-v9-for-upstream' into staging (2015-09-15 15:42:58 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 271a234a2359975101396916f37f3c7d347c61b8:
>
>   net: smc91c111: flush packets on RCR register changes (2015-09-17 12:36:03 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit 619622424dba749feef752d76d79ef2569f7f250:

  Merge remote-tracking branch 'remotes/berrange/tags/vnc-crypto-v9-for-upstream' into staging (2015-09-15 15:42:58 +0100)

are available in the git repository at:

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

for you to fetch changes up to 271a234a2359975101396916f37f3c7d347c61b8:

  net: smc91c111: flush packets on RCR register changes (2015-09-17 12:36:03 +0100)

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

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

Jason Wang (1):
  MAINTAINERS: Stefan will not maintain net subsystem

Peter Crosthwaite (3):
  net: smc91c111: guard flush_queued_packets() on can_rx()
  net: smc91c111: gate can_receive() on rx FIFO having a slot
  net: smc91c111: flush packets on RCR register changes

 MAINTAINERS        |  3 +--
 hw/net/smc91c111.c | 33 +++++++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 10 deletions(-)

-- 
2.4.3

Re: [Qemu-devel] [PULL 0/4] Net patches

[Peter Maydell]

On 5 June 2015 at 11:22, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 3b730f570c5872ceea2137848f1d4554d4847441:
>
>   Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging (2015-06-04 14:04:14 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 73e47f4bc1a1aac59dba3f3a5feb27fbcb1cde50:
>
>   qmp/hmp: add rocker device support (2015-06-05 11:19:53 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> David Ahern (1):
>   rocker: Add support for phys name
>
> Scott Feldman (3):
>   rocker: update tests using hw-derived interface names
>   rocker: bring link up/down on PHY enable/disable
>   qmp/hmp: add rocker device support

Eric has some review comments on the qmp/hmp patch which haven't
been addressed yet, so I'm not applying this one. (I noticed the
commit message misformatting too...)

thanks
-- PMM

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit 3b730f570c5872ceea2137848f1d4554d4847441:

  Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging (2015-06-04 14:04:14 +0100)

are available in the git repository at:

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

for you to fetch changes up to 73e47f4bc1a1aac59dba3f3a5feb27fbcb1cde50:

  qmp/hmp: add rocker device support (2015-06-05 11:19:53 +0100)

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

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

David Ahern (1):
  rocker: Add support for phys name

Scott Feldman (3):
  rocker: update tests using hw-derived interface names
  rocker: bring link up/down on PHY enable/disable
  qmp/hmp: add rocker device support

 docs/specs/rocker.txt         |   1 +
 hmp-commands.hx               |  24 ++++
 hmp.c                         | 303 ++++++++++++++++++++++++++++++++++++++++
 hmp.h                         |   4 +
 hw/net/Makefile.objs          |   1 +
 hw/net/rocker/qmp-norocker.c  |  50 +++++++
 hw/net/rocker/rocker.c        |  68 ++++++++-
 hw/net/rocker/rocker_fp.c     |  29 +++-
 hw/net/rocker/rocker_fp.h     |   2 +
 hw/net/rocker/rocker_hw.h     |   1 +
 hw/net/rocker/rocker_of_dpa.c | 312 ++++++++++++++++++++++++++++++++++++++++++
 monitor.c                     |  28 ++++
 qapi-schema.json              |   3 +
 qapi/rocker.json              | 286 ++++++++++++++++++++++++++++++++++++++
 qmp-commands.hx               |  97 +++++++++++++
 tests/rocker/bridge           |  25 ++--
 tests/rocker/bridge-stp       |  25 ++--
 tests/rocker/bridge-vlan      |  37 +++--
 tests/rocker/bridge-vlan-stp  |  37 +++--
 tests/rocker/port             |   8 +-
 20 files changed, 1263 insertions(+), 78 deletions(-)
 create mode 100644 hw/net/rocker/qmp-norocker.c
 create mode 100644 qapi/rocker.json

-- 
2.4.2

Re: [Qemu-devel] [PULL 0/4] Net patches

[Peter Maydell]

On 27 January 2014 14:48, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 0169c511554cb0014a00290b0d3d26c31a49818f:
>
>   Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (2014-01-24 15:52:44 -0800)
>
> are available in the git repository at:
>
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 1f149e721feb617d14a3ee4f5911c47b29866a54:
>
>   tap-linux: Get features once and use it many times (2014-01-27 15:44:06 +0100)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit 0169c511554cb0014a00290b0d3d26c31a49818f:

  Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (2014-01-24 15:52:44 -0800)

are available in the git repository at:


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

for you to fetch changes up to 1f149e721feb617d14a3ee4f5911c47b29866a54:

  tap-linux: Get features once and use it many times (2014-01-27 15:44:06 +0100)

----------------------------------------------------------------
Net patches

----------------------------------------------------------------
Hani Benhabiles (1):
      net: Use g_strdup_printf instead of snprintf.

Kusanagi Kouichi (1):
      tap-linux: Get features once and use it many times

Roy Franz (2):
      Fix lan9118 TX "CMD A" handling
      Fix lan9118 buffer length handling

 hw/net/lan9118.c |  6 +++---
 net/net.c        |  5 +----
 net/tap-linux.c  | 14 ++++++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

-- 
1.8.4.2

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit a1d22a367d5780c9553b2cd5a24f665534ce6ed6:

  target-cris: Use new qemu_ld/st opcodes (2013-12-08 09:36:02 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git net-next

for you to fetch changes up to 02d38fcb2caa4454cf4ed728d5908c3cc9ba47be:

  net: Update netdev peer on link change (2013-12-09 13:33:20 +0100)

----------------------------------------------------------------
Amos Kong (1):
      virtio-net: don't update mac_table in error state

Vincenzo Maffione (2):
      net: Adding netmap network backend
      MAINTAINERS: Add netmap maintainers

Vlad Yasevich (1):
      net: Update netdev peer on link change

 MAINTAINERS         |   8 +
 configure           |  32 ++++
 hmp-commands.hx     |   4 +-
 hw/net/virtio-net.c |  35 +++--
 net/Makefile.objs   |   1 +
 net/clients.h       |   5 +
 net/net.c           |  32 ++--
 net/netmap.c        | 435 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 qapi-schema.json    |  24 ++-
 qemu-options.hx     |   9 ++
 10 files changed, 558 insertions(+), 27 deletions(-)
 create mode 100644 net/netmap.c

-- 
1.8.4.2

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit 1680d485777ecf436d724631ea8722cc0c66990e:

  Merge remote-tracking branch 'rth/tcg-ldst-6' into staging (2013-10-14 09:59:59 -0700)

are available in the git repository at:


  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 6e6247e54da991cbc7e0c05040bd6a14d505fc89:

  net: disallow to specify multicast MAC address (2013-10-18 13:28:09 +0200)

----------------------------------------------------------------
Amos Kong (3):
      net: update nic info during device reset
      net/e1000: update network information when macaddr is changed in guest
      net/rtl8139: update network information when macaddr is changed in guest

Dmitry Krivenok (1):
      net: disallow to specify multicast MAC address

 hw/net/e1000.c   | 9 +++++++++
 hw/net/rtl8139.c | 7 ++++++-
 net/net.c        | 5 +++++
 net/util.c       | 5 +++++
 net/util.h       | 2 ++
 5 files changed, 27 insertions(+), 1 deletion(-)

-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

On Mon, Sep 09, 2013 at 04:49:06PM +0200, Aurelien Jarno wrote:
> On Fri, Sep 06, 2013 at 04:59:06PM +0200, Stefan Hajnoczi wrote:
> > On Fri, Sep 06, 2013 at 08:03:27AM +0200, Paolo Bonzini wrote:
> > > Il 05/09/2013 23:02, Aurelien Jarno ha scritto:
> > > > It would be nice if you can get the pcnet fix in your tree. For the ne2k
> > > > patch, as reported it might break the non-PCI version. I have to look at
> > > > that more in details, probably this week-end.
> > > 
> > > No, that's fine.  The non-PCI version is also little endian.
> > 
> > Good.  I just wanted confirmation because I'm not up-to-speed on device
> > endianness.
> > 
> > I'll merge the patch.
> > 
> 
> Thanks. Would it be possible to also merge the following patch:
> 
> http://patchwork.ozlabs.org/patch/270487/

Merged onto my net-next tree.  I'll send a pull request at the end of
the week.

Stefan

Re: [Qemu-devel] [PULL 0/4] Net patches

[Aurelien Jarno]

On Fri, Sep 06, 2013 at 04:59:06PM +0200, Stefan Hajnoczi wrote:
> On Fri, Sep 06, 2013 at 08:03:27AM +0200, Paolo Bonzini wrote:
> > Il 05/09/2013 23:02, Aurelien Jarno ha scritto:
> > > It would be nice if you can get the pcnet fix in your tree. For the ne2k
> > > patch, as reported it might break the non-PCI version. I have to look at
> > > that more in details, probably this week-end.
> > 
> > No, that's fine.  The non-PCI version is also little endian.
> 
> Good.  I just wanted confirmation because I'm not up-to-speed on device
> endianness.
> 
> I'll merge the patch.
> 

Thanks. Would it be possible to also merge the following patch:

http://patchwork.ozlabs.org/patch/270487/

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

Re: [Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

On Thu, Sep 05, 2013 at 01:38:23PM -0500, Anthony Liguori wrote:
> Stefan Hajnoczi <stefanha@redhat.com> writes:
> 
> > The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
> >
> >   Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
> >
> > are available in the git repository at:
> 
> Sorry, I forgot to send you this feedback earlier.
> 
> This conflicts badly with a pull request from Michael Tsirkin that I
> merged already.  Can you rebase against master and resubmit?

Sure, will do.

Stefan

Re: [Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

On Fri, Sep 06, 2013 at 08:03:27AM +0200, Paolo Bonzini wrote:
> Il 05/09/2013 23:02, Aurelien Jarno ha scritto:
> > It would be nice if you can get the pcnet fix in your tree. For the ne2k
> > patch, as reported it might break the non-PCI version. I have to look at
> > that more in details, probably this week-end.
> 
> No, that's fine.  The non-PCI version is also little endian.

Good.  I just wanted confirmation because I'm not up-to-speed on device
endianness.

I'll merge the patch.

Stefan

Re: [Qemu-devel] [PULL 0/4] Net patches

[Paolo Bonzini]

Il 05/09/2013 23:02, Aurelien Jarno ha scritto:
> It would be nice if you can get the pcnet fix in your tree. For the ne2k
> patch, as reported it might break the non-PCI version. I have to look at
> that more in details, probably this week-end.

No, that's fine.  The non-PCI version is also little endian.

Paolo

Re: [Qemu-devel] [PULL 0/4] Net patches

[Aurelien Jarno]

On Thu, Sep 05, 2013 at 09:49:46PM +0200, Paolo Bonzini wrote:
> Il 02/09/2013 13:38, Stefan Hajnoczi ha scritto:
> > The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
> > 
> >   Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
> > 
> > are available in the git repository at:
> > 
> > 
> >   git://github.com/stefanha/qemu.git net
> > 
> > for you to fetch changes up to e21f6f23606e90f5cc6df2d9b1d8b862b54d2796:
> > 
> >   vmxnet3: Eliminate __packed redefined warning (2013-09-02 13:35:50 +0200)
> 
> Is Aurelien going to apply the ne2k patch himself?

It would be nice if you can get the pcnet fix in your tree. For the ne2k
patch, as reported it might break the non-PCI version. I have to look at
that more in details, probably this week-end.

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

Re: [Qemu-devel] [PULL 0/4] Net patches

[Paolo Bonzini]

Il 02/09/2013 13:38, Stefan Hajnoczi ha scritto:
> The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
> 
>   Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
> 
> are available in the git repository at:
> 
> 
>   git://github.com/stefanha/qemu.git net
> 
> for you to fetch changes up to e21f6f23606e90f5cc6df2d9b1d8b862b54d2796:
> 
>   vmxnet3: Eliminate __packed redefined warning (2013-09-02 13:35:50 +0200)

Is Aurelien going to apply the ne2k patch himself?

Paolo

Re: [Qemu-devel] [PULL 0/4] Net patches

[Anthony Liguori]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
>
>   Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
>
> are available in the git repository at:

Sorry, I forgot to send you this feedback earlier.

This conflicts badly with a pull request from Michael Tsirkin that I
merged already.  Can you rebase against master and resubmit?

Thanks!

Regards,

Anthony Liguori

>
>
>   git://github.com/stefanha/qemu.git net
>
> for you to fetch changes up to e21f6f23606e90f5cc6df2d9b1d8b862b54d2796:
>
>   vmxnet3: Eliminate __packed redefined warning (2013-09-02 13:35:50 +0200)
>
> ----------------------------------------------------------------
> Brad Smith (2):
>       tap: Use numbered tap/tun devices on all *BSD OS's
>       vmxnet3: Eliminate __packed redefined warning
>
> Jan Kiszka (1):
>       net: Rename send_queue to incoming_queue
>
> Vincenzo Maffione (1):
>       e1000: add interrupt mitigation support
>
>  hw/i386/pc_piix.c    |  18 ++++++-
>  hw/i386/pc_q35.c     |  16 ++++++-
>  hw/net/e1000.c       | 131 +++++++++++++++++++++++++++++++++++++++++++++++++--
>  hw/net/vmxnet3.h     |   2 -
>  include/hw/i386/pc.h |   8 ++++
>  include/net/net.h    |   2 +-
>  net/hub.c            |   2 +-
>  net/net.c            |  14 +++---
>  net/tap-bsd.c        |  11 -----
>  9 files changed, 176 insertions(+), 28 deletions(-)
>
> -- 
> 1.8.3.1

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:

  Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)

are available in the git repository at:


  git://github.com/stefanha/qemu.git net

for you to fetch changes up to e21f6f23606e90f5cc6df2d9b1d8b862b54d2796:

  vmxnet3: Eliminate __packed redefined warning (2013-09-02 13:35:50 +0200)

----------------------------------------------------------------
Brad Smith (2):
      tap: Use numbered tap/tun devices on all *BSD OS's
      vmxnet3: Eliminate __packed redefined warning

Jan Kiszka (1):
      net: Rename send_queue to incoming_queue

Vincenzo Maffione (1):
      e1000: add interrupt mitigation support

 hw/i386/pc_piix.c    |  18 ++++++-
 hw/i386/pc_q35.c     |  16 ++++++-
 hw/net/e1000.c       | 131 +++++++++++++++++++++++++++++++++++++++++++++++++--
 hw/net/vmxnet3.h     |   2 -
 include/hw/i386/pc.h |   8 ++++
 include/net/net.h    |   2 +-
 net/hub.c            |   2 +-
 net/net.c            |  14 +++---
 net/tap-bsd.c        |  11 -----
 9 files changed, 176 insertions(+), 28 deletions(-)

-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/4] Net patches

[Anthony Liguori]

Pulled, thanks.

Regards,

Anthony Liguori

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit 8e4a424b305e29dc0e454f52df3b35577f342975:

  Revert "virtio-pci: replace byte swap hack" (2013-01-06 18:30:17 +0000)

are available in the git repository at:

  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 83f58e570f21c3e7227e7fbef1fc0e18b5ed7ea9:

  rtl8139: preserve link state across device reset (2013-01-07 10:43:21 +0100)

----------------------------------------------------------------
Amos Kong (3):
      net: clean up network at qemu process termination
      e1000: no need auto-negotiation if link was down
      rtl8139: preserve link state across device reset

Michael Contreras (1):
      e1000: Discard oversized packets based on SBP|LPE

 hw/e1000.c   | 12 ++++++++++--
 hw/rtl8139.c |  3 ++-
 vl.c         |  4 +++-
 3 files changed, 15 insertions(+), 4 deletions(-)

-- 
1.8.0.2

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit 6801038bc52d61f81ac8a25fbe392f1bad982887:

  target-mips: fix wrong microMIPS opcode encoding (2012-11-15 14:48:16 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 315d78d7f9d70c44eecfdad7f0cb5d51c612f884:

  tap: reset vnet header size on open (2012-11-16 14:28:33 +0100)

----------------------------------------------------------------
Michael S. Tsirkin (1):
      tap: reset vnet header size on open

Stefan Hajnoczi (3):
      net: add public qemu_net_poll() function
      net: extract notify_link_status_changed() function
      net: convert NetClientState to QOM

 hw/cadence_gem.c        |  27 +++++++---
 hw/dp8393x.c            |  41 ++++++++++----
 hw/e1000.c              |  32 +++++++----
 hw/eepro100.c           |  27 +++++++---
 hw/etraxfs_eth.c        |  27 +++++++---
 hw/lan9118.c            |  27 +++++++---
 hw/lance.c              |  18 +------
 hw/mcf_fec.c            |  32 ++++++++---
 hw/milkymist-minimac2.c |  26 ++++++---
 hw/mipsnet.c            |  25 ++++++---
 hw/musicpal.c           |  26 ++++++---
 hw/ne2000-isa.c         |  17 +-----
 hw/ne2000.c             |  23 +++++---
 hw/ne2000.h             |   2 +
 hw/opencores_eth.c      |  28 +++++++---
 hw/pcnet-pci.c          |  18 +------
 hw/pcnet.c              |  36 +++++++++++--
 hw/pcnet.h              |   3 +-
 hw/rtl8139.c            |  28 +++++++---
 hw/smc91c111.c          |  26 ++++++---
 hw/spapr_llan.c         |  24 ++++++---
 hw/stellaris_enet.c     |  26 ++++++---
 hw/usb/dev-network.c    |  25 ++++++---
 hw/vhost_net.c          |  11 ++--
 hw/virtio-net.c         |  42 ++++++++++-----
 hw/xen_nic.c            |  29 +++++++---
 hw/xgmac.c              |  26 ++++++---
 hw/xilinx_axienet.c     |  26 ++++++---
 hw/xilinx_ethlite.c     |  26 ++++++---
 net.c                   | 140 +++++++++++++++++++++++++++++++++---------------
 net.h                   |  35 ++++++++----
 net/dump.c              |  30 ++++++++---
 net/hub.c               |  64 +++++++++++++---------
 net/slirp.c             |  29 +++++++---
 net/socket.c            |  74 ++++++++++++++++---------
 net/tap-win32.c         |  27 ++++++++--
 net/tap.c               |  84 ++++++++++++++++-------------
 net/tap.h               |   4 ++
 net/vde.c               |  28 ++++++++--
 39 files changed, 850 insertions(+), 389 deletions(-)

-- 
1.8.0

Re: [Qemu-devel] [PULL 0/4] Net patches

[Anthony Liguori]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> The following changes since commit 4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4:
>
>   Merge branch 'master' of git.qemu.org:/pub/git/qemu (2012-10-07 18:42:18 +0000)
>
> are available in the git repository at:
>
>
>   git://github.com/stefanha/qemu.git net
>
> for you to fetch changes up to a245fc18352fe286ba45ae0661a73b3841514889:
>
>   net: consolidate NetClientState header files into one (2012-10-08 13:59:40 +0200)
>

Pulled. Thanks.

Regards,

Anthony Liguori

> ----------------------------------------------------------------
> Amos Kong (2):
>       e1000: update nc.link_down in e1000_post_load()
>       virtio-net: update nc.link_down in virtio_net_load()
>
> Jason Wang (1):
>       rtl8139: implement 8139cp link status
>
> Paolo Bonzini (1):
>       net: consolidate NetClientState header files into one
>
>  hw/e1000.c                  | 12 ++++++++++++
>  hw/rtl8139.c                | 24 ++++++++++++++++++++++--
>  hw/virtio-net.c             |  5 +++++
>  net.c                       | 11 ++++-------
>  net/{socket.h => clients.h} | 28 +++++++++++++++++++++++++---
>  net/dump.c                  |  2 +-
>  net/dump.h                  | 33 ---------------------------------
>  net/hub.c                   |  1 +
>  net/hub.h                   |  2 --
>  net/slirp.c                 |  3 ++-
>  net/slirp.h                 |  3 ---
>  net/socket.c                |  3 +--
>  net/tap-win32.c             |  2 +-
>  net/tap.c                   |  3 ++-
>  net/tap.h                   |  6 ------
>  net/vde.c                   |  3 +--
>  net/vde.h                   | 37 -------------------------------------
>  17 files changed, 77 insertions(+), 101 deletions(-)
>  rename net/{socket.h => clients.h} (62%)
>  delete mode 100644 net/dump.h
>  delete mode 100644 net/vde.h
>
> -- 
> 1.7.11.4

[Qemu-devel] [PULL 0/4] Net patches

[Stefan Hajnoczi]

The following changes since commit 4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4:

  Merge branch 'master' of git.qemu.org:/pub/git/qemu (2012-10-07 18:42:18 +0000)

are available in the git repository at:


  git://github.com/stefanha/qemu.git net

for you to fetch changes up to a245fc18352fe286ba45ae0661a73b3841514889:

  net: consolidate NetClientState header files into one (2012-10-08 13:59:40 +0200)

----------------------------------------------------------------
Amos Kong (2):
      e1000: update nc.link_down in e1000_post_load()
      virtio-net: update nc.link_down in virtio_net_load()

Jason Wang (1):
      rtl8139: implement 8139cp link status

Paolo Bonzini (1):
      net: consolidate NetClientState header files into one

 hw/e1000.c                  | 12 ++++++++++++
 hw/rtl8139.c                | 24 ++++++++++++++++++++++--
 hw/virtio-net.c             |  5 +++++
 net.c                       | 11 ++++-------
 net/{socket.h => clients.h} | 28 +++++++++++++++++++++++++---
 net/dump.c                  |  2 +-
 net/dump.h                  | 33 ---------------------------------
 net/hub.c                   |  1 +
 net/hub.h                   |  2 --
 net/slirp.c                 |  3 ++-
 net/slirp.h                 |  3 ---
 net/socket.c                |  3 +--
 net/tap-win32.c             |  2 +-
 net/tap.c                   |  3 ++-
 net/tap.h                   |  6 ------
 net/vde.c                   |  3 +--
 net/vde.h                   | 37 -------------------------------------
 17 files changed, 77 insertions(+), 101 deletions(-)
 rename net/{socket.h => clients.h} (62%)
 delete mode 100644 net/dump.h
 delete mode 100644 net/vde.h

-- 
1.7.11.4