From ba494313d386475e849b536fe0eb1cd05d8dfa68 Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" Date: Mon, 15 Jun 2009 21:00:50 +0200 Subject: etrax: Don't pass CPUState to peripherals. Signed-off-by: Edgar E. Iglesias --- hw/etraxfs_eth.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'hw/etraxfs_eth.c') 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; -- cgit v1.2.3