diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-10 11:37:39 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-10 11:37:39 -0500 |
| commit | 97f31cbc71fc13b3091893313a555c3cf1ecb798 (patch) | |
| tree | 17ff5cdb268caa29549cffce0854160efdb6845a /hw | |
| parent | f7da9c17c114417911ac2008d0401084a5030391 (diff) | |
| parent | c87826a878be05208c3906eb9d5e1f37cff5e98e (diff) | |
Merge remote-tracking branch 'stefanha/net' into staging
# By Jason Wang (1) and Stefan Hajnoczi (1)
# Via Stefan Hajnoczi
* stefanha/net:
tap: fix NULL dereference when passing invalid parameters to tap
vmxnet3: fix NICState cleanup
Message-id: 1370613288-14933-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/vmxnet3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 5f483e7f1e..4c575e55a7 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -1892,7 +1892,7 @@ static void vmxnet3_net_uninit(VMXNET3State *s) vmxnet_tx_pkt_reset(s->tx_pkt); vmxnet_tx_pkt_uninit(s->tx_pkt); vmxnet_rx_pkt_uninit(s->rx_pkt); - qemu_del_net_client(qemu_get_queue(s->nic)); + qemu_del_nic(s->nic); } static void vmxnet3_net_init(VMXNET3State *s) |