summaryrefslogtreecommitdiff
path: root/hw/etraxfs_eth.c
diff options
context:
space:
mode:
authorEdgar E. Iglesias <edgar.iglesias@gmail.com>2009-06-15 21:00:50 +0200
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2009-06-15 21:00:50 +0200
commitba494313d386475e849b536fe0eb1cd05d8dfa68 (patch)
treea3550840454f9c3c5e71a0c4117f14eb82a896bb /hw/etraxfs_eth.c
parente510e05b5d68386a0518e69eaf364a34bdb6283c (diff)
downloadqemu-ba494313d386475e849b536fe0eb1cd05d8dfa68.tar.gz
etrax: Don't pass CPUState to peripherals.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'hw/etraxfs_eth.c')
-rw-r--r--hw/etraxfs_eth.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c
index c7df44ee45..469be55a40 100644
--- a/hw/etraxfs_eth.c
+++ b/hw/etraxfs_eth.c
@@ -319,7 +319,6 @@ static void mdio_cycle(struct qemu_mdio *bus)
struct fs_eth
{
- CPUState *env;
VLANClientState *vc;
int ethregs;
@@ -565,8 +564,7 @@ static void eth_cleanup(VLANClientState *vc)
qemu_free(eth);
}
-void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
- target_phys_addr_t base, int phyaddr)
+void *etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr)
{
struct etraxfs_dma_client *dma = NULL;
struct fs_eth *eth = NULL;
@@ -574,7 +572,6 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
qemu_check_nic_model(nd, "fseth");
dma = qemu_mallocz(sizeof *dma * 2);
-
eth = qemu_mallocz(sizeof *eth);
dma[0].client.push = eth_tx_push;
@@ -582,7 +579,6 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
dma[1].client.opaque = eth;
dma[1].client.pull = NULL;
- eth->env = env;
eth->dma_out = dma;
eth->dma_in = dma + 1;