diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-12 11:13:24 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-12 11:13:24 +0000 |
| commit | 7d5ad15d17f26dd4f9ff5f3491828bc34e74f28c (patch) | |
| tree | 786f76c24cd9d0c20a6daf1e2a0fc6c5b72cd6cd /hw/net/milkymist-minimac2.c | |
| parent | 5435f1d77eb4e8cf5e4103f64f0ecbe9f2902c71 (diff) | |
| parent | a39d97c7becca5fd679d70d17ae5b1d62b9b5da6 (diff) | |
| download | focaccia-qemu-7d5ad15d17f26dd4f9ff5f3491828bc34e74f28c.tar.gz focaccia-qemu-7d5ad15d17f26dd4f9ff5f3491828bc34e74f28c.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Mon 12 Jan 2015 10:27:41 GMT 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/xen_nic.c: Set 'netdev->mac' to NULL after free it hw/net/xen_nic.c: Need free 'netdev->nic' in net_free() instead of net_disconnect() hw/net/xen_nic.c: Free 'netdev->txs' when map 'netdev->rxs' fails net: remove all cleanup methods from NIC NetClientInfos Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/milkymist-minimac2.c')
| -rw-r--r-- | hw/net/milkymist-minimac2.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index c6326728eb..f06afaa581 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) |