diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 09:45:17 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 09:45:17 -0600 |
| commit | f76d27b67ca05c7ee875e39b4f6e3d567d3e9292 (patch) | |
| tree | d1c923164d9830fa0d8901c2af828ed69b5f243f /hw/etraxfs_eth.c | |
| parent | 4a1cc6800a54b154a214e7ecf36c63c8c81f2074 (diff) | |
| parent | 67d95c153bef55f619615ea71a5c2d689db4fd4e (diff) | |
| download | focaccia-qemu-f76d27b67ca05c7ee875e39b4f6e3d567d3e9292.tar.gz focaccia-qemu-f76d27b67ca05c7ee875e39b4f6e3d567d3e9292.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/exec-obsolete' into staging
Diffstat (limited to 'hw/etraxfs_eth.c')
| -rw-r--r-- | hw/etraxfs_eth.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index 5ac2d15fa1..b5252580a5 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -323,7 +323,6 @@ struct fs_eth MemoryRegion mmio; NICState *nic; NICConf conf; - int ethregs; /* Two addrs in the filter. */ uint8_t macaddr[2][6]; @@ -571,8 +570,6 @@ static void eth_cleanup(VLANClientState *nc) { struct fs_eth *eth = DO_UPCAST(NICState, nc, nc)->opaque; - cpu_unregister_io_memory(eth->ethregs); - /* Disconnect the client. */ eth->dma_out->client.push = NULL; eth->dma_out->client.opaque = NULL; |