vmstate: Add pre/post_save() hooks

[qemu] / hw / etraxfs_eth.c

diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c
index cce8917..54786c5 100644 (file)
--- a/hw/etraxfs_eth.c
+++ b/hw/etraxfs_eth.c
@@ -25,8 +25,7 @@
 #include <stdio.h>
 #include "hw.h"
 #include "net.h"
-
-#include "etraxfs_dma.h"
+#include "etraxfs.h"
 
 #define D(x)
 
@@ -320,8 +319,6 @@ static void mdio_cycle(struct qemu_mdio *bus)
 
 struct fs_eth
 {
-       CPUState *env;
-       qemu_irq *irq;
        VLANClientState *vc;
        int ethregs;
 
@@ -402,8 +399,8 @@ static void eth_update_ma(struct fs_eth *eth, int ma)
        eth->macaddr[ma][i++] = eth->regs[reg] >> 8;
        eth->macaddr[ma][i++] = eth->regs[reg] >> 16;
        eth->macaddr[ma][i++] = eth->regs[reg] >> 24;
-       eth->macaddr[ma][i++] = eth->regs[reg + 4];
-       eth->macaddr[ma][i++] = eth->regs[reg + 4] >> 8;
+       eth->macaddr[ma][i++] = eth->regs[reg + 1];
+       eth->macaddr[ma][i++] = eth->regs[reg + 1] >> 8;
 
        D(printf("set mac%d=%x.%x.%x.%x.%x.%x\n", ma,
                 eth->macaddr[ma][0], eth->macaddr[ma][1],
@@ -498,21 +495,21 @@ static int eth_match_groupaddr(struct fs_eth *eth, const unsigned char *sa)
        return match;
 }
 
-static int eth_can_receive(void *opaque)
+static int eth_can_receive(VLANClientState *vc)
 {
        return 1;
 }
 
-static void eth_receive(void *opaque, const uint8_t *buf, int size)
+static ssize_t eth_receive(VLANClientState *vc, const uint8_t *buf, size_t size)
 {
        unsigned char sa_bcast[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-       struct fs_eth *eth = opaque;
+       struct fs_eth *eth = vc->opaque;
        int use_ma0 = eth->regs[RW_REC_CTRL] & 1;
        int use_ma1 = eth->regs[RW_REC_CTRL] & 2;
        int r_bcast = eth->regs[RW_REC_CTRL] & 8;
 
        if (size < 12)
-               return;
+               return -1;
 
        D(printf("%x.%x.%x.%x.%x.%x ma=%d %d bc=%d\n",
                 buf[0], buf[1], buf[2], buf[3], buf[4], buf[5],
@@ -523,10 +520,12 @@ static void eth_receive(void *opaque, const uint8_t *buf, int size)
            && (!use_ma1 || memcmp(buf, eth->macaddr[1], 6))
            && (!r_bcast || memcmp(buf, sa_bcast, 6))
            && !eth_match_groupaddr(eth, buf))
-               return;
+               return size;
 
        /* FIXME: Find another way to pass on the fake csum.  */
        etraxfs_dmac_input(eth->dma_in, (void *)buf, size + 4, 1);
+
+        return size;
 }
 
 static int eth_tx_push(void *opaque, unsigned char *buf, int len)
@@ -545,18 +544,27 @@ static void eth_set_link(VLANClientState *vc)
        eth->phy.link = !vc->link_down;
 }
 
-static CPUReadMemoryFunc *eth_read[] = {
+static CPUReadMemoryFunc * const eth_read[] = {
        NULL, NULL,
        &eth_readl,
 };
 
-static CPUWriteMemoryFunc *eth_write[] = {
+static CPUWriteMemoryFunc * const eth_write[] = {
        NULL, NULL,
        &eth_writel,
 };
 
-void *etraxfs_eth_init(NICInfo *nd, CPUState *env, 
-                      qemu_irq *irq, target_phys_addr_t base, int phyaddr)
+static void eth_cleanup(VLANClientState *vc)
+{
+        struct fs_eth *eth = vc->opaque;
+
+        cpu_unregister_io_memory(eth->ethregs);
+
+        qemu_free(eth->dma_out);
+        qemu_free(eth);
+}
+
+void *etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr)
 {
        struct etraxfs_dma_client *dma = NULL;  
        struct fs_eth *eth = NULL;
@@ -564,20 +572,13 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
        qemu_check_nic_model(nd, "fseth");
 
        dma = qemu_mallocz(sizeof *dma * 2);
-       if (!dma)
-               return NULL;
-
        eth = qemu_mallocz(sizeof *eth);
-       if (!eth)
-               goto err;
 
        dma[0].client.push = eth_tx_push;
        dma[0].client.opaque = eth;
        dma[1].client.opaque = eth;
        dma[1].client.pull = NULL;
 
-       eth->env = env;
-       eth->irq = irq;
        eth->dma_out = dma;
        eth->dma_in = dma + 1;
 
@@ -586,17 +587,14 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
        tdk_init(&eth->phy);
        mdio_attach(&eth->mdio_bus, &eth->phy, eth->phyaddr);
 
-       eth->ethregs = cpu_register_io_memory(0, eth_read, eth_write, eth);
+       eth->ethregs = cpu_register_io_memory(eth_read, eth_write, eth);
        cpu_register_physical_memory (base, 0x5c, eth->ethregs);
 
-       eth->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
-                                      eth_receive, eth_can_receive, eth);
+       eth->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
+                                                eth_can_receive, eth_receive,
+                                                NULL, eth_cleanup, eth);
        eth->vc->opaque = eth;
        eth->vc->link_status_changed = eth_set_link;
 
        return dma;
-  err:
-       qemu_free(eth);
-       qemu_free(dma);
-       return NULL;
 }